From ba9936e0011fa8e36eec649c4531e251f88bb804 Mon Sep 17 00:00:00 2001 From: William Kyngesburye Date: Tue, 17 Dec 2013 08:43:45 -0600 Subject: [PATCH] always bundle QtDbus, just in case --- mac/cmake/1qt.cmake.in | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mac/cmake/1qt.cmake.in b/mac/cmake/1qt.cmake.in index bc4790cd455f..1658e992a58f 100644 --- a/mac/cmake/1qt.cmake.in +++ b/mac/cmake/1qt.cmake.in @@ -14,18 +14,9 @@ SET (QT_FWVER @QT_VERSION_MAJOR@) # build list of Qt frameworks to bundle -# core list, includes dependencies -SET (QTLISTQG QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns) -SET (PYQTLIST Qt QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns) -# see if QtWebKit links QtDBus -EXECUTE_PROCESS (COMMAND otool -L @QT_QTWEBKIT_LIBRARY@/QtWebKit - OUTPUT_VARIABLE QTWEBKIT_DBUS) -IF (QTWEBKIT_DBUS MATCHES ".*QtDBus.framework.*") - SET (QTLISTQG ${QTLISTQG} QtDBus) -ENDIF () -# additional Qt may be needed by plugins -SET (QTLISTQG ${QTLISTQG} QtMultimedia QtOpenGL) -SET (PYQTLIST ${PYQTLIST} QtMultimedia QtOpenGL) +# core list, includes dependencies and used by extra plugins +SET (QTLISTQG QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns QtDBus QtMultimedia QtOpenGL) +SET (PYQTLIST Qt QtCore QtGui phonon QtXml QtNetwork QtSvg QtSql QtWebKit QtXmlPatterns QtDBus QtMultimedia QtOpenGL) # add Qsci.so, if available IF (@QSCI_FOUND@)