From f6d0b717001c17aa985c3159ad2df8cc40fbbc02 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Mon, 8 Nov 2010 20:09:10 -0600 Subject: Some changes for qtbase --- bin/syncqt | 17 +------- configure | 6 +-- qtbase.pro | 32 +-------------- src/plugins/accessible/accessible.pro | 1 - src/plugins/plugins.pro | 4 +- src/src.pro | 75 ++--------------------------------- src/tools/tools.pro | 5 +-- tools/configure/configureapp.cpp | 2 +- 8 files changed, 11 insertions(+), 131 deletions(-) diff --git a/bin/syncqt b/bin/syncqt index b25a432d56..451521c97b 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -34,28 +34,13 @@ my %modules = ( # path to module name map "QtOpenVG" => "$basedir/src/openvg", "QtCore" => "$basedir/src/corelib", "QtXml" => "$basedir/src/xml", - "QtXmlPatterns" => "$basedir/src/xmlpatterns", "QtSql" => "$basedir/src/sql", "QtNetwork" => "$basedir/src/network", "QtSvg" => "$basedir/src/svg", - "QtDeclarative" => "$basedir/src/declarative", - "QtScript" => "$basedir/src/script", - "QtScriptTools" => "$basedir/src/scripttools", - "Qt3Support" => "$basedir/src/qt3support", - "ActiveQt" => "$basedir/src/activeqt", "QtTest" => "$basedir/src/testlib", - "QtHelp" => "$basedir/tools/assistant/lib", - "QtDesigner" => "$basedir/tools/designer/src/lib", - "QtUiTools" => "$basedir/tools/designer/src/uitools", "QtDBus" => "$basedir/src/dbus", - "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", - "phonon" => "$basedir/src/phonon", - "QtMultimedia" => "$basedir/src/multimedia", - "QtMeeGoGraphicsSystemHelper" => "$basedir/tools/qmeegographicssystemhelper", ); my %moduleheaders = ( # restrict the module headers to those found in relative path - "QtWebKit" => "../WebKit/qt/Api", - "phonon" => "../3rdparty/phonon/phonon", ); #$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; @@ -694,7 +679,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); my @ignore_for_include_check = ( "qatomic.h" ); my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); -my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" ); +my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDBus}" ); my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir diff --git a/configure b/configure index 976267ebff..5e3e40fab1 100755 --- a/configure +++ b/configure @@ -8820,11 +8820,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then - "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" - if [ -f "${relpath}/projects.pro" ]; then + "$outpath/bin/qmake" -prl -r "${relpath}/qtbase.pro" + if [ -f "${relpath}/qtbase.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtbase.pro" -o "$mkfile" fi fi diff --git a/qtbase.pro b/qtbase.pro index 408c8e580c..5b246ef703 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -7,30 +7,7 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip -isEmpty(QT_BUILD_PARTS) { #defaults - symbian { - QT_BUILD_PARTS = libs tools examples demos - } else { - QT_BUILD_PARTS = libs tools examples demos docs translations - } -} else { #make sure the order makes sense - contains(QT_BUILD_PARTS, translations) { - QT_BUILD_PARTS -= translations - QT_BUILD_PARTS = translations $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, tools) { - QT_BUILD_PARTS -= tools - QT_BUILD_PARTS = tools $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, libs) { - QT_BUILD_PARTS -= libs - QT_BUILD_PARTS = libs $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, qmake) { - QT_BUILD_PARTS -= qmake - QT_BUILD_PARTS = qmake $$QT_BUILD_PARTS - } -} +QT_BUILD_PARTS = libs qmake #process the projects for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { @@ -163,10 +140,3 @@ win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { mkspecs.files += $$QT_BUILD_TREE/mkspecs/default } INSTALLS += mkspecs - -false:macx { #mac install location - macdocs.files = $$htmldocs.files - macdocs.path = /Developer/Documentation/Qt - INSTALLS += macdocs -} - diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro index a7caf07106..26c7d3066d 100644 --- a/src/plugins/accessible/accessible.pro +++ b/src/plugins/accessible/accessible.pro @@ -2,5 +2,4 @@ TEMPLATE = subdirs contains(QT_CONFIG, accessibility) { SUBDIRS += widgets - contains(QT_CONFIG, qt3support):SUBDIRS += compat } diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 7479d2facb..d0d7188e06 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS *= sqldrivers script bearer +SUBDIRS *= sqldrivers bearer unix:!symbian { contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs } else { @@ -12,6 +12,4 @@ embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 -contains(QT_CONFIG, phonon): SUBDIRS *= phonon qpa:SUBDIRS += platforms -contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling diff --git a/src/src.pro b/src/src.pro index 0908911e6c..5c33e92dcd 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,33 +4,19 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain symbian:SRC_SUBDIRS += src_s60main -SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib +SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui -!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) -win32:SRC_SUBDIRS += src_activeqt contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg -contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns -contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon -contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg -contains(QT_CONFIG, script): SRC_SUBDIRS += src_script -contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative -contains(QT_CONFIG, webkit) { - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore - SRC_SUBDIRS += src_webkit -} -!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools SRC_SUBDIRS += src_plugins -contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports -contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative -# s60installs need to be at the end, because projects.pro does an ordered build, +# s60installs need to be at the end, because qtbase.pro does an ordered build, # and s60installs depends on all the others. symbian:SRC_SUBDIRS += src_s60installs @@ -44,8 +30,6 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib src_corelib.target = sub-corelib src_xml.subdir = $$QT_SOURCE_TREE/src/xml src_xml.target = sub-xml -src_xmlpatterns.subdir = $$QT_SOURCE_TREE/src/xmlpatterns -src_xmlpatterns.target = sub-xmlpatterns src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus src_dbus.target = sub-dbus src_gui.subdir = $$QT_SOURCE_TREE/src/gui @@ -56,36 +40,14 @@ src_network.subdir = $$QT_SOURCE_TREE/src/network src_network.target = sub-network src_svg.subdir = $$QT_SOURCE_TREE/src/svg src_svg.target = sub-svg -src_script.subdir = $$QT_SOURCE_TREE/src/script -src_script.target = sub-script -src_scripttools.subdir = $$QT_SOURCE_TREE/src/scripttools -src_scripttools.target = sub-scripttools src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl src_opengl.target = sub-opengl src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg src_openvg.target = sub-openvg -src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support -src_qt3support.target = sub-qt3support -src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon -src_phonon.target = sub-phonon -src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia -src_multimedia.target = sub-multimedia -src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt -src_activeqt.target = sub-activeqt src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins src_plugins.target = sub-plugins -src_imports.subdir = $$QT_SOURCE_TREE/src/imports -src_imports.target = sub-imports src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib -src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore -src_javascriptcore.target = sub-javascriptcore -src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore -src_webkit.target = sub-webkit -src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative -src_declarative.target = sub-declarative -src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative -src_webkit_declarative.target = sub-webkitdeclarative #CONFIG += ordered !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { @@ -93,57 +55,26 @@ src_webkit_declarative.target = sub-webkitdeclarative src_gui.depends = src_corelib src_tools_uic embedded: src_gui.depends += src_network src_xml.depends = src_corelib - src_xmlpatterns.depends = src_corelib src_network src_dbus.depends = src_corelib src_xml src_svg.depends = src_corelib src_gui - src_script.depends = src_corelib - src_scripttools.depends = src_script src_gui src_network src_network.depends = src_corelib src_opengl.depends = src_gui src_openvg.depends = src_gui src_sql.depends = src_corelib src_testlib.depends = src_corelib - src_qt3support.depends = src_gui src_xml src_network src_sql src_tools_idc.depends = src_corelib # target defined in tools.pro src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro - src_phonon.depends = src_gui - src_multimedia.depends = src_gui - contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl - src_activeqt.depends = src_tools_idc src_gui - src_declarative.depends = src_gui src_script src_network - src_plugins.depends = src_gui src_sql src_svg - contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia - contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative + src_plugins.depends = src_gui src_sql src_svg src_xml src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs - src_imports.depends = src_gui src_declarative - contains(QT_CONFIG, webkit) { - src_webkit.depends = src_gui src_sql src_network - contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns - src_imports.depends += src_webkit - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) { - src_webkit.depends += src_javascriptcore - src_javascriptcore.depends = src_corelib - } - } - contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support - contains(QT_CONFIG, dbus):{ - src_plugins.depends += src_dbus - src_phonon.depends += src_dbus - } contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { src_plugins.depends += src_opengl src_declarative.depends += src_opengl src_webkit.depends += src_opengl } - contains(QT_CONFIG, xmlpatterns) { - src_declarative.depends += src_xmlpatterns - src_webkit.depends += src_xmlpatterns - } contains(QT_CONFIG, svg) { src_declarative.depends += src_svg } - contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit } diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 4736d09cbe..ca42da6edf 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !cross_compile { - contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 win32:!wince*: SRC_SUBDIRS += src_tools_idc } @@ -16,8 +15,6 @@ src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc src_tools_rcc.target = sub-rcc src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic src_tools_uic.target = sub-uic -src_tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic3 -src_tools_uic3.target = sub-uic3 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc src_tools_idc.target = sub-idc @@ -43,7 +40,7 @@ EXTRA_RELEASE_TARGETS = subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE)) - !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info { + !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc)):!separate_debug_info { #debug debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 494ea52ec5..c6819db8b1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3856,7 +3856,7 @@ void Configure::generateMakefiles() } // don't pass -spec - .qmake.cache has it already args << "-r"; - args << (sourcePath + "/projects.pro"); + args << (sourcePath + "/qtbase.pro"); args << "-o"; args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) -- cgit v1.2.3