浏览代码

ENH: Add support for QtScriptTools in Qt 4.5.

Clinton Stimpson 16 年之前
父节点
当前提交
f4f5da869c
共有 2 个文件被更改,包括 8 次插入3 次删除
  1. 5 1
      Modules/FindQt4.cmake
  2. 3 2
      Modules/UseQt4.cmake

+ 5 - 1
Modules/FindQt4.cmake

@@ -159,6 +159,7 @@
 #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
 #  QT_QTWEBKIT_FOUND        True if QtWebKit was found.
 #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
 #  QT_QTXMLPATTERNS_FOUND   True if QtXmlPatterns was found.
 #  QT_PHONON_FOUND          True if phonon was found.
 #  QT_PHONON_FOUND          True if phonon was found.
+#  QT_QTSCRIPTTOOLS_FOUND   True if QtScriptTools was found.
 #
 #
 #
 #
 #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
 #  QT_DEFINITIONS   Definitions to use when compiling code that uses Qt.
@@ -202,6 +203,7 @@
 #  QT_QTWEBKIT_INCLUDE_DIR     Path to "include/QtWebKit"
 #  QT_QTWEBKIT_INCLUDE_DIR     Path to "include/QtWebKit"
 #  QT_QTXMLPATTERNS_INCLUDE_DIR  Path to "include/QtXmlPatterns"
 #  QT_QTXMLPATTERNS_INCLUDE_DIR  Path to "include/QtXmlPatterns"
 #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
 #  QT_PHONON_INCLUDE_DIR       Path to "include/phonon"
+#  QT_QTSCRIPTTOOLS_INCLUDE_DIR       Path to "include/QtScriptTools"
 #                            
 #                            
 #  QT_BINARY_DIR               Path to "bin" of Qt4
 #  QT_BINARY_DIR               Path to "bin" of Qt4
 #  QT_LIBRARY_DIR              Path to "lib" of Qt4
 #  QT_LIBRARY_DIR              Path to "lib" of Qt4
@@ -241,6 +243,7 @@
 #  QT_QTWEBKIT_LIBRARY              The QtWebKit library
 #  QT_QTWEBKIT_LIBRARY              The QtWebKit library
 #  QT_QTXMLPATTERNS_LIBRARY         The QtXmlPatterns library
 #  QT_QTXMLPATTERNS_LIBRARY         The QtXmlPatterns library
 #  QT_PHONON_LIBRARY                The phonon library
 #  QT_PHONON_LIBRARY                The phonon library
+#  QT_QTSCRIPTTOOLS_LIBRARY         The QtScriptTools library
 #  
 #  
 # also defined, but NOT for general use are
 # also defined, but NOT for general use are
 #  QT_MOC_EXECUTABLE          Where to find the moc tool.
 #  QT_MOC_EXECUTABLE          Where to find the moc tool.
@@ -544,7 +547,7 @@ IF (QT4_QMAKE_FOUND)
 
 
   SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
   SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools 
                  QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
                  QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork 
-                 QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
+                 QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
 
 
   IF(QT_QMAKE_CHANGED)
   IF(QT_QMAKE_CHANGED)
     FOREACH(QT_MODULE ${QT_MODULES})
     FOREACH(QT_MODULE ${QT_MODULES})
@@ -832,6 +835,7 @@ IF (QT4_QMAKE_FOUND)
   _QT4_ADJUST_LIB_VARS(PHONON)
   _QT4_ADJUST_LIB_VARS(PHONON)
   _QT4_ADJUST_LIB_VARS(QTCLUCENE)
   _QT4_ADJUST_LIB_VARS(QTCLUCENE)
   _QT4_ADJUST_LIB_VARS(QTMOTIF)
   _QT4_ADJUST_LIB_VARS(QTMOTIF)
+  _QT4_ADJUST_LIB_VARS(QTSCRIPTTOOLS)
 
 
   # platform dependent libraries
   # platform dependent libraries
   IF(WIN32)
   IF(WIN32)

+ 3 - 2
Modules/UseQt4.cmake

@@ -53,12 +53,13 @@ SET(QT_QTDBUS_MODULE_DEPENDS QTXML QTCORE)
 SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
 SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
 SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
 SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
+SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
 
 
 # Qt modules  (in order of dependence)
 # Qt modules  (in order of dependence)
 FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
 FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
                QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP 
                QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP 
-               QTWEBKIT PHONON QTGUI QTTEST QTDBUS QTXML QTSQL QTXMLPATTERNS 
-               QTNETWORK QTCORE)
+               QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL 
+               QTXMLPATTERNS QTNETWORK QTCORE)
 
 
   IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
   IF (QT_USE_${module} OR QT_USE_${module}_DEPENDS)
     IF (QT_${module}_FOUND)
     IF (QT_${module}_FOUND)