Skip to content

Commit ba9936e

Browse files
committed
always bundle QtDbus, just in case
1 parent cf39d71 commit ba9936e

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

mac/cmake/1qt.cmake.in

+3-12
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,9 @@ SET (QT_FWVER @QT_VERSION_MAJOR@)
1414

1515
# build list of Qt frameworks to bundle
1616

17-
# core list, includes dependencies
18-
SET (QTLISTQG QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns)
19-
SET (PYQTLIST Qt QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns)
20-
# see if QtWebKit links QtDBus
21-
EXECUTE_PROCESS (COMMAND otool -L @QT_QTWEBKIT_LIBRARY@/QtWebKit
22-
OUTPUT_VARIABLE QTWEBKIT_DBUS)
23-
IF (QTWEBKIT_DBUS MATCHES ".*QtDBus.framework.*")
24-
SET (QTLISTQG ${QTLISTQG} QtDBus)
25-
ENDIF ()
26-
# additional Qt may be needed by plugins
27-
SET (QTLISTQG ${QTLISTQG} QtMultimedia QtOpenGL)
28-
SET (PYQTLIST ${PYQTLIST} QtMultimedia QtOpenGL)
17+
# core list, includes dependencies and used by extra plugins
18+
SET (QTLISTQG QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns QtDBus QtMultimedia QtOpenGL)
19+
SET (PYQTLIST Qt QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns QtDBus QtMultimedia QtOpenGL)
2920

3021
# add Qsci.so, if available
3122
IF (@QSCI_FOUND@)

0 commit comments

Comments
 (0)