From d6c1bd7dfd3cd98870d2933870a31faf5bbfedb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= Date: Thu, 2 Nov 2006 15:15:07 +0000 Subject: [PATCH] Upgrade to Qt-4.2: - Add support for QtDBus library. - Adjust to changes in Qt's build system: No parallel build of debug and release libraries on Unix anymore. - Remove explicit "release" requirements for release builds, enabling custom build variants. [SVN r35809] --- src/tools/qt4.jam | 172 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 119 insertions(+), 53 deletions(-) diff --git a/src/tools/qt4.jam b/src/tools/qt4.jam index 7b3baa4fb..7da33dc20 100644 --- a/src/tools/qt4.jam +++ b/src/tools/qt4.jam @@ -114,7 +114,7 @@ rule init ( prefix ) if [ glob $(.prefix)/Jamroot ] { # Import all Qt Modules - local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools ; + local all-libraries = QtCore QtGui QtNetwork QtXml QtSql QtSvg QtOpenGL Qt3Support QtTest QtAssistantClient QtDesigner QtUiTools QtDBus ; for local l in $(all-libraries) { alias $(l) @@ -144,20 +144,32 @@ rule init ( prefix ) # Also, on NT we must link against qtmain library (for WinMain) suffix_version = "4" ; suffix_debug = "d" ; - lib qtmain : : qtmain$(suffix_debug) debug ; - lib qtmain : : qtmain release ; + lib qtmain + : # sources + : # requirements + qtmain$(suffix_debug) + debug + ; + + lib qtmain + : # sources + : # requirements + qtmain + ; main = qtmain ; } else { - # On X11, debug versions of libs have "_debug" suffix + # Since Qt-4.2, debug versions on unix have to be built separately + # and therefore have no suffix. suffix_version = "" ; - suffix_debug = "_debug" ; + suffix_debug = "" ; } lib QtCore : $(main) - : QtCore$(suffix_version) release - : + : # requirements + QtCore$(suffix_version) + : # default-build : # usage-requirements QT_CORE_LIB QT_NO_DEBUG @@ -165,8 +177,10 @@ rule init ( prefix ) $(usage-requirements) ; lib QtCore : $(main) - : QtCore$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtCore$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_CORE_LIB $(.prefix)/include/QtCore @@ -174,8 +188,9 @@ rule init ( prefix ) ; lib QtGui : QtCore - : QtGui$(suffix_version) release - : + : # requirements + QtGui$(suffix_version) + : # default-build : # usage-requirements QT_GUI_LIB $(.prefix)/include/QtGui @@ -183,8 +198,10 @@ rule init ( prefix ) ; lib QtGui : QtCore - : QtGui$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtGui$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_GUI_LIB $(.prefix)/include/QtGui @@ -192,53 +209,64 @@ rule init ( prefix ) ; lib QtNetwork : QtCore - : QtNetwork$(suffix_version) release - : + : # requirements + QtNetwork$(suffix_version) + : # default-build : # usage-requirements QT_NETWORK_LIB $(.prefix)/include/QtNetwork ; lib QtNetwork : QtCore - : QtNetwork$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtNetwork$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_NETWORK_LIB $(.prefix)/include/QtNetwork ; lib QtSql : QtCore - : QtSql$(suffix_version) release - : + : # requirements + QtSql$(suffix_version) + : # default-build : # usage-requirements QT_SQL_LIB $(.prefix)/include/QtSql ; lib QtSql : QtCore - : QtSql$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtSql$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_SQL_LIB $(.prefix)/include/QtSql ; lib QtXml : QtCore - : QtXml$(suffix_version) release - : + : # requirements + QtXml$(suffix_version) + : # default-build : # usage-requirements QT_XML_LIB $(.prefix)/include/QtXml ; lib QtXml : QtCore - : QtXml$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtXml$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_XML_LIB $(.prefix)/include/QtXml ; lib Qt3Support : QtGui QtNetwork QtXml QtSql - : Qt3Support$(suffix_version) release on - : + : # requirements + Qt3Support$(suffix_version) + on + : # default-build : # usage-requirements QT_QT3SUPPORT_LIB QT3_SUPPORT @@ -246,8 +274,11 @@ rule init ( prefix ) ; lib Qt3Support : QtGui QtNetwork QtXml QtSql - : Qt3Support$(suffix_debug)$(suffix_version) debug on - : + : # requirements + Qt3Support$(suffix_debug)$(suffix_version) + on + debug + : # default-build : # usage-requirements QT_QT3SUPPORT_LIB QT3_SUPPORT @@ -260,15 +291,18 @@ rule init ( prefix ) # OpenGl Support lib QtOpenGL : QtGui - : QtOpenGL$(suffix_version) release - : + : # requirements + QtOpenGL$(suffix_version) + : # default-build : # usage-requirements QT_OPENGL_LIB $(.prefix)/include/QtOpenGL ; lib QtOpenGL : QtGui - : QtOpenGL$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtOpenGL$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_OPENGL_LIB $(.prefix)/include/QtOpenGL @@ -276,15 +310,18 @@ rule init ( prefix ) # SVG-Support (Qt 4.1) lib QtSvg : QtXml QtOpenGL - : QtSvg$(suffix_version) release - : + : # requirements + QtSvg$(suffix_version) + : # default-build : # usage-requirements QT_SVG_LIB $(.prefix)/include/QtSvg ; lib QtSvg : QtXml QtOpenGL - : QtSvg$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtSvg$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements QT_SVG_LIB $(.prefix)/include/QtSvg @@ -292,60 +329,89 @@ rule init ( prefix ) # Test-Support (Qt 4.1) lib QtTest : QtCore - : QtTest$(suffix_version) release - : + : # requirements + QtTest$(suffix_version) + : # default-build : # usage-requirements $(.prefix)/include/QtTest ; lib QtTest : QtCore - : QtTest$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtTest$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements $(.prefix)/include/QtTest ; # AssistantClient Support lib QtAssistantClient : QtGui - : QtAssistantClient$(suffix_version) release - : + : # requirements + QtAssistantClient$(suffix_version) + : # default-build : # usage-requirements $(.prefix)/include/QtAssistant ; lib QtAssistantClient : QtGui - : QtAssistantClient$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtAssistantClient$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements $(.prefix)/include/QtAssistant ; # Qt designer library lib QtDesigner : QtGui QtXml - : QtDesigner$(suffix_version) release - : + : # requirements + QtDesigner$(suffix_version) + : # default-build : # usage-requirements $(.prefix)/include/QtDesigner ; lib QtDesigner : QtGui QtXml - : QtDesigner$(suffix_debug)$(suffix_version) debug - : + : # requirements + QtDesigner$(suffix_debug)$(suffix_version) + debug + : # default-build : # usage-requirements $(.prefix)/include/QtDesigner ; # Support for dynamic Widgets (Qt 4.1) lib QtUiTools : QtGui QtXml - : QtUiTools release - : + : # requirements + QtUiTools + : # default-build : # usage-requirements $(.prefix)/include/QtUiTools ; lib QtUiTools : QtGui QtXml - : QtUiTools$(suffix_debug) debug - : + : # requirements + QtUiTools$(suffix_debug) + debug + : # default-build : # usage-requirements $(.prefix)/include/QtUiTools ; + + # DBus-Support (Qt 4.2) + lib QtDBus : QtXml + : # requirements + QtDBus$(suffix_version) + : # default-build + : # usage-requirements + $(.prefix)/include/QtDBus + ; + lib QtDBus : QtXml + : # requirements + QtDBus$(suffix_debug)$(suffix_version) + debug + : # default-build + : # usage-requirements + $(.prefix)/include/QtDBus + ; } }