From a35afb93e67384f169a67e208fb7334b7742a13a Mon Sep 17 00:00:00 2001 From: Uwe Siems Date: Thu, 14 Dec 2023 18:09:40 +0100 Subject: [PATCH] Fix irritatingly wrong version number for Qt6 --- build/PythonQt_QtAll.prf | 6 +++--- extensions/PythonQt_QtAll/PythonQt_QtAll.pro | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/PythonQt_QtAll.prf b/build/PythonQt_QtAll.prf index eb80789c4..dffc4806d 100644 --- a/build/PythonQt_QtAll.prf +++ b/build/PythonQt_QtAll.prf @@ -10,6 +10,6 @@ CONFIG(debug, debug|release) { } -win32-g++: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll -win32-msvc*: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib -unix: LIBS += -L$$DESTDIR/../lib -lPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT} \ No newline at end of file +win32-g++: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll +win32-msvc*: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib +unix: LIBS += -L$$DESTDIR/../lib -lPythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT} \ No newline at end of file diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro index d32a50884..666007c17 100644 --- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro +++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro @@ -30,7 +30,7 @@ isEmpty( PYTHONQTALL_CONFIG ) { CONFIG += $${PYTHONQTALL_CONFIG} } -TARGET = PythonQt_QtAll-Qt5-PythonXY +TARGET = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-PythonXY TEMPLATE = lib DESTDIR = ../../lib