File tree 3 files changed +10
-9
lines changed
extensions/PythonQt_QtAll
3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,8 @@ CONFIG(debug, debug|release) {
11
11
DEBUG_EXT =
12
12
}
13
13
14
- win32-g++: LIBS += $$DESTDIR/../lib/PythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.dll
15
- win32-*msvc*: LIBS += $$DESTDIR/../lib/PythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}.lib
16
- unix: LIBS += -L$$DESTDIR/../lib -lPythonQt-Qt5-Python$${PYTHON_VERSION}$${DEBUG_EXT}
14
+ PYTHONQT_LIB_NAME=PythonQt-Qt$${QT_MAJOR_VERSION}-Python$${PYTHON_VERSION}$${DEBUG_EXT}
15
+
16
+ win32-g++: LIBS += $$DESTDIR/../lib/$${PYTHONQT_LIB_NAME}.dll
17
+ win32-*msvc*: LIBS += $$DESTDIR/../lib/$${PYTHONQT_LIB_NAME}.lib
18
+ unix: LIBS += -L$$DESTDIR/../lib -l$${PYTHONQT_LIB_NAME}
Original file line number Diff line number Diff line change @@ -11,7 +11,10 @@ isEmpty( PYTHONQTALL_CONFIG ) {
11
11
qtHaveModule(svg):CONFIG += PythonQtSvg
12
12
qtHaveModule(sql):CONFIG += PythonQtSql
13
13
qtHaveModule(network):CONFIG += PythonQtNetwork
14
- qtHaveModule(opengl):CONFIG += PythonQtOpengl
14
+ lessThan(QT_MAJOR_VERSION, 6) {
15
+ # module is empty in Qt6
16
+ qtHaveModule(opengl):CONFIG += PythonQtOpengl
17
+ }
15
18
qtHaveModule(xml):CONFIG += PythonQtXml
16
19
qtHaveModule(xmlpatterns):CONFIG += PythonQtXmlpatterns
17
20
qtHaveModule(multimedia):CONFIG += PythonQtMultimedia
Original file line number Diff line number Diff line change 4
4
# $Source$
5
5
# --------------------------------------------------
6
6
7
- contains (QT_MAJOR_VERSION, 6 ) {
8
- TARGET = PythonQt-Qt6-PythonXY
9
- } else {
10
- TARGET = PythonQt-Qt5-PythonXY
11
- }
7
+ TARGET = PythonQt-Qt $${QT_MAJOR_VERSION }-PythonXY
12
8
TEMPLATE = lib
13
9
14
10
DESTDIR = ../lib
You can’t perform that action at this time.
0 commit comments