Skip to content

Commit 85e6e15

Browse files
committed
Try to fix library names and linking problems
1 parent fcf0d5e commit 85e6e15

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build/PythonQt.prf

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ CONFIG(debug, debug|release) {
1111
DEBUG_EXT =
1212
}
1313

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}

extensions/PythonQt_QtAll/PythonQt_QtAll.pro

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ isEmpty( PYTHONQTALL_CONFIG ) {
1111
qtHaveModule(svg):CONFIG += PythonQtSvg
1212
qtHaveModule(sql):CONFIG += PythonQtSql
1313
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+
}
1518
qtHaveModule(xml):CONFIG += PythonQtXml
1619
qtHaveModule(xmlpatterns):CONFIG += PythonQtXmlpatterns
1720
qtHaveModule(multimedia):CONFIG += PythonQtMultimedia

src/src.pro

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
# $Source$
55
# --------------------------------------------------
66

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
128
TEMPLATE = lib
139

1410
DESTDIR = ../lib

0 commit comments

Comments
 (0)