Fix irritatingly wrong version number for Qt6

usiems · mrbean-bremen · commit 4e6f13a94c1d · 2023-12-15T15:42:32.000+01:00
diff --git 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}
+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}
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ CONFIG(debug, debug\|release) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`
`13`		`-win32-g++: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll`
`14`		`-win32-msvc*: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib`
`15`		`-unix: LIBS += -L$$DESTDIR/../lib -lPythonQt_QtAll-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}`
	`13`	`+win32-g++: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll`
	`14`	`+win32-msvc*: LIBS += $$DESTDIR/../lib/PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib`
	`15`	`+unix: LIBS += -L$$DESTDIR/../lib -lPythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ isEmpty( PYTHONQTALL_CONFIG ) {`
`30`	`30`	`CONFIG += $${PYTHONQTALL_CONFIG}`
`31`	`31`	`}`
`32`	`32`
`33`		`-TARGET = PythonQt_QtAll-Qt5-PythonXY`
	`33`	`+TARGET = PythonQt_QtAll-Qt$${QT_MAJOR_VERSION}-PythonXY`
`34`	`34`	`TEMPLATE = lib`
`35`	`35`
`36`	`36`	`DESTDIR = ../../lib`