Merged master into qtquick2.

2011-04-27 14:13:27 +02:00 · 2011-04-27 14:13:27 +02:00 · 9e57cd5e6a
commit 9e57cd5e6a
parent eae8fb8599 106c57c238
359 changed files with 3227 additions and 867 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,261 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+examples/*/*/*
+!examples/*/*/*[.]*
+!examples/*/*/README
+examples/*/*/*[.]app
+!examples/declarative/*
+!examples/tutorials/*
+!examples/tutorials/*/*
+!examples/ja_JP/*/*
+demos/*/*
+!demos/spectrum/*
+demos/spectrum/bin
+!demos/*/*[.]*
+demos/*/*[.]app
+!demos/declarative/*
+config.tests/*/*/*
+!config.tests/*/*/*[.]*
+config.tests/*/*/*[.]app
+
+callgrind.out.*
+pcviewer.cfg
+*~
+*.a
+*.la
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*_pch.h.cpp
+*_resource.rc
+.#*
+*.*#
+core
+.qmake.cache
+.qmake.vars
+*.prl
+tags
+.DS_Store
+*.debug
+Makefile*
+!qmake/Makefile.win32*
+!qmake/Makefile.unix
+*.prl
+*.app
+*.pro.user
+*.qmlproject.user
+*.gcov
+bin/Qt*.dll
+bin/assistant*
+bin/designer*
+bin/dumpcpp*
+bin/idc*
+bin/linguist*
+bin/lrelease*
+bin/lupdate*
+bin/lconvert*
+bin/moc*
+bin/makeqpf*
+bin/pixeltool*
+bin/qmake*
+bin/qdoc3*
+bin/qt3to4*
+bin/qtdemo*
+bin/qttracereplay*
+bin/rcc*
+bin/uic*
+bin/patternist*
+bin/phonon*
+bin/qcollectiongenerator*
+bin/qdbus*
+bin/qhelpconverter*
+bin/qhelpgenerator*
+bin/qtconfig*
+bin/xmlpatterns*
+bin/cetest*
+bin/collectiongenerator
+bin/helpconverter
+bin/helpgenerator
+bin/kmap2qmap*
+bin/qlalr*
+bin/qmlconv*
+bin/qmldebugger*
+bin/qml*
+bin/qttracereplay*
+configure.cache
+config.status
+mkspecs/default
+mkspecs/qconfig.pri
+moc_*.cpp
+qmake/qmake.exe
+qmake/Makefile.bak
+src/corelib/global/qconfig.cpp
+src/corelib/global/qconfig.h
+src/corelib/global/qconfig.h.qmake
+ui_*.h
+tests/auto/qprocess/test*/*.exe
+tests/auto/qtcpsocket/stressTest/*.exe
+tests/auto/qprocess/fileWriterProcess/*.exe
+tests/auto/qmake/testdata/quotedfilenames/*.exe
+tests/auto/compilerwarnings/*.exe
+tests/auto/qmake/testdata/quotedfilenames/test.cpp
+tests/auto/qprocess/fileWriterProcess.txt
+.com.apple.timemachine.supported
+tests/auto/qlibrary/libmylib.so*
+tests/auto/qresourceengine/runtime_resource.rcc
+tools/qtestlib/chart/chart*
+tools/qtestlib/updater/updater*
+tools/activeqt/testcon/testcon.tlb
+translations/*.qm
+translations/*_untranslated.ts
+qrc_*.cpp
+
+# Test generated files
+QObject.log
+tst_*
+!tst_*.*
+tst_*.log
+tst_*.debug
+tst_*~
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# WebKit temp files
+src/3rdparty/webkit/WebCore/mocinclude.tmp
+src/3rdparty/webkit/includes.txt
+src/3rdparty/webkit/includes2.txt
+
+# Symlinks generated by configure
+tools/qvfb/qvfbhdr.h
+tools/qvfb/qlock_p.h
+tools/qvfb/qlock.cpp
+tools/qvfb/qwssignalhandler.cpp
+tools/qvfb/qwssignalhandler_p.h
+.DS_Store
+.pch
+.rcc
+*.app
+config.status
+config.tests/unix/cups/cups
+config.tests/unix/getaddrinfo/getaddrinfo
+config.tests/unix/getifaddrs/getifaddrs
+config.tests/unix/iconv/iconv
+config.tests/unix/ipv6/ipv6
+config.tests/unix/ipv6ifname/ipv6ifname
+config.tests/unix/largefile/largefile
+config.tests/unix/nis/nis
+config.tests/unix/odbc/odbc
+config.tests/unix/openssl/openssl
+config.tests/unix/stl/stl
+config.tests/unix/zlib/zlib
+config.tests/unix/3dnow/3dnow
+config.tests/unix/mmx/mmx
+config.tests/unix/sse/sse
+config.tests/unix/sse2/sse2
+
+
+
+# Directories to ignore
+# ---------------------
+
+debug
+examples/tools/plugandpaint/plugins
+include/*
+include/*/*
+lib/*
+!lib/fonts
+!lib/README
+plugins/*/*
+release
+tmp
+doc-build
+doc/html/*
+doc/qch
+doc-build
+.rcc
+.pch
+.metadata
+
+# Symbian build system generated files
+# ---------------------
+
+ABLD.BAT
+bld.inf*
+*.mmp
+*.mk
+*.rss
+*.loc
+!s60main.rss
+*.pkg
+plugin_commonu.def
+*.qtplugin
+*.sis
+*.sisx
+*.lst
+*.exe
+*.mif
+*.rsc
+*.sym
+*.lib
+
+# runonphone crash dumps
+d_exc_*.txt
+d_exc_*.stk
+
+# Generated by abldfast.bat from devtools.
+.abldsteps.*
+
+# Carbide project files
+# ---------------------
+.project
+.cproject
+.make.cache
+*.d
+
+qtc-debugging-helper
+src/corelib/lib
+src/network/lib
+src/xml/lib/
+
+.pc/
+
+# INTEGRITY generated files
+*.gpj
+*.int
+*.ael
+*.dla
+*.dnm
+*.dep
+*.map
+work
--- a/bin/syncqt
+++ b/bin/syncqt
@ -12,55 +12,30 @@
 use File::Basename;
 use File::Path;
 use Cwd;
+use Cwd 'abs_path';
 use Config;
 use strict;

-for (my $i = 0; $i < $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-base-dir" && $i < $#ARGV - 1) {
-        $ENV{"QTDIR"} = $ARGV[$i + 1];
-        last;
-    }
-}
+# set output basedir to be where ever syncqt is run from
+our $out_basedir = getcwd();
+$out_basedir =~ s=\\=/=g;
+our $basedir;
+our $quoted_basedir;

-die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check

-# global variables
-my $isunix = 0;
-my $basedir = $ENV{"QTDIR"};
-$basedir =~ s=\\=/=g;
-my %modules = ( # path to module name map
-        "QtGui" => "$basedir/src/gui",
-        "QtOpenGL" => "$basedir/src/opengl",
-        "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",
-);
+# try to figure out where QtBase is located
+# normally the script location should be enough, if not fall back to
+# QTDIR environment variable. If that doesn't work, later ask the
+# user to use the -qtdir option explicitly.
+my $qtbasedir = dirname(dirname($0));
+$qtbasedir = $ENV{"QTDIR"} if ($qtbasedir !~ /qtbase/);
+$qtbasedir =~ s=\\=/=g if (defined $qtbasedir);

-#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"};
+# will be defined based on the modules sync.profile
+our (%modules, %moduleheaders, %classnames, %mastercontent, %modulepris);

 # global variables (modified by options)
+my $isunix = 0;
 my $module = 0;
 my $showonly = 0;
 my $quiet = 0;
@ -69,13 +44,12 @@ my $force_win = 0;
 my $force_relative = 0;
 my $check_includes = 0;
 my $copy_headers = 0;
-my $create_uic_class_map = 1;
+my $create_uic_class_map = 0;
 my $create_private_headers = 1;
+my $no_module_fwd = 0;
 my @modules_to_sync ;
 $force_relative = 1 if ( -d "/System/Library/Frameworks" );
-my $out_basedir = $basedir;
-$out_basedir =~ s=\\=/=g;
-my $quoted_basedir = "\Q$basedir";
+

 # functions ----------------------------------------------------------

@ -89,14 +63,20 @@ my $quoted_basedir = "\Q$basedir";
 sub showUsage
 {
    print "$0 usage:\n";
+    print "  <module directory>    Specifies which module to sync header files for (required for shadow builds!)\n\n";
+
    print "  -copy                 Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n";
    print "  -remove-stale         Removes stale headers              (default: " . ($remove_stale ? "yes" : "no") . ")\n";
    print "  -relative             Force relative symlinks            (default: " . ($force_relative ? "yes" : "no") . ")\n";
    print "  -windows              Force platform to Windows          (default: " . ($force_win ? "yes" : "no") . ")\n";
    print "  -showonly             Show action but not perform        (default: " . ($showonly ? "yes" : "no") . ")\n";
    print "  -outdir <PATH>        Specify output directory for sync  (default: $out_basedir)\n";
+    print "  -qtdir <PATH>         Set the path to QtBase           (detected: " . (defined $qtbasedir ? $qtbasedir : "-none-") . ")\n";
    print "  -quiet                Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n";
-    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n";
+    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n";
+    print "                        Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n";
+    print "  -private              Force copy private headers         (default: " . ($create_private_headers ? "yes" : "no") . ")\n";
+    print "  -no-module-fwd        Don't create fwd includes for module pri files\n";
    print "  -help                 This help\n";
    exit 0;
 }
@ -169,37 +149,9 @@ sub shouldMasterInclude {
 sub classNames {
    my @ret;
    my ($iheader) = @_;
-    if(basename($iheader) eq "qglobal.h") {
-        push @ret, "QtGlobal";
-    } elsif(basename($iheader) eq "qendian.h") {
-        push @ret, "QtEndian";
-    } elsif(basename($iheader) eq "qconfig.h") {
-        push @ret, "QtConfig";
-    } elsif(basename($iheader) eq "qplugin.h") {
-        push @ret, "QtPlugin";
-    } elsif(basename($iheader) eq "qalgorithms.h") {
-        push @ret, "QtAlgorithms";
-    } elsif(basename($iheader) eq "qcontainerfwd.h") {
-        push @ret, "QtContainerFwd";
-    } elsif(basename($iheader) eq "qdebug.h") {
-        push @ret, "QtDebug";
-    } elsif(basename($iheader) eq "qevent.h") {
-        push @ret, "QtEvents";
-    } elsif(basename($iheader) eq "qnamespace.h") {
-        push @ret, "Qt"
-    } elsif(basename($iheader) eq "qssl.h") {
-        push @ret, "QSsl";
-    } elsif(basename($iheader) eq "qtest.h") {
-        push @ret, "QTest"
-    } elsif(basename($iheader) eq "qtconcurrentmap.h") {
-        push @ret, "QtConcurrentMap"
-    } elsif(basename($iheader) eq "qtconcurrentfilter.h") {
-        push @ret, "QtConcurrentFilter"
-    } elsif(basename($iheader) eq "qtconcurrentrun.h") {
-        push @ret, "QtConcurrentRun"
-    } elsif(basename($iheader) eq "qaudio.h") {
-        push @ret, "QAudio"
-    }
+
+    my $classname = $classnames{basename($iheader)};
+    push @ret, $classname if ($classname);

    my $parsable = "";
    if(open(F, "<$iheader")) {
@ -353,7 +305,6 @@ sub syncHeader {
 ######################################################################
 sub fixPaths {
    my ($file, $dir) = @_;
-    $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
    $file =~ s=\\=/=g;
    $dir =~ s=\\=/=g;

@ -374,6 +325,8 @@ sub fixPaths {
    return basename($file) if($file_dir eq $dir);

    #guts
+    while ($file_dir =~ s,/[^/]+/\.\./,/,) {}
+    while ($dir =~ s,/[^/]+/\.\./,/,) {}
    my $match_dir = 0;
    for(my $i = 1; $i < length($file_dir); $i++) {
        my $slash = index($file_dir, "/", $i);
@ -562,6 +515,52 @@ sub findFiles {
    return @files;
 }

+######################################################################
+# Syntax:  loadSyncProfile()
+#
+# Purpose: Locates the sync.profile.
+# Returns: Hashmap of module name -> directory.
+######################################################################
+sub loadSyncProfile {
+    my ($srcbase, $outbase) = @_;
+    print("srcbase = $$srcbase \n");
+    print("outbase = $$outbase \n");
+
+    my $syncprofile = "$$srcbase/sync.profile";
+    my $result;
+    unless ($result = do "$syncprofile") {
+        die "syncqt couldn't parse $syncprofile: $@" if $@;
+        die "syncqt couldn't execute $syncprofile: $!" unless defined $result;
+    }
+    return $result;
+}
+
+sub locateSyncProfile
+{
+    my ($directory) = @_;
+    my $syncprofile;
+    $directory = abs_path($directory);
+    while(!defined $syncprofile) {
+        local(*D);
+        if (opendir(D, $directory)) {
+            foreach my $file (sort readdir(D)) {
+                next if ($file =~ /^\.\.?$/);
+                $syncprofile = "$directory/$file" if ($file =~ /^sync\.profile$/);
+                last if (defined $syncprofile);
+            }
+            closedir(D);
+        }
+        last if (defined $syncprofile || $directory eq "/" || $directory =~ /^?:[\/\\]$/);
+        $directory = dirname($directory);
+    }
+    return $syncprofile;
+}
+
+# check if this is an in-source build, and if so use that as the basedir too
+$basedir = locateSyncProfile($out_basedir);
+$basedir = dirname($basedir) if ($basedir);
+$quoted_basedir = "\Q$basedir";
+
 # --------------------------------------------------------------------
 # "main" function
 # --------------------------------------------------------------------
@ -572,7 +571,7 @@ while ( @ARGV ) {

    #parse
    my $arg = shift @ARGV;
-    if ($arg eq "-h" || $arg eq "-help" || $arg eq "?") {
+    if ($arg eq "-h" || $arg eq "-help" || $arg eq "-?" || $arg eq "?") {
        $var = "show_help";
        $val = "yes";
    } elsif($arg eq "-copy") {
@ -604,10 +603,28 @@ while ( @ARGV ) {
    } elsif($arg eq "-quiet") {
        $var = "quiet";
        $val = "yes";
+    } elsif($arg eq "-private") {
+        $var = "create_private_headers";
+        $val = "yes";
+    } elsif($arg eq "-qtdir") {
+        $var = "qtdir";
+        $val = shift @ARGV;
    } elsif($arg eq "-base-dir") {
        # skip, it's been dealt with at the top of the file
        shift @ARGV;
        next;
+    } elsif($arg eq "-no-module-fwd") {
+        $var = "no_module_fwd";
+        $val = "yes";
+    } elsif($arg =~/^-/) {
+        print "Unknown option: $arg\n\n" if(!$var);
+        showUsage();
+    } else {
+        $basedir = locateSyncProfile($arg);
+        die "Could not find a sync.profile for '$arg'\n" if (!$basedir);
+        $basedir = dirname($basedir);
+        $basedir =~ s=\\=/=g;
+        $var = "ignore";
    }

    #do something
@ -666,7 +683,15 @@ while ( @ARGV ) {
        push @modules_to_sync, $module;
        $moduleheaders{$module} = $headerdir;
        $create_uic_class_map = 0;
-        $create_private_headers = 0;
+    } elsif ($var eq "qtdir") {
+        if($val) {
+            $qtbasedir = $val;
+            $qtbasedir =~ s=\\=/=g;
+        } else {
+            die "The -qtdir option requires an argument";
+        }
+    } elsif ($var eq "no_module_fwd") {
+        $no_module_fwd = 1;
    } elsif ($var eq "output") {
        my $outdir = $val;
        if(checkRelative($outdir)) {
@ -680,6 +705,32 @@ while ( @ARGV ) {
        $out_basedir =~ s=\\=/=g;
    }
 }
+
+# if the $qtbasedir neither has 'qtbase' somewhere in its path, nor a
+# '.qmake.cache' file in its directory, we assume it's not a valid path
+# (remember that a yet-to-be-built qtbase doesn't have this file either,
+# thus the 'qtbase' path check!)
+die "Cannot automatically detect/use provided path to QtBase's build directory!\n" .
+    "QTDIR detected/provided: " . (defined $qtbasedir ? $qtbasedir : "-none-") . "\n" .
+    "Please -qtdir option to provide the correct path.\nsyncqt failed"
+        if (!defined $qtbasedir || (!-e "$qtbasedir/.qmake.cache" && $qtbasedir !~ /qtbase/));
+
+# if we have no $basedir we cannot be sure which sources you want, so die
+die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir);
+
+my @ignore_headers = ();
+my $class_lib_map_contents = "";
+our @ignore_for_master_contents = ();
+our @ignore_for_include_check = ();
+our @ignore_for_qt_begin_header_check = ();
+our @ignore_for_qt_begin_namespace_check = ();
+our @ignore_for_qt_module_check = ();
+my %colliding_headers = ();
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
+
+# load the module's sync.profile here, before we can
+loadSyncProfile(\$basedir, \$out_basedir);
+
@modules_to_sync = keys(%modules) if($#modules_to_sync == -1);

 $isunix = checkUnix; #cache checkUnix
@ -688,15 +739,6 @@ $isunix = checkUnix; #cache checkUnix
 mkpath "$out_basedir/include", !$quiet;
 mkpath "$out_basedir/include/Qt", !$quiet;

-my @ignore_headers = ();
-my $class_lib_map_contents = "";
-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 %colliding_headers = ();
-my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir

 foreach my $lib (@modules_to_sync) {
    #iteration info
@ -720,19 +762,8 @@ foreach my $lib (@modules_to_sync) {
                chomp $line;
                if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
                    foreach(split(/ /, $1)) {
-                        $master_contents .= "#include <QtCore/QtCore>\n" if($_ eq "core");
-                        $master_contents .= "#include <QtGui/QtGui>\n" if($_ eq "gui");
-                        $master_contents .= "#include <QtNetwork/QtNetwork>\n" if($_ eq "network");
-                        $master_contents .= "#include <QtSvg/QtSvg>\n" if($_ eq "svg");
-                        $master_contents .= "#include <QtDeclarative/QtDeclarative>\n" if($_ eq "declarative");
-                        $master_contents .= "#include <QtScript/QtScript>\n" if($_ eq "script");
-                        $master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if($_ eq "scripttools");
-                        $master_contents .= "#include <Qt3Support/Qt3Support>\n" if($_ eq "qt3support");
-                        $master_contents .= "#include <QtSql/QtSql>\n" if($_ eq "sql");
-                        $master_contents .= "#include <QtXml/QtXml>\n" if($_ eq "xml");
-                        $master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if($_ eq "xmlpatterns");
-                        $master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if($_ eq "opengl");
-                        $master_contents .= "#include <QtOpenVG/QtOpenVG>\n" if($_ eq "openvg");
+                        my $content = $mastercontent{$_};
+                        $master_contents .= $content if ($content);
                    }
                }
            }
@ -969,6 +1000,27 @@ foreach my $lib (@modules_to_sync) {
            print HEADERS_PRI_FILE $headers_pri_contents;
            close HEADERS_PRI_FILE;
        }
+
+        # create forwarding module pri in qtbase/mkspecs/modules
+        unless ($no_module_fwd) {
+            my $modulepri = $modulepris{$lib};
+            if (-e $modulepri) {
+                my $modulepriname = basename($modulepri);
+                my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname";
+                open MODULE_PRI_FILE, ">$moduleprifwd";
+                print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n";
+                print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $qtbasedir/bin\n";
+                print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
+                print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n";
+                print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n";
+                print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $qtbasedir/plugins\n";
+                print MODULE_PRI_FILE "include($modulepri)\n";
+                close MODULE_PRI_FILE;
+                utime(time, (stat($modulepri))[9], $moduleprifwd);
+            } elsif ($modulepri) {
+                print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating forwarding pri for $lib.\n";
+            }
+        }
    }
 }
 unless($showonly || !$create_uic_class_map) {
--- a/bin/syncqt.bat
+++ b/bin/syncqt.bat
@ -38,5 +38,7 @@
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@rem ***** This assumes PERL is in the PATH *****
-@perl.exe -S syncqt %*
+@echo off
+rem ***** This assumes PERL is in the PATH *****
+set scriptpath=%~dp0
+perl.exe %scriptpath%syncqt %*
--- a/139
+++ b/139
@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto
 CFG_QWS_FREETYPE=auto
 CFG_LIBFREETYPE=auto
 CFG_SQL_AVAILABLE=
-QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
+QT_DEFAULT_BUILD_PARTS="libs examples demos"
 CFG_BUILD_PARTS=""
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
    if [ -x "$relpath/bin/syncqt" ]; then
        mkdir -p "$outpath/bin"
        echo "#!/bin/sh" >"$outpath/bin/syncqt"
-        echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt"
-        echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt"
+        echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"$relpath\" \"\$@\"" >>"$outpath/bin/syncqt"
        chmod 755 "$outpath/bin/syncqt"
    fi

@ -6959,12 +6958,13 @@ esac

 # enable Qt 3 support functionality
 if [ "$CFG_QT3SUPPORT" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG qt3support"
+    QT_CONFIG="$QT_CONFIG gui-qt3support"
 fi

 # enable Phonon
 if [ "$CFG_PHONON" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG phonon"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG phonon"
    if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
        QT_CONFIG="$QT_CONFIG phonon-backend"
    fi
@ -7539,17 +7539,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
 elif [ "$CFG_EXCEPTIONS" = "no" ]; then
    CFG_XMLPATTERNS="no"
 fi
-if [ "$CFG_XMLPATTERNS" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG xmlpatterns"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
-fi
+# No longer needed after modularization
+#if [ "$CFG_XMLPATTERNS" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG xmlpatterns"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
+#fi

-if [ "$CFG_MULTIMEDIA" = "no" ]; then
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
-else
-    QT_CONFIG="$QT_CONFIG multimedia"
-fi
+# No longer needed after modularization
+#if [ "$CFG_MULTIMEDIA" = "no" ]; then
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
+#else
+#    QT_CONFIG="$QT_CONFIG multimedia"
+#fi

 if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
    QT_CONFIG="$QT_CONFIG audio-backend"
@ -7575,26 +7577,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then
 fi

 if [ "$CFG_WEBKIT" != "no" ]; then
-    # This include takes care of adding "webkit" to QT_CONFIG.
-    cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG webkit"
    # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
    if [ "$CFG_WEBKIT" = "debug" ]; then
        QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
    fi
-else
-    rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri"
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 fi

 if [ "$CFG_SCRIPT" = "auto" ]; then
    CFG_SCRIPT="yes"
 fi

-if [ "$CFG_SCRIPT" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG script"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
-fi
+# No longer needed after modularization
+#if [ "$CFG_SCRIPT" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG script"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
+#fi

 if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
    echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled."
@ -7613,11 +7613,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then
    CFG_SCRIPTTOOLS="no"
 fi

-if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG scripttools"
-else
-    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
-fi
+# No longer needed after modularization
+#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
+#    QT_CONFIG="$QT_CONFIG scripttools"
+#else
+#    QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
+#fi


 if [ "$CFG_DECLARATIVE" = "yes" ]; then
@ -7635,7 +7636,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then
 fi

 if [ "$CFG_DECLARATIVE" = "yes" ]; then
-    QT_CONFIG="$QT_CONFIG declarative"
+    # No longer needed after modularization
+    #QT_CONFIG="$QT_CONFIG declarative"
    if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
        QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
    fi
@ -8299,10 +8301,10 @@ else
        ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
    done
 fi
+
 #-------------------------------------------------------------------------------
 # save configuration into qconfig.pri
 #-------------------------------------------------------------------------------
-
 QTCONFIG="$outpath/mkspecs/qconfig.pri"
 QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
 [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
@ -8402,23 +8404,19 @@ else
 fi

 #-------------------------------------------------------------------------------
-# save configuration into .qmake.cache
+# save configuration into qmodule.pri
 #-------------------------------------------------------------------------------
+QTMODULE="$outpath/mkspecs/qmodule.pri"

-CACHEFILE="$outpath/.qmake.cache"
-[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
-cat >>"$CACHEFILE.tmp" <<EOF
-CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build
+cat >>"$QTMODULE.tmp" <<EOF
+#paths
 QT_SOURCE_TREE = \$\$quote($relpath)
 QT_BUILD_TREE = \$\$quote($outpath)
 QT_BUILD_PARTS = $CFG_BUILD_PARTS
-QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
-QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc

 #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
 QMAKE_MOC        = \$\$QT_BUILD_TREE/bin/moc
 QMAKE_UIC        = \$\$QT_BUILD_TREE/bin/uic
-QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
 QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
@ -8428,65 +8426,86 @@ EOF

 # Ensure we can link to uninistalled libraries
 if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
-    echo "QMAKE_LFLAGS    = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp"
+    echo "QMAKE_LFLAGS    = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_CFLAGS_PSQL" ]; then
-    echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp"
+    echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_LFLAGS_PSQL" ]; then
-    echo "QT_LFLAGS_PSQL   = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp"
+    echo "QT_LFLAGS_PSQL   = $QT_LFLAGS_PSQL" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_CFLAGS_MYSQL" ]; then
-    echo "QT_CFLAGS_MYSQL   = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+    echo "QT_CFLAGS_MYSQL   = $QT_CFLAGS_MYSQL" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_LFLAGS_MYSQL" ]; then
-    echo "QT_LFLAGS_MYSQL   = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp"
+    echo "QT_LFLAGS_MYSQL   = $QT_LFLAGS_MYSQL" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_CFLAGS_SQLITE" ]; then
-    echo "QT_CFLAGS_SQLITE   = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+    echo "QT_CFLAGS_SQLITE   = $QT_CFLAGS_SQLITE" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_LFLAGS_SQLITE" ]; then
-    echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp"
+    echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_LFLAGS_ODBC" ]; then
-    echo "QT_LFLAGS_ODBC   = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp"
+    echo "QT_LFLAGS_ODBC   = $QT_LFLAGS_ODBC" >> "$QTMODULE.tmp"
 fi
 if [ -n "$QT_LFLAGS_TDS" ]; then
-    echo "QT_LFLAGS_TDS   = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp"
+    echo "QT_LFLAGS_TDS   = $QT_LFLAGS_TDS" >> "$QTMODULE.tmp"
 fi

 if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then
-    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
+    echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$QTMODULE.tmp"
 fi

 #dump in the OPENSSL_LIBS info
 if [ '!' -z "$OPENSSL_LIBS" ]; then
-    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
+    echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$QTMODULE.tmp"
 elif [ "$CFG_OPENSSL" = "linked" ]; then
-    echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
+    echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$QTMODULE.tmp"
 fi

 #dump in the SDK info
 if [ '!' -z "$CFG_SDK" ]; then
-   echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp"
+   echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$QTMODULE.tmp"
 fi

 # mac gcc -Xarch support
 if [ "$CFG_MAC_XARCH" = "no" ]; then
-   echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp"
+   echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp"
 fi

 #dump the qmake spec
 if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then
-   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp"
+   echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$QTMODULE.tmp"
 else
-   echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp"
+   echo "QMAKESPEC = $XPLATFORM" >> "$QTMODULE.tmp"
 fi

 # cmdline args
-cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp"
+cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp"
 rm -f "$QMAKE_VARS_FILE" 2>/dev/null

+# replace qmodule.pri if it differs from the newly created temp file
+if cmp -s "$QTMODULE.tmp" "$QTMODULE"; then
+    rm -f "$QTMODULE.tmp"
+else
+    mv -f "$QTMODULE.tmp" "$QTMODULE"
+fi
+
+#-------------------------------------------------------------------------------
+# save configuration into .qmake.cache
+#-------------------------------------------------------------------------------
+
+CACHEFILE="$outpath/.qmake.cache"
+[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp"
+cat >>"$CACHEFILE.tmp" <<EOF
+include(\$\$PWD/mkspecs/qmodule.pri)
+CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build
+QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE
+QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
+
+EOF
+
 # incrementals
 INCREMENTAL=""
 [ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes"
@ -8820,11 +8839,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

--- a/configure.exe
+++ b/configure.exe
--- a/demos/affine/affine.pro
+++ b/demos/affine/affine.pro
@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/affine
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo

 wince*: {
    DEPLOYMENT_PLUGIN += qjpeg
--- a/demos/books/books.pro
+++ b/demos/books/books.pro
@ -13,7 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/books
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo

 wince*: {
    CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll
--- a/demos/chip/chip.pro
+++ b/demos/chip/chip.pro
@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/chip
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/composition/composition.pro
+++ b/demos/composition/composition.pro
@ -17,7 +17,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo

 win32-msvc* {
    QMAKE_CXXFLAGS += /Zm500
--- a/demos/deform/deform.pro
+++ b/demos/deform/deform.pro
@ -20,5 +20,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A63D
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }
--- a/demos/demos.pro
+++ b/demos/demos.pro
@ -48,25 +48,18 @@ SUBDIRS += demos_boxes
 mac* && !qpa: SUBDIRS += demos_macmainwindow
 wince*|symbian|embedded|x11: SUBDIRS += demos_embedded

-!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin
-
 !cross_compile:{
 contains(QT_BUILD_PARTS, tools):{
-!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo
-wince*:SUBDIRS += demos_sqlbrowser
+SUBDIRS += demos_sqlbrowser
 }
 }
-contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
-contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser
-contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative
-contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum

 # install
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_DEMOS]
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo

 demos_chip.subdir = chip
 demos_embeddeddialogs.subdir = embeddeddialogs
@ -89,20 +82,9 @@ demos_arthurplugin.subdir = arthurplugin
 demos_sqlbrowser.subdir = sqlbrowser
 demos_undo.subdir = undo
 demos_qtdemo.subdir = qtdemo
-demos_mediaplayer.subdir = qmediaplayer
-demos_declarative.subdir = declarative
-
-#mobile demos. Requires QtMobility sources. Not included in demo build
-demos_guitartuner.subdir = mobile/guitartuner
-demos_qcamera.subdir = mobile/qcamera
-demos_qtbubblelevel.subdir = mobile/qtbubblelevel
-demos_quickhit.subdir = mobile/quickhit
-
-demos_browser.subdir = browser

 demos_boxes.subdir = boxes
 demos_sub-attaq.subdir = sub-attaq
-demos_spectrum.subdir = spectrum

 #CONFIG += ordered
 !ordered {
--- a/demos/embedded/digiflip/digiflip.pro
+++ b/demos/embedded/digiflip/digiflip.pro
@ -2,7 +2,7 @@ SOURCES = digiflip.cpp

 symbian {
    TARGET.UID3 = 0xA000CF72
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }

 target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@ -1,32 +1,12 @@
 TEMPLATE  = subdirs
 SUBDIRS   = styledemo raycasting flickable digiflip

-contains(QT_CONFIG, svg) {
-    SUBDIRS += embeddedsvgviewer \
-               desktopservices
-    fluidlauncher.subdir = fluidlauncher
-    fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo
-    !vxworks:!qnx:SUBDIRS += fluidlauncher
-}
-
 SUBDIRS += lightmaps
 SUBDIRS += flightinfo
-contains(QT_CONFIG, svg) {
-    SUBDIRS += weatherinfo
-}
-
-contains(QT_CONFIG, webkit) {
-    SUBDIRS += anomaly
-}
-
-contains(QT_CONFIG, declarative) {
-    # Qml demos require DEPLOYMENT support. Therefore, only symbian.
-    symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
-}

 # install
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/embedded/flickable/flickable.pro
+++ b/demos/embedded/flickable/flickable.pro
@ -3,7 +3,7 @@ HEADERS = flickable.h

 symbian {
    TARGET.UID3 = 0xA000CF73
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }

 target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/demos/embedded/flightinfo/flightinfo.pro
@ -7,7 +7,7 @@ QT += network

 symbian {
    TARGET.UID3 = 0xA000CF74
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
    TARGET.CAPABILITY = NetworkServices
 }

--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/demos/embedded/lightmaps/lightmaps.pro
@ -10,7 +10,7 @@ QT += network

 symbian {
    TARGET.UID3 = 0xA000CF75
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
    TARGET.CAPABILITY = NetworkServices
    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
--- a/demos/embedded/raycasting/raycasting.pro
+++ b/demos/embedded/raycasting/raycasting.pro
@ -4,7 +4,7 @@ RESOURCES += raycasting.qrc

 symbian {
    TARGET.UID3 = 0xA000CF76
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }

 target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/demos/embedded/styledemo/styledemo.pro
@ -13,5 +13,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A63F
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }
--- a/demos/embeddeddialogs/embeddeddialogs.pro
+++ b/demos/embeddeddialogs/embeddeddialogs.pro
@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.ic
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embeddeddialogs
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/gradients/gradients.pro
+++ b/demos/gradients/gradients.pro
@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/interview/interview.pro
+++ b/demos/interview/interview.pro
@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/mainwindow/mainwindow.pro
+++ b/demos/mainwindow/mainwindow.pro
@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/pathstroke/pathstroke.pro
+++ b/demos/pathstroke/pathstroke.pro
@ -20,5 +20,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A63E
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }
--- a/demos/shared/shared.pro
+++ b/demos/shared/shared.pro
@ -34,5 +34,5 @@ INSTALLS += sources

 symbian {
    TARGET.UID3 = 0xA000A63C
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+    CONFIG += qt_demo
 }
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/demos/spreadsheet/spreadsheet.pro
@ -31,4 +31,4 @@ sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/sqlbrowser/sqlbrowser.pro
+++ b/demos/sqlbrowser/sqlbrowser.pro
@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/sqlbrowser
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo

 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
--- a/demos/textedit/textedit.pro
+++ b/demos/textedit/textedit.pro
@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/demos/undo/undo.pro
+++ b/demos/undo/undo.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
+symbian: CONFIG += qt_demo
--- a/examples/animation/animatedtiles/animatedtiles.pro
+++ b/examples/animation/animatedtiles/animatedtiles.pro
@ -9,5 +9,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000D7D1
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@ -9,5 +9,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000E3F5
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/animation/easing/easing.pro
+++ b/examples/animation/easing/easing.pro
@ -15,5 +15,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000E3F6
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/animation/moveblocks/moveblocks.pro
+++ b/examples/animation/moveblocks/moveblocks.pro
@ -8,5 +8,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000E3F7
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/animation/states/states.pro
+++ b/examples/animation/states/states.pro
@ -9,5 +9,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000E3F8
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@ -20,5 +20,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000E3F9
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/dbus/complexpingpong/complexping.pro
+++ b/examples/dbus/complexpingpong/complexping.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/complexpingpong/complexpong.pro
+++ b/examples/dbus/complexpingpong/complexpong.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/dbus-chat/dbus-chat.pro
+++ b/examples/dbus/dbus-chat/dbus-chat.pro
@ -18,4 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/dbus.pro
+++ b/examples/dbus/dbus.pro
@ -14,4 +14,4 @@ sources.files = *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/listnames/listnames.pro
+++ b/examples/dbus/listnames/listnames.pro
@ -15,5 +15,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example

--- a/examples/dbus/pingpong/ping.pro
+++ b/examples/dbus/pingpong/ping.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/pingpong/pong.pro
+++ b/examples/dbus/pingpong/pong.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/remotecontrolledcar/car/car.pro
+++ b/examples/dbus/remotecontrolledcar/car/car.pro
@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/remotecontrolledcar/controller/controller.pro
+++ b/examples/dbus/remotecontrolledcar/controller/controller.pro
@ -20,4 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
@ -7,4 +7,4 @@ sources.files = *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/desktop/desktop.pro
+++ b/examples/desktop/desktop.pro
@ -2,12 +2,10 @@ TEMPLATE      = subdirs
 CONFIG       += ordered
 SUBDIRS       = screenshot

-!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray
-
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/desktop/screenshot/screenshot.pro
+++ b/examples/desktop/screenshot/screenshot.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/classwizard/classwizard.pro
+++ b/examples/dialogs/classwizard/classwizard.pro
@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/configdialog/configdialog.pro
+++ b/examples/dialogs/configdialog/configdialog.pro
@ -11,6 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib

--- a/examples/dialogs/dialogs.pro
+++ b/examples/dialogs/dialogs.pro
@ -16,4 +16,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/dialogs/extension/extension.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/findfiles/findfiles.pro
+++ b/examples/dialogs/findfiles/findfiles.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/licensewizard/licensewizard.pro
+++ b/examples/dialogs/licensewizard/licensewizard.pro
@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/dialogs/sipdialog/sipdialog.pro
+++ b/examples/dialogs/sipdialog/sipdialog.pro
@ -8,7 +8,7 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib


--- a/examples/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/dialogs/standarddialogs/standarddialogs.pro
@ -8,6 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib

--- a/examples/dialogs/tabdialog/tabdialog.pro
+++ b/examples/dialogs/tabdialog/tabdialog.pro
@ -8,5 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
--- a/examples/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/dialogs/trivialwizard/trivialwizard.pro
@ -6,4 +6,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/draganddrop/draganddrop.pro
+++ b/examples/draganddrop/draganddrop.pro
@ -5,8 +5,6 @@ SUBDIRS     = draggableicons \
              fridgemagnets \
              puzzle

-contains(QT_CONFIG, svg): SUBDIRS += delayedencoding
-
 wince*: SUBDIRS -= dropsite
 symbian: SUBDIRS -= dropsite
 # install
--- a/examples/draganddrop/draggableicons/draggableicons.pro
+++ b/examples/draganddrop/draggableicons/draggableicons.pro
@ -11,5 +11,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000C615
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/draganddrop/draggabletext/draggabletext.pro
+++ b/examples/draganddrop/draggabletext/draggabletext.pro
@ -13,5 +13,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000CF64
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/draganddrop/dropsite/dropsite.pro
+++ b/examples/draganddrop/dropsite/dropsite.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/draganddrop/fridgemagnets/fridgemagnets.pro
+++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro
@ -13,7 +13,7 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000C610
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }


--- a/examples/draganddrop/puzzle/puzzle.pro
+++ b/examples/draganddrop/puzzle/puzzle.pro
@ -17,7 +17,7 @@ INSTALLS += target sources

 symbian:{
   TARGET.UID3 = 0xA000CF65
-   include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+   CONFIG += qt_example
   addFile.files = example.jpg
   addFile.path = .
   DEPLOYMENT += addFile
--- a/examples/examples.pro
+++ b/examples/examples.pro
@ -30,8 +30,6 @@ SUBDIRS       = \
                gestures
 }

-contains(QT_CONFIG, webkit):SUBDIRS += webkit
-
 symbian: SUBDIRS = \
                graphicsview \
                itemviews \
@ -50,22 +48,11 @@ symbian: SUBDIRS = \
    SUBDIRS += multimedia
 }

-contains(QT_CONFIG, script): SUBDIRS += script
-
-contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon
 embedded:SUBDIRS += qws
-!wince*:!symbian: {
-    !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer
-    contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help
-} else {
-    contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
-}
+contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
 contains(QT_CONFIG, opengl): SUBDIRS += opengl
 contains(QT_CONFIG, openvg): SUBDIRS += openvg
 contains(QT_CONFIG, dbus): SUBDIRS += dbus
-contains(QT_CONFIG, declarative): SUBDIRS += declarative
-win32: SUBDIRS += activeqt
-contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns
 contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
 contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent

@ -74,4 +61,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/gestures/imagegestures/imagegestures.pro
+++ b/examples/gestures/imagegestures/imagegestures.pro
@ -17,5 +17,5 @@ INSTALLS += target \

 symbian {
    TARGET.UID3 = 0xA000D7D0
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
+++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
@ -13,5 +13,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A645
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/graphicsview/collidingmice/collidingmice.pro
+++ b/examples/graphicsview/collidingmice/collidingmice.pro
@ -15,5 +15,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A643
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/graphicsview/diagramscene/diagramscene.pro
+++ b/examples/graphicsview/diagramscene/diagramscene.pro
@ -18,5 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example

--- a/examples/graphicsview/dragdroprobot/dragdroprobot.pro
+++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro
@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/graphicsview/elasticnodes/elasticnodes.pro
+++ b/examples/graphicsview/elasticnodes/elasticnodes.pro
@ -19,5 +19,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A642
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/graphicsview/graphicsview.pro
+++ b/examples/graphicsview/graphicsview.pro
@ -13,7 +13,6 @@ SUBDIRS       = \
              simpleanchorlayout \
              weatheranchorlayout

-contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids
 contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot

 # install
@ -22,4 +21,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/graphicsview/padnavigator/padnavigator.pro
+++ b/examples/graphicsview/padnavigator/padnavigator.pro
@ -28,5 +28,5 @@ CONFIG += console

 symbian {
    TARGET.UID3 = 0xA000A644
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/ipc/ipc.pro
+++ b/examples/ipc/ipc.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/ipc/localfortuneclient/localfortuneclient.pro
+++ b/examples/ipc/localfortuneclient/localfortuneclient.pro
@ -9,6 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example


--- a/examples/ipc/localfortuneserver/localfortuneserver.pro
+++ b/examples/ipc/localfortuneserver/localfortuneserver.pro
@ -9,6 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example


--- a/examples/ipc/sharedmemory/sharedmemory.pro
+++ b/examples/ipc/sharedmemory/sharedmemory.pro
@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/addressbook/addressbook.pro
+++ b/examples/itemviews/addressbook/addressbook.pro
@ -18,5 +18,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A646
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
+++ b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro
@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/chart/chart.pro
+++ b/examples/itemviews/chart/chart.pro
@ -16,5 +16,5 @@ INSTALLS += target sources

 symbian {
    TARGET.UID3 = 0xA000A647
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    CONFIG += qt_example
 }
--- a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
+++ b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
+++ b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/dirview/dirview.pro
+++ b/examples/itemviews/dirview/dirview.pro
@ -6,4 +6,4 @@ sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/editabletreemodel/editabletreemodel.pro
+++ b/examples/itemviews/editabletreemodel/editabletreemodel.pro
@ -15,4 +15,4 @@ sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/itemviews.pro
+++ b/examples/itemviews/itemviews.pro
@ -26,4 +26,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/pixelator/pixelator.pro
+++ b/examples/itemviews/pixelator/pixelator.pro
@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/puzzle/puzzle.pro
+++ b/examples/itemviews/puzzle/puzzle.pro
@ -13,7 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example

 wince* {
   DEPLOYMENT_PLUGIN += qjpeg qgif qtiff
--- a/examples/itemviews/simpledommodel/simpledommodel.pro
+++ b/examples/itemviews/simpledommodel/simpledommodel.pro
@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/simpletreemodel/simpletreemodel.pro
+++ b/examples/itemviews/simpletreemodel/simpletreemodel.pro
@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+++ b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
+++ b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/itemviews/stardelegate/stardelegate.pro
+++ b/examples/itemviews/stardelegate/stardelegate.pro
@ -12,5 +12,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example

--- a/examples/ja_JP/linguist/hellotr/hellotr.pro
+++ b/examples/ja_JP/linguist/hellotr/hellotr.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/layouts/basiclayouts/basiclayouts.pro
+++ b/examples/layouts/basiclayouts/basiclayouts.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/layouts/borderlayout/borderlayout.pro
+++ b/examples/layouts/borderlayout/borderlayout.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/layouts/dynamiclayouts/dynamiclayouts.pro
+++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro
@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/layouts/flowlayout/flowlayout.pro
+++ b/examples/layouts/flowlayout/flowlayout.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/layouts/layouts.pro
+++ b/examples/layouts/layouts.pro
@ -9,4 +9,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/linguist/arrowpad/arrowpad.pro
+++ b/examples/linguist/arrowpad/arrowpad.pro
@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/linguist/hellotr/hellotr.pro
+++ b/examples/linguist/hellotr/hellotr.pro
@ -10,4 +10,4 @@ sources.files = $$SOURCES *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/linguist/linguist.pro
+++ b/examples/linguist/linguist.pro
@ -8,4 +8,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist
 INSTALLS += sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/examples/linguist/trollprint/trollprint.pro
+++ b/examples/linguist/trollprint/trollprint.pro
@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint
 INSTALLS += target sources

-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian: CONFIG += qt_example
--- a/Show More
+++ b/Show More