[Backport] Try to fix library names and linking problems

(cherry picked from commit MeVisLab/pythonqt@0ed126d)

Author: usiems

build/PythonQt.prf

@@ -11,6 +11,8 @@ CONFIG(debug, debug|release) {
   DEBUG_EXT = 
 }
 
-win32-g++: LIBS += $$DESTDIR/../lib/PythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll
-win32-*msvc*: LIBS += $$DESTDIR/../lib/PythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
-unix: LIBS += -L$$DESTDIR/../lib -lPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}
+PYTHONQT_LIB_NAME=PythonQt-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}
+
+win32-g++: LIBS += $$DESTDIR/../lib/$${PYTHONQT_LIB_NAME}.dll
+win32-*msvc*: LIBS += $$DESTDIR/../lib/$${PYTHONQT_LIB_NAME}.lib
+unix: LIBS += -L$$DESTDIR/../lib -l$${PYTHONQT_LIB_NAME}

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

@@ -11,7 +11,10 @@ isEmpty( PYTHONQTALL_CONFIG ) {
   qtHaveModule(svg):CONFIG += PythonQtSvg
   qtHaveModule(sql):CONFIG += PythonQtSql
   qtHaveModule(network):CONFIG += PythonQtNetwork
-  qtHaveModule(opengl):CONFIG += PythonQtOpengl
+  lessThan(QT_MAJOR_VERSION, 6) {
+    # module is empty in Qt6
+    qtHaveModule(opengl):CONFIG += PythonQtOpengl
+  }
   qtHaveModule(xml):CONFIG += PythonQtXml
   qtHaveModule(xmlpatterns):CONFIG += PythonQtXmlpatterns
   qtHaveModule(multimedia):CONFIG += PythonQtMultimedia
@@ -93,6 +96,7 @@ PythonQtSvg {
   DEFINES += PYTHONQT_WITH_SVG
   Xinclude (com_trolltech_qt_svg)
   QT += svg
+  !lessThan(QT_MAJOR_VERSION,6): QT += svgwidgets
 }
 
 PythonQtSql {

src/src.pro

@@ -4,11 +4,7 @@
 # $Source$
 # --------------------------------------------------
 
-contains(QT_MAJOR_VERSION, 6) {
-    TARGET = PythonQt-Qt6-PythonXY
-} else {
-    TARGET = PythonQt-Qt5-PythonXY
-}
+TARGET = PythonQt-Qt$${QT_MAJOR_VERSION}-PythonXY
 TEMPLATE = lib
 
 DESTDIR    = ../lib