diff options
| author | axis <qt-info@nokia.com> | 2011-04-27 13:01:17 +0200 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 13:01:17 +0200 |
| commit | 1a0d5aeb9197ea0c3432903c402d8449bea9f6b4 (patch) | |
| tree | 3fbb60e2a0bff38c9cabfb1b5d347579e8769f93 | |
| parent | 2f66cb61ffbf147292092ebe29e3d4759dfb9bda (diff) | |
39 files changed, 1203 insertions, 753 deletions
@@ -42,7 +42,7 @@ push(@INC, "$basepath/scripts"); # Using option -bleeding will avoid these, and just try to run on the current branch you're in # if that is successful, you should update the SHA1 below to reflect that. my $good_47_sha1 = '770d5468a87c84cc435eefaa2a234f8c3b87f8c2'; -my $good_master_sha1 = '7ef9f99301a7c71fdb835f9e1f27d3111557aa2e'; +my $good_master_sha1 = '896db169ea224deb96c59ce8af800d019de63f12'; our @repos = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'qtactiveqt', 'qtscript', 'qtphonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns', diff --git a/patches/0001-Some-changes-for-qtbase.patch b/patches/0001-Some-changes-for-qtbase.patch index 4810e68..f16fa52 100644 --- a/patches/0001-Some-changes-for-qtbase.patch +++ b/patches/0001-Some-changes-for-qtbase.patch @@ -1,4 +1,4 @@ -From 01ec70f4e071494e1ee9337295b604cda5b02d6c Mon Sep 17 00:00:00 2001 +From 79eefa102ad34748ef9765b4c563412f0ff95d3a Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 8 Nov 2010 20:09:10 -0600 Subject: [PATCH] Some changes for qtbase @@ -15,7 +15,7 @@ Subject: [PATCH] Some changes for qtbase 8 files changed, 11 insertions(+), 131 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 32b5384..9d5eece 100755 +index b25a432..451521c 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -34,28 +34,13 @@ my %modules = ( # path to module name map @@ -47,7 +47,7 @@ index 32b5384..9d5eece 100755 ); #$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; -@@ -692,7 +677,7 @@ my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); +@@ -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" ); @@ -57,10 +57,10 @@ index 32b5384..9d5eece 100755 my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir diff --git a/qtbase/configure b/qtbase/configure -index 96895ed..8c2c185 100755 +index 976267e..5e3e40f 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8821,11 +8821,11 @@ EXEC="" +@@ -8820,11 +8820,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then @@ -340,5 +340,5 @@ index 494ea52..c6819db 100644 args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0002-qmake-profiles-for-qttools.patch b/patches/0002-qmake-profiles-for-qttools.patch index 858201d..8a2ee99 100644 --- a/patches/0002-qmake-profiles-for-qttools.patch +++ b/patches/0002-qmake-profiles-for-qttools.patch @@ -1,13 +1,15 @@ -From be1856e436e4c1bd5fc968c073d597d7da3cc1d4 Mon Sep 17 00:00:00 2001 +From 9bd10e1d182166168daaa56aef1d33f8ec07a07c Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Fri, 12 Nov 2010 12:48:25 +0100 Subject: [PATCH] qmake profiles for qttools --- .../lib/fulltextsearch/fulltextsearch.pri | 2 +- - qttools/src/{tools.pro => src.pro} | 2 -- - 2 files changed, 1 insertions(+), 3 deletions(-) - rename qttools/src/{tools.pro => src.pro} (89%) + qttools/src/src.pro | 47 +++++++++++++++++++ + qttools/src/tools.pro | 49 -------------------- + 3 files changed, 48 insertions(+), 50 deletions(-) + create mode 100644 qttools/src/src.pro + delete mode 100644 qttools/src/tools.pro diff --git a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri index 134678f..aac2ec6 100644 @@ -22,29 +24,114 @@ index 134678f..aac2ec6 100644 INCLUDEPATH += . .. \ $$CLUCENEDIR \ -diff --git a/qttools/src/tools.pro b/qttools/src/src.pro -similarity index 89% -rename from qttools/src/tools.pro -rename to qttools/src/src.pro -index f090b86..c6174e4 100644 ---- a/qttools/src/tools.pro +diff --git a/qttools/src/src.pro b/qttools/src/src.pro +new file mode 100644 +index 0000000..c6174e4 +--- /dev/null +++ b/qttools/src/src.pro -@@ -23,7 +23,6 @@ TEMPLATE = subdirs - unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig - win32:!wince*:SUBDIRS += activeqt - } +@@ -0,0 +1,47 @@ ++TEMPLATE = subdirs ++ ++!contains(QT_CONFIG, no-gui) { ++ no-png { ++ message("Some graphics-related tools are unavailable without PNG support") ++ } else { ++ symbian { ++ SUBDIRS = designer ++ } else:wince* { ++ SUBDIRS = qtestlib designer ++ } else { ++ SUBDIRS = assistant \ ++ pixeltool \ ++ porting \ ++ qtestlib \ ++ qttracereplay ++ contains(QT_EDITION, Console) { ++ SUBDIRS += designer/src/uitools # Linguist depends on this ++ } else { ++ SUBDIRS += designer ++ } ++ } ++ unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig ++ win32:!wince*:SUBDIRS += activeqt ++ } ++} ++ ++!wince*:!symbian:SUBDIRS += linguist ++ ++mac { ++ SUBDIRS += macdeployqt ++} ++ ++embedded:SUBDIRS += kmap2qmap ++ ++contains(QT_CONFIG, dbus):SUBDIRS += qdbus ++# We don't need these command line utilities on embedded platforms. ++embedded: SUBDIRS += makeqpf ++ ++!wince*:!cross_compile:SUBDIRS += qdoc3 ++ ++CONFIG+=ordered ++QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" ++ ++!win32:!embedded:!mac:!symbian:CONFIG += x11 ++ ++x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper +diff --git a/qttools/src/tools.pro b/qttools/src/tools.pro +deleted file mode 100644 +index f090b86..0000000 +--- a/qttools/src/tools.pro ++++ /dev/null +@@ -1,49 +0,0 @@ +-TEMPLATE = subdirs +- +-!contains(QT_CONFIG, no-gui) { +- no-png { +- message("Some graphics-related tools are unavailable without PNG support") +- } else { +- symbian { +- SUBDIRS = designer +- } else:wince* { +- SUBDIRS = qtestlib designer +- } else { +- SUBDIRS = assistant \ +- pixeltool \ +- porting \ +- qtestlib \ +- qttracereplay +- contains(QT_EDITION, Console) { +- SUBDIRS += designer/src/uitools # Linguist depends on this +- } else { +- SUBDIRS += designer +- } +- } +- unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig +- win32:!wince*:SUBDIRS += activeqt +- } - contains(QT_CONFIG, declarative):SUBDIRS += qml - } - - !wince*:!symbian:SUBDIRS += linguist -@@ -36,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap - - contains(QT_CONFIG, dbus):SUBDIRS += qdbus - # We don't need these command line utilities on embedded platforms. +-} +- +-!wince*:!symbian:SUBDIRS += linguist +- +-mac { +- SUBDIRS += macdeployqt +-} +- +-embedded:SUBDIRS += kmap2qmap +- +-contains(QT_CONFIG, dbus):SUBDIRS += qdbus +-# We don't need these command line utilities on embedded platforms. -!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator - embedded: SUBDIRS += makeqpf - - !wince*:!cross_compile:SUBDIRS += qdoc3 +-embedded: SUBDIRS += makeqpf +- +-!wince*:!cross_compile:SUBDIRS += qdoc3 +- +-CONFIG+=ordered +-QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" +- +-!win32:!embedded:!mac:!symbian:CONFIG += x11 +- +-x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch index 102d19c..e43485b 100644 --- a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch +++ b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch @@ -1,4 +1,4 @@ -From d35548631229f954fc44b757dc21922ec47ea919 Mon Sep 17 00:00:00 2001 +From d6231ac51dd8642c663e88835099d1f5432a70bc Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 11 Nov 2010 09:35:09 -0600 Subject: [PATCH] Expose source and build directories for QtBase @@ -12,10 +12,10 @@ Also expose moc, uic, rcc, qdbusxml2cpp, include and lib create mode 100644 qtbase/mkspecs/features/qt_module.prf diff --git a/qtbase/configure b/qtbase/configure -index 8c2c185..66464fa 100755 +index 5e3e40f..f2ee5f4 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -8300,10 +8300,10 @@ else +@@ -8299,10 +8299,10 @@ else ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" done fi @@ -27,7 +27,7 @@ index 8c2c185..66464fa 100755 QTCONFIG="$outpath/mkspecs/qconfig.pri" QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" -@@ -8403,23 +8403,19 @@ else +@@ -8402,23 +8402,19 @@ else fi #------------------------------------------------------------------------------- @@ -55,7 +55,7 @@ index 8c2c185..66464fa 100755 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include -@@ -8429,65 +8425,86 @@ EOF +@@ -8428,65 +8424,86 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then @@ -339,5 +339,5 @@ index c6819db..46f1a87 100644 configFile.close(); } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch index 8d42e28..fce2b07 100644 --- a/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch +++ b/patches/0005-Expose-private-support-for-separate-module-in-syncqt.patch @@ -1,4 +1,4 @@ -From 64a4f149f254efd723afcc160e378b04d3110980 Mon Sep 17 00:00:00 2001 +From a251c24a96f9aae635f34c0d1f77419bf98c0a75 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Mon, 15 Nov 2010 16:43:22 +0100 Subject: [PATCH] Expose private support for separate module in syncqt. @@ -8,7 +8,7 @@ Subject: [PATCH] Expose private support for separate module in syncqt. 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 9d5eece..b8162d2 100755 +index 451521c..b867106 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -82,6 +82,7 @@ sub showUsage @@ -19,7 +19,7 @@ index 9d5eece..b8162d2 100755 print " -help This help\n"; exit 0; } -@@ -587,6 +588,9 @@ while ( @ARGV ) { +@@ -589,6 +590,9 @@ while ( @ARGV ) { } elsif($arg eq "-quiet") { $var = "quiet"; $val = "yes"; @@ -29,7 +29,7 @@ index 9d5eece..b8162d2 100755 } elsif($arg eq "-base-dir") { # skip, it's been dealt with at the top of the file shift @ARGV; -@@ -649,7 +653,6 @@ while ( @ARGV ) { +@@ -651,7 +655,6 @@ while ( @ARGV ) { push @modules_to_sync, $module; $moduleheaders{$module} = $headerdir; $create_uic_class_map = 0; @@ -38,5 +38,5 @@ index 9d5eece..b8162d2 100755 my $outdir = $val; if(checkRelative($outdir)) { -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch index f3ab87b..9536127 100644 --- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch +++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch @@ -1,4 +1,4 @@ -From be0dd0f2149064e9655edaa5d7c24bef3e034dd5 Mon Sep 17 00:00:00 2001 +From 0b1ac7cf3b009293c3a7acddc854fa375ab40996 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Mon, 15 Nov 2010 13:55:17 -0600 Subject: [PATCH] Make syncqt use sync.profile files from each module @@ -14,7 +14,7 @@ enables it to work for other modules than just qtbase. create mode 100644 qtbase/sync.profile diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index b8162d2..7e5fc44 100755 +index b867106..e3d941b 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -12,40 +12,22 @@ @@ -128,7 +128,7 @@ index b8162d2..7e5fc44 100755 my $parsable = ""; if(open(F, "<$iheader")) { -@@ -546,6 +500,52 @@ sub findFiles { +@@ -548,6 +502,52 @@ sub findFiles { return @files; } @@ -181,7 +181,7 @@ index b8162d2..7e5fc44 100755 # -------------------------------------------------------------------- # "main" function # -------------------------------------------------------------------- -@@ -595,6 +595,15 @@ while ( @ARGV ) { +@@ -597,6 +597,15 @@ while ( @ARGV ) { # skip, it's been dealt with at the top of the file shift @ARGV; next; @@ -197,7 +197,7 @@ index b8162d2..7e5fc44 100755 } #do something -@@ -666,6 +675,13 @@ while ( @ARGV ) { +@@ -668,6 +677,13 @@ while ( @ARGV ) { $out_basedir =~ s=\\=/=g; } } @@ -211,7 +211,7 @@ index b8162d2..7e5fc44 100755 @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); $isunix = checkUnix; #cache checkUnix -@@ -676,11 +692,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; +@@ -678,11 +694,11 @@ mkpath "$out_basedir/include/Qt", !$quiet; my @ignore_headers = (); my $class_lib_map_contents = ""; @@ -228,7 +228,7 @@ index b8162d2..7e5fc44 100755 my %colliding_headers = (); my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir -@@ -706,19 +722,8 @@ foreach my $lib (@modules_to_sync) { +@@ -708,19 +724,8 @@ foreach my $lib (@modules_to_sync) { chomp $line; if($line =~ /^ *QT *\+?= *([^\r\n]*)/) { foreach(split(/ /, $1)) { @@ -251,7 +251,7 @@ index b8162d2..7e5fc44 100755 } } diff --git a/qtbase/configure b/qtbase/configure -index 66464fa..fe9e311 100755 +index f2ee5f4..9a04380 100755 --- a/qtbase/configure +++ b/qtbase/configure @@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then @@ -266,7 +266,7 @@ index 66464fa..fe9e311 100755 diff --git a/qtbase/sync.profile b/qtbase/sync.profile new file mode 100644 -index 0000000..7d2e4b1 +index 0000000..7d2e4b1a7 --- /dev/null +++ b/qtbase/sync.profile @@ -0,0 +1,44 @@ @@ -330,5 +330,5 @@ index 46f1a87..2d84ad5 100644 } } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch index d527fb2..1462df5 100644 --- a/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch +++ b/patches/0008-Moved-symbianpkgrules-profiles-to-be-feature-profile.patch @@ -1,46 +1,116 @@ -From 56b58823a3b39eb30652a1339b3deee32bb2d29e Mon Sep 17 00:00:00 2001 +From 33756c1d5fa770eb7e00e7301e9296cff4a93bd8 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Tue, 16 Nov 2010 14:31:27 +0100 Subject: [PATCH] Moved symbianpkgrules profiles to be feature profiles. --- - .../features/symbian/qt_demo.prf} | 2 -- - .../features/symbian/qt_example.prf} | 3 --- - 2 files changed, 0 insertions(+), 5 deletions(-) - rename qtbase/{demos/symbianpkgrules.pri => mkspecs/features/symbian/qt_demo.prf} (88%) - rename qtbase/{examples/symbianpkgrules.pri => mkspecs/features/symbian/qt_example.prf} (88%) + qtbase/demos/symbianpkgrules.pri | 19 ------------------- + qtbase/examples/symbianpkgrules.pri | 20 -------------------- + qtbase/mkspecs/features/symbian/qt_demo.prf | 17 +++++++++++++++++ + qtbase/mkspecs/features/symbian/qt_example.prf | 17 +++++++++++++++++ + 4 files changed, 34 insertions(+), 39 deletions(-) + delete mode 100644 qtbase/demos/symbianpkgrules.pri + delete mode 100644 qtbase/examples/symbianpkgrules.pri + create mode 100644 qtbase/mkspecs/features/symbian/qt_demo.prf + create mode 100644 qtbase/mkspecs/features/symbian/qt_example.prf -diff --git a/qtbase/demos/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_demo.prf -similarity index 88% -rename from qtbase/demos/symbianpkgrules.pri -rename to qtbase/mkspecs/features/symbian/qt_demo.prf -index ef6dfd8..9c4d96c 100644 +diff --git a/qtbase/demos/symbianpkgrules.pri b/qtbase/demos/symbianpkgrules.pri +deleted file mode 100644 +index ef6dfd8..0000000 --- a/qtbase/demos/symbianpkgrules.pri -+++ b/qtbase/mkspecs/features/symbian/qt_demo.prf -@@ -1,5 +1,3 @@ ++++ /dev/null +@@ -1,19 +0,0 @@ -!symbian: error(Only include this file for Symbian platforms) - - RSS_RULES ="group_name=\"QtDemos\";" - - nokiaVendor = "Nokia, Qt" -diff --git a/qtbase/examples/symbianpkgrules.pri b/qtbase/mkspecs/features/symbian/qt_example.prf -similarity index 88% -rename from qtbase/examples/symbianpkgrules.pri -rename to qtbase/mkspecs/features/symbian/qt_example.prf -index fe9b487..8c523fb 100644 +-RSS_RULES ="group_name=\"QtDemos\";" +- +-nokiaVendor = "Nokia, Qt" +-vendorinfo = \ +- "; Localised Vendor name" \ +- "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \ +- " " \ +- "; Unique Vendor name" \ +- ":\"$$nokiaVendor\"" \ +- " " +- +-demos_deployment.pkg_prerules += vendorinfo +-DEPLOYMENT += demos_deployment +- +-isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { +- ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +-} +diff --git a/qtbase/examples/symbianpkgrules.pri b/qtbase/examples/symbianpkgrules.pri +deleted file mode 100644 +index fe9b487..0000000 --- a/qtbase/examples/symbianpkgrules.pri -+++ b/qtbase/mkspecs/features/symbian/qt_example.prf -@@ -1,5 +1,3 @@ ++++ /dev/null +@@ -1,20 +0,0 @@ -!symbian: error(Only include this file for Symbian platforms) - - RSS_RULES ="group_name=\"QtExamples\";" - - nokiaVendor = "Nokia, Qt" -@@ -17,4 +15,3 @@ DEPLOYMENT += examples_deployment - isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { - ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg - } +-RSS_RULES ="group_name=\"QtExamples\";" - +-nokiaVendor = "Nokia, Qt" +-vendorinfo = \ +- "; Localised Vendor name" \ +- "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \ +- " " \ +- "; Unique Vendor name" \ +- ":\"$$nokiaVendor\"" \ +- " " +- +-examples_deployment.pkg_prerules += vendorinfo +-DEPLOYMENT += examples_deployment +- +-isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { +- ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg +-} +- +diff --git a/qtbase/mkspecs/features/symbian/qt_demo.prf b/qtbase/mkspecs/features/symbian/qt_demo.prf +new file mode 100644 +index 0000000..9c4d96c +--- /dev/null ++++ b/qtbase/mkspecs/features/symbian/qt_demo.prf +@@ -0,0 +1,17 @@ ++RSS_RULES ="group_name=\"QtDemos\";" ++ ++nokiaVendor = "Nokia, Qt" ++vendorinfo = \ ++ "; Localised Vendor name" \ ++ "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \ ++ " " \ ++ "; Unique Vendor name" \ ++ ":\"$$nokiaVendor\"" \ ++ " " ++ ++demos_deployment.pkg_prerules += vendorinfo ++DEPLOYMENT += demos_deployment ++ ++isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { ++ ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg ++} +diff --git a/qtbase/mkspecs/features/symbian/qt_example.prf b/qtbase/mkspecs/features/symbian/qt_example.prf +new file mode 100644 +index 0000000..8c523fb +--- /dev/null ++++ b/qtbase/mkspecs/features/symbian/qt_example.prf +@@ -0,0 +1,17 @@ ++RSS_RULES ="group_name=\"QtExamples\";" ++ ++nokiaVendor = "Nokia, Qt" ++vendorinfo = \ ++ "; Localised Vendor name" \ ++ "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \ ++ " " \ ++ "; Unique Vendor name" \ ++ ":\"$$nokiaVendor\"" \ ++ " " ++ ++examples_deployment.pkg_prerules += vendorinfo ++DEPLOYMENT += examples_deployment ++ ++isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") { ++ ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg ++} -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch index dc8b081..c76cd01 100644 --- a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch +++ b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch @@ -1,8 +1,7 @@ -From 13f02fcd304c8160d11355eafa9cb9b1327f021b Mon Sep 17 00:00:00 2001 +From a44c1ae9d3a6e519d62d4e8b8bdad23d7874d13c Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 19:56:41 -0600 -Subject: [PATCH] Have qmake run syncqt automatically, if sync.profile is - detected +Subject: [PATCH] Have qmake run syncqt automatically, if sync.profile is detected This will normally only happen for top-level pro files, and syncqt is smart enough to not touch already existing @@ -49,5 +48,5 @@ index 2e82f03..b8779c8 100644 + unset(PRO_BASENAME) +} -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch index 0973845..5674aad 100644 --- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch +++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch @@ -1,8 +1,7 @@ -From bc218a6908c168da3ec38eeec557b2f81aea7b97 Mon Sep 17 00:00:00 2001 +From 75ed9b9b4480ad3065728b2e9d6cec4be79a7eab Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Wed, 24 Nov 2010 20:21:06 -0600 -Subject: [PATCH] Add module specific pris, and make syncqt create fwd - includes +Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes The module specific pris define the modules name @@ -54,7 +53,7 @@ for syncqt to create the fwding pris in QtBase. create mode 100644 qtxmlpatterns/modules/qt_xmlpatterns.pri diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 7e5fc44..37e408c 100755 +index e3d941b..ac540ea 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt @@ -23,8 +23,16 @@ our $basedir; @@ -97,7 +96,7 @@ index 7e5fc44..37e408c 100755 print " -help This help\n"; exit 0; } -@@ -556,7 +568,7 @@ while ( @ARGV ) { +@@ -558,7 +570,7 @@ while ( @ARGV ) { #parse my $arg = shift @ARGV; @@ -106,7 +105,7 @@ index 7e5fc44..37e408c 100755 $var = "show_help"; $val = "yes"; } elsif($arg eq "-copy") { -@@ -591,10 +603,16 @@ while ( @ARGV ) { +@@ -593,10 +605,16 @@ while ( @ARGV ) { } elsif($arg eq "-private") { $var = "create_private_headers"; $val = "yes"; @@ -123,7 +122,7 @@ index 7e5fc44..37e408c 100755 } elsif($arg =~/^-/) { print "Unknown option: $arg\n\n" if(!$var); showUsage(); -@@ -662,6 +680,15 @@ while ( @ARGV ) { +@@ -664,6 +682,15 @@ while ( @ARGV ) { push @modules_to_sync, $module; $moduleheaders{$module} = $headerdir; $create_uic_class_map = 0; @@ -139,7 +138,7 @@ index 7e5fc44..37e408c 100755 } elsif ($var eq "output") { my $outdir = $val; if(checkRelative($outdir)) { -@@ -676,6 +703,15 @@ while ( @ARGV ) { +@@ -678,6 +705,15 @@ while ( @ARGV ) { } } @@ -155,7 +154,7 @@ index 7e5fc44..37e408c 100755 # 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); -@@ -960,6 +996,23 @@ foreach my $lib (@modules_to_sync) { +@@ -962,6 +998,23 @@ foreach my $lib (@modules_to_sync) { print HEADERS_PRI_FILE $headers_pri_contents; close HEADERS_PRI_FILE; } @@ -358,7 +357,7 @@ index 0000000..0f65438 +QT_CONFIG += testlib diff --git a/qtbase/src/modules/qt_xml.pri b/qtbase/src/modules/qt_xml.pri new file mode 100644 -index 0000000..45dbc667 +index 0000000..45dbc66 --- /dev/null +++ b/qtbase/src/modules/qt_xml.pri @@ -0,0 +1,11 @@ @@ -374,7 +373,7 @@ index 0000000..45dbc667 + +QT_CONFIG += xml diff --git a/qtbase/sync.profile b/qtbase/sync.profile -index 7d2e4b1..c8ef4fc 100644 +index 7d2e4b1a7..c8ef4fc 100644 --- a/qtbase/sync.profile +++ b/qtbase/sync.profile @@ -37,6 +37,19 @@ @@ -426,5 +425,5 @@ index 6707cea..9548e0f 100644 + "QtXmlPatterns" => "$basedir/modules/qt_xmlpatterns.pri", +); -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0022-More-to-the-compilation-of-Qt3Support-in-a-modulariz.patch b/patches/0022-More-to-the-compilation-of-Qt3Support-in-a-modulariz.patch index db6bcce..c6e3474 100644 --- a/patches/0022-More-to-the-compilation-of-Qt3Support-in-a-modulariz.patch +++ b/patches/0022-More-to-the-compilation-of-Qt3Support-in-a-modulariz.patch @@ -1,4 +1,4 @@ -From 8761f6e3ad9de619edeedc8bbc6db9bb3d02b104 Mon Sep 17 00:00:00 2001 +From b3a2f426eed83f4a14e12f4040038f4e432f2c0b Mon Sep 17 00:00:00 2001 From: Olivier Goffart <olivier.goffart@nokia.com> Date: Tue, 14 Dec 2010 13:17:08 +0100 Subject: [PATCH] More to the compilation of Qt3Support in a modularized Qt. @@ -8,12 +8,14 @@ It still depends on having the Qt sources available. For example for qpluginbase.pri, for harfbuzz headers, and for some of the uic sources --- - qt3support/modules/qt_qt3support.pri | 1 + - .../accessible/{compat.pro => accessible.pro} | 6 ++++-- - qt3support/src/qt3support/text/text.pri | 4 +++- - qt3support/src/tools/uic3/uic3.pro | 6 ++++-- - 4 files changed, 12 insertions(+), 5 deletions(-) - rename qt3support/src/plugins/accessible/{compat.pro => accessible.pro} (75%) + qt3support/modules/qt_qt3support.pri | 1 + + qt3support/src/plugins/accessible/accessible.pro | 22 ++++++++++++++++++++++ + qt3support/src/plugins/accessible/compat.pro | 20 -------------------- + qt3support/src/qt3support/text/text.pri | 4 +++- + qt3support/src/tools/uic3/uic3.pro | 6 ++++-- + 5 files changed, 30 insertions(+), 23 deletions(-) + create mode 100644 qt3support/src/plugins/accessible/accessible.pro + delete mode 100644 qt3support/src/plugins/accessible/compat.pro diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri index 4b8c04c..400b69c 100644 @@ -24,25 +26,60 @@ index 4b8c04c..400b69c 100644 QT.qt3support.libs = $$QT_MODULE_LIB_BASE QT.qt3support.depends = core gui +QT.qt3support.DEFINES = QT3_SUPPORT -diff --git a/qt3support/src/plugins/accessible/compat.pro b/qt3support/src/plugins/accessible/accessible.pro -similarity index 75% -rename from qt3support/src/plugins/accessible/compat.pro -rename to qt3support/src/plugins/accessible/accessible.pro -index 0ad5a9a..b69595b 100644 ---- a/qt3support/src/plugins/accessible/compat.pro +diff --git a/qt3support/src/plugins/accessible/accessible.pro b/qt3support/src/plugins/accessible/accessible.pro +new file mode 100644 +index 0000000..b69595b +--- /dev/null +++ b/qt3support/src/plugins/accessible/accessible.pro -@@ -1,7 +1,9 @@ +@@ -0,0 +1,22 @@ +load(qt_module) + - TARGET = qtaccessiblecompatwidgets - CONFIG += qt_no_compat_warning --include(../../qpluginbase.pri) --include (../qaccessiblebase.pri) ++TARGET = qtaccessiblecompatwidgets ++CONFIG += qt_no_compat_warning +include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +include($$QT_SOURCE_TREE/src/plugins/accessible/qaccessiblebase.pri) - - QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible - ++ ++QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible ++ ++QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" ++ ++QT += qt3support ++ ++SOURCES += main.cpp \ ++ q3simplewidgets.cpp \ ++ q3complexwidgets.cpp \ ++ qaccessiblecompat.cpp ++ ++HEADERS += qaccessiblecompat.h \ ++ q3complexwidgets.h \ ++ q3simplewidgets.h ++ +diff --git a/qt3support/src/plugins/accessible/compat.pro b/qt3support/src/plugins/accessible/compat.pro +deleted file mode 100644 +index 0ad5a9a..0000000 +--- a/qt3support/src/plugins/accessible/compat.pro ++++ /dev/null +@@ -1,20 +0,0 @@ +-TARGET = qtaccessiblecompatwidgets +-CONFIG += qt_no_compat_warning +-include(../../qpluginbase.pri) +-include (../qaccessiblebase.pri) +- +-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible +- +-QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" +- +-QT += qt3support +- +-SOURCES += main.cpp \ +- q3simplewidgets.cpp \ +- q3complexwidgets.cpp \ +- qaccessiblecompat.cpp +- +-HEADERS += qaccessiblecompat.h \ +- q3complexwidgets.h \ +- q3simplewidgets.h +- diff --git a/qt3support/src/qt3support/text/text.pri b/qt3support/src/qt3support/text/text.pri index 0e74761..ddabc2a 100644 --- a/qt3support/src/qt3support/text/text.pri @@ -81,5 +118,5 @@ index 5ad3c4d..a42e652 100644 INCLUDEPATH += . -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch b/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch index 05b6293..746ad0b 100644 --- a/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch +++ b/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch @@ -1,8 +1,7 @@ -From 1dfdb058c0270d6bff523eecccb51d20bb1fec46 Mon Sep 17 00:00:00 2001 +From 9c8f6cf2174d565f66cc9478030bbb3b4a4552a3 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 15 Dec 2010 07:33:19 +0100 -Subject: [PATCH] Make QtScript main project file see dependencies properly - and etc. +Subject: [PATCH] Make QtScript main project file see dependencies properly and etc. This allows for running make -j<n> without breaking. Also add examples to the compile. But two of them were disabled for now because they need QUiLoader. @@ -31,5 +30,5 @@ index 18663bb..d3b5dfd 100644 target.path += $$[QT_INSTALL_PLUGINS]/script INSTALLS += target -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch index 0f6acf9..e3f45c7 100644 --- a/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch +++ b/patches/0024-Add-the-source-path-to-the-modules-.pri-file.patch @@ -1,4 +1,4 @@ -From 081072fb6c23ea8a72fef472a9ec07a52919702c Mon Sep 17 00:00:00 2001 +From 87b33b5c6750512443a2b9042bbd7328a112a528 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 16 Dec 2010 23:34:20 -0600 Subject: [PATCH] Add the source path to the modules .pri file @@ -36,10 +36,10 @@ index 400b69c..86d6395 100644 QT.qt3support.depends = core gui QT.qt3support.DEFINES = QT3_SUPPORT diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 37e408c..5ac4fd2 100755 +index ac540ea..c3e28ec 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1004,6 +1004,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { my $modulepriname = basename($modulepri); my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; @@ -217,5 +217,5 @@ index ac83022..a11c06a 100644 QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE QT.xmlpatterns.depends = core network -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0027-Move-QtSvg-into-a-separate-repository.patch b/patches/0027-Move-QtSvg-into-a-separate-repository.patch index fbb0046..7d3b451 100644 --- a/patches/0027-Move-QtSvg-into-a-separate-repository.patch +++ b/patches/0027-Move-QtSvg-into-a-separate-repository.patch @@ -1,22 +1,41 @@ -From 8a4f9d1c32e363c7b7d319d40ca770965fba1ef9 Mon Sep 17 00:00:00 2001 +From d8b4cb6f259f84062b6a03ac87c6bfbfdf6b60a1 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Mon, 27 Dec 2010 14:49:29 +0100 Subject: [PATCH] Move QtSvg into a separate repository --- + qtbase/src/modules/qt_svg.pri | 11 ----------- qtbase/src/plugins/imageformats/imageformats.pro | 1 - qtbase/src/plugins/plugins.pro | 2 +- qtbase/src/src.pro | 9 +-------- qtbase/sync.profile | 3 --- - {qtbase/src => qtsvg}/modules/qt_svg.pri | 2 +- + qtsvg/modules/qt_svg.pri | 11 +++++++++++ .../iconengines/svgiconengine/svgiconengine.pro | 6 ++++-- qtsvg/src/plugins/imageformats/svg/svg.pro | 6 ++++-- qtsvg/src/svg/svg.pro | 9 +++++---- qtsvg/sync.profile | 14 ++++++++++++++ - 9 files changed, 30 insertions(+), 22 deletions(-) - rename {qtbase/src => qtsvg}/modules/qt_svg.pri (82%) + 10 files changed, 40 insertions(+), 32 deletions(-) + delete mode 100644 qtbase/src/modules/qt_svg.pri + create mode 100644 qtsvg/modules/qt_svg.pri create mode 100644 qtsvg/sync.profile +diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri +deleted file mode 100644 +index 90df93f..0000000 +--- a/qtbase/src/modules/qt_svg.pri ++++ /dev/null +@@ -1,11 +0,0 @@ +-QT_SVG_VERSION = $$QT_VERSION +-QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION +-QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION +-QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION +- +-QT.svg.name = QtSvg +-QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg +-QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private +-QT.svg.sources = $$QT_MODULE_BASE/src/svg +-QT.svg.libs = $$QT_MODULE_LIB_BASE +-QT.svg.depends = core gui diff --git a/qtbase/src/plugins/imageformats/imageformats.pro b/qtbase/src/plugins/imageformats/imageformats.pro index 5fff2de..66dea09 100644 --- a/qtbase/src/plugins/imageformats/imageformats.pro @@ -117,22 +136,23 @@ index c8ef4fc..7984329 100644 "QtTest" => "$basedir/src/modules/qt_testlib.pri", "QtXml" => "$basedir/src/modules/qt_xml.pri", ); -diff --git a/qtbase/src/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri -similarity index 82% -rename from qtbase/src/modules/qt_svg.pri -rename to qtsvg/modules/qt_svg.pri -index 90df93f..5fa3212 100644 ---- a/qtbase/src/modules/qt_svg.pri +diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri +new file mode 100644 +index 0000000..5fa3212 +--- /dev/null +++ b/qtsvg/modules/qt_svg.pri -@@ -4,7 +4,7 @@ QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION - QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.svg.name = QtSvg --QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg +@@ -0,0 +1,11 @@ ++QT_SVG_VERSION = $$QT_VERSION ++QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION ++QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION ++QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION ++ ++QT.svg.name = QtSvg +QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg - QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private - QT.svg.sources = $$QT_MODULE_BASE/src/svg - QT.svg.libs = $$QT_MODULE_LIB_BASE ++QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private ++QT.svg.sources = $$QT_MODULE_BASE/src/svg ++QT.svg.libs = $$QT_MODULE_LIB_BASE ++QT.svg.depends = core gui diff --git a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 5c5a31e..642fb0f 100644 --- a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -227,5 +247,5 @@ index 0000000..275e96c + "QtSvg" => "$basedir/modules/qt_svg.pri", +); -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0031-Extended-module-profiles.patch b/patches/0031-Extended-module-profiles.patch index 5c742c2..ef5b35e 100644 --- a/patches/0031-Extended-module-profiles.patch +++ b/patches/0031-Extended-module-profiles.patch @@ -1,4 +1,4 @@ -From 3bc29615959e2b22d89ffb44955a5b2898e963c0 Mon Sep 17 00:00:00 2001 +From 22d771445cedc07b3a806859cb56aaa35ff9dad1 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 19:01:57 +0100 Subject: [PATCH] Extended module profiles. @@ -43,7 +43,7 @@ index 76ad617..5554999 100644 + warning("Attempted to include $$QT.qt3support.name in the build, but $$QT.gui.name was not built with $$QT.qt3support.name enabled.") +} diff --git a/qtbase/configure b/qtbase/configure -index fe9e311..c92af3f 100755 +index 9a04380..5888b1b 100755 --- a/qtbase/configure +++ b/qtbase/configure @@ -6958,12 +6958,13 @@ esac @@ -62,7 +62,7 @@ index fe9e311..c92af3f 100755 if [ "$CFG_PHONON_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG phonon-backend" fi -@@ -7539,17 +7540,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then +@@ -7538,17 +7539,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then elif [ "$CFG_EXCEPTIONS" = "no" ]; then CFG_XMLPATTERNS="no" fi @@ -92,7 +92,7 @@ index fe9e311..c92af3f 100755 if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG audio-backend" -@@ -7575,26 +7578,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then +@@ -7574,26 +7577,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then fi if [ "$CFG_WEBKIT" != "no" ]; then @@ -127,7 +127,7 @@ index fe9e311..c92af3f 100755 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 +7614,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then +@@ -7612,11 +7613,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then CFG_SCRIPTTOOLS="no" fi @@ -145,7 +145,7 @@ index fe9e311..c92af3f 100755 if [ "$CFG_DECLARATIVE" = "yes" ]; then -@@ -7635,7 +7637,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then +@@ -7634,7 +7636,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then fi if [ "$CFG_DECLARATIVE" = "yes" ]; then @@ -288,7 +288,7 @@ index 7f0a5d3..01340ac 100644 QT.designer.depends = xml +QT.designer.DEFINES = QT_DESIGNER_LIB diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri -index f36858f..d99f57aa 100644 +index f36858f..d99f57a 100644 --- a/qttools/modules/qt_help.pri +++ b/qttools/modules/qt_help.pri @@ -9,3 +9,4 @@ QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private @@ -319,5 +319,5 @@ index d67a720..a5a50e6 100644 + +QT_CONFIG += xmlpatterns -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0033-Fixed-useless-substitution-in-syncqt.patch b/patches/0033-Fixed-useless-substitution-in-syncqt.patch index d7c14f9..caba312 100644 --- a/patches/0033-Fixed-useless-substitution-in-syncqt.patch +++ b/patches/0033-Fixed-useless-substitution-in-syncqt.patch @@ -1,4 +1,4 @@ -From bb2e4aa4a3817a890e20335511559e534eb2bc7c Mon Sep 17 00:00:00 2001 +From 70d9faa7a308c4cefd07be0a43e7513bf6b6065c Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 19:18:14 +0100 Subject: [PATCH] Fixed useless substitution in syncqt. @@ -10,10 +10,10 @@ passed in. 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 0894c80..5a72636 100755 +index a6d7af1..72b9be0 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -303,7 +303,6 @@ sub syncHeader { +@@ -305,7 +305,6 @@ sub syncHeader { ###################################################################### sub fixPaths { my ($file, $dir) = @_; @@ -22,5 +22,5 @@ index 0894c80..5a72636 100755 $dir =~ s=\\=/=g; -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch b/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch index b85d855..ac752a9 100644 --- a/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch +++ b/patches/0034-Made-syncqt-collapse-redundant-.-sections-in-paths.patch @@ -1,4 +1,4 @@ -From 24e74199716f93017e465a63b4a5945e00f98ef5 Mon Sep 17 00:00:00 2001 +From af93c5fb352a32139b99620623afee87f0e7642f Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 19:19:39 +0100 Subject: [PATCH] Made syncqt collapse redundant ".." sections in paths. @@ -8,10 +8,10 @@ Subject: [PATCH] Made syncqt collapse redundant ".." sections in paths. 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index cffd832..5529359 100755 +index 72b9be0..6af59c4 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -323,6 +323,8 @@ sub fixPaths { +@@ -325,6 +325,8 @@ sub fixPaths { return basename($file) if($file_dir eq $dir); #guts @@ -21,5 +21,5 @@ index cffd832..5529359 100755 for(my $i = 1; $i < length($file_dir); $i++) { my $slash = index($file_dir, "/", $i); -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch index 7c6f2f0..7fcd70e 100644 --- a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch +++ b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch @@ -1,8 +1,7 @@ -From 515a3c3470c51406acc36bf89c686b177e5c03c5 Mon Sep 17 00:00:00 2001 +From cddb484e45669cb145f9d81226c95d28436b77af Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Tue, 4 Jan 2011 16:37:10 +0100 -Subject: [PATCH] Made modules that depend on other modules add their include - paths. +Subject: [PATCH] Made modules that depend on other modules add their include paths. This is needed so that header files which contain references to those modules (for example in templates) will have their include paths as @@ -40,5 +39,5 @@ index 4d8e465..419bb92 100644 !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0037-Make-each-module-refer-to-its-own-bin.patch b/patches/0037-Make-each-module-refer-to-its-own-bin.patch index 2f500b7..064a435 100644 --- a/patches/0037-Make-each-module-refer-to-its-own-bin.patch +++ b/patches/0037-Make-each-module-refer-to-its-own-bin.patch @@ -1,4 +1,4 @@ -From 384cc04756a692e4dd9363cabc701ace2254adbd Mon Sep 17 00:00:00 2001 +From 0a07f5e4a5bd7063fa1838f6c74da28b96da7378 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 6 Jan 2011 12:52:17 -0600 Subject: [PATCH] Make each module refer to its own bin/ @@ -45,10 +45,10 @@ index 5554999..f78c269 100644 QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index abd4c06..d575c33 100755 +index 6af59c4..a5434ca 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1006,6 +1006,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1008,6 +1008,7 @@ foreach my $lib (@modules_to_sync) { my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; @@ -268,7 +268,7 @@ index 01340ac..a617834 100644 QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri -index d99f57aa..07e815d 100644 +index d99f57a..07e815d 100644 --- a/qttools/modules/qt_help.pri +++ b/qttools/modules/qt_help.pri @@ -4,6 +4,7 @@ QT_HELP_MINOR_VERSION = $$QT_MINOR_VERSION @@ -304,5 +304,5 @@ index a5a50e6..329b784 100644 QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch index 5be3315..0f03be2 100644 --- a/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch +++ b/patches/0044-Move-uitools-from-QtTools-to-QtBase.patch @@ -1,11 +1,11 @@ -From 97a2728fc11062b0230b70cf09a9554eb96a560f Mon Sep 17 00:00:00 2001 +From 64daaa1cee9bcc7ca9766f8a4e305a882b867356 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 12 Jan 2011 21:06:11 +0100 Subject: [PATCH] Move uitools from QtTools to QtBase --- qtbase/src/modules/qt_uilib.pri | 12 +++ - {qttools => qtbase/src}/modules/qt_uitools.pri | 4 +- + qtbase/src/modules/qt_uitools.pri | 15 +++ qtbase/src/src.pro | 5 +- qtbase/src/uitools/uitools.pro | 12 +- qtbase/sync.profile | 6 + @@ -17,6 +17,7 @@ Subject: [PATCH] Move uitools from QtTools to QtBase qtbase/tools/uilib/properties_p.h | 2 +- qtbase/tools/uilib/resourcebuilder_p.h | 2 +- qtbase/tools/uilib/textbuilder_p.h | 2 +- + qttools/modules/qt_uitools.pri | 15 --- qttools/src/designer/src/components/component.pri | 3 +- qttools/src/designer/src/components/lib/lib.pro | 2 +- qttools/src/designer/src/designer/designer.pro | 2 +- @@ -24,10 +25,11 @@ Subject: [PATCH] Move uitools from QtTools to QtBase qttools/src/designer/src/src.pro | 3 - qttools/src/linguist/linguist/linguist.pro | 6 +- qttools/sync.profile | 2 - - 20 files changed, 156 insertions(+), 29 deletions(-) + 21 files changed, 169 insertions(+), 42 deletions(-) create mode 100644 qtbase/src/modules/qt_uilib.pri - rename {qttools => qtbase/src}/modules/qt_uitools.pri (75%) + create mode 100644 qtbase/src/modules/qt_uitools.pri create mode 100644 qtbase/tools/uilib/extension.h + delete mode 100644 qttools/modules/qt_uitools.pri diff --git a/qtbase/src/modules/qt_uilib.pri b/qtbase/src/modules/qt_uilib.pri new file mode 100644 @@ -47,25 +49,27 @@ index 0000000..0e143de +QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib +QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.depends = xml -diff --git a/qttools/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri -similarity index 75% -rename from qttools/modules/qt_uitools.pri -rename to qtbase/src/modules/qt_uitools.pri -index c5160c5..1f4070c 100644 ---- a/qttools/modules/qt_uitools.pri +diff --git a/qtbase/src/modules/qt_uitools.pri b/qtbase/src/modules/qt_uitools.pri +new file mode 100644 +index 0000000..1f4070c +--- /dev/null +++ b/qtbase/src/modules/qt_uitools.pri -@@ -5,9 +5,9 @@ QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION - - QT.uitools.name = QtUiTools - QT.uitools.bins = $$QT_MODULE_BIN_BASE --QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools +@@ -0,0 +1,15 @@ ++QT_UITOOLS_VERSION = $$QT_VERSION ++QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION ++QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION ++QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION ++ ++QT.uitools.name = QtUiTools ++QT.uitools.bins = $$QT_MODULE_BIN_BASE +QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools - QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private --QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools ++QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private +QT.uitools.sources = $$QT_MODULE_BASE/src/uitools - QT.uitools.libs = $$QT_MODULE_LIB_BASE - QT.uitools.depends = xml - QT.uitools.DEFINES = QT_UITOOLS_LIB ++QT.uitools.libs = $$QT_MODULE_LIB_BASE ++QT.uitools.depends = xml ++QT.uitools.DEFINES = QT_UITOOLS_LIB ++ ++QT_CONFIG += uitools diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro index 7c51c25..491973c 100644 --- a/qtbase/src/src.pro @@ -367,6 +371,27 @@ index 8da296d..066733c 100644 #include <QtCore/QList> #include <QtCore/QString> +diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri +deleted file mode 100644 +index c5160c5..0000000 +--- a/qttools/modules/qt_uitools.pri ++++ /dev/null +@@ -1,15 +0,0 @@ +-QT_UITOOLS_VERSION = $$QT_VERSION +-QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION +-QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION +-QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION +- +-QT.uitools.name = QtUiTools +-QT.uitools.bins = $$QT_MODULE_BIN_BASE +-QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools +-QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private +-QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools +-QT.uitools.libs = $$QT_MODULE_LIB_BASE +-QT.uitools.depends = xml +-QT.uitools.DEFINES = QT_UITOOLS_LIB +- +-QT_CONFIG += uitools diff --git a/qttools/src/designer/src/components/component.pri b/qttools/src/designer/src/components/component.pri index c2fc10d..1dd8cf0 100644 --- a/qttools/src/designer/src/components/component.pri @@ -472,5 +497,5 @@ index 0e4a6c3..cfeac5e 100644 - "QtUiTools" => "$basedir/modules/qt_uitools.pri", ); -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch index 7d33019..4cacf0a 100644 --- a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch +++ b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch @@ -1,8 +1,7 @@ -From 1a30b305fbf4c2c55866c8e8f93e63aaaa0bc46b Mon Sep 17 00:00:00 2001 +From b43813cfa0b9802712e63ffab6e53ce1acd53c59 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Fri, 14 Jan 2011 16:14:17 +0100 -Subject: [PATCH] Added new QtWebKit requirements since we need more tools - now. +Subject: [PATCH] Added new QtWebKit requirements since we need more tools now. --- qtdoc/doc/src/getting-started/installation.qdoc | 60 +++++++++++++++++++++++ @@ -94,5 +93,5 @@ index 26ccf88..4e6cc11 100644 */ -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch index a0d3840..b982426 100644 --- a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch +++ b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch @@ -1,8 +1,7 @@ -From d74ddb408cbd761ca6ffa4ba0951729645ec070f Mon Sep 17 00:00:00 2001 +From 5144d33bb99b595606f2bde6ffa7a41b58b9bd39 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 24 Jan 2011 11:35:32 +0100 -Subject: [PATCH] Removed activeqt references from Designer, which is in its - own repo. +Subject: [PATCH] Removed activeqt references from Designer, which is in its own repo. --- qttools/src/designer/src/plugins/plugins.pro | 1 - @@ -34,5 +33,5 @@ index 7332502..8b6a706 100644 } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch index 3bd374d..9fe58b8 100644 --- a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch +++ b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch @@ -1,8 +1,7 @@ -From f2b7f258f06446af7be296831279d08f52e2ed29 Mon Sep 17 00:00:00 2001 +From 478d1abe1c7289fee349109f604bfafba131ea70 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Tue, 25 Jan 2011 10:08:15 +0100 -Subject: [PATCH] Use the 'install_name' linker flag on Mac for the - frameworks. +Subject: [PATCH] Use the 'install_name' linker flag on Mac for the frameworks. This is required for the frameworks outside the qtbase module. --- @@ -23,5 +22,5 @@ index a263e28..a5a3fd1 100644 + } +} -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch index 0cdabe8..27f9356 100644 --- a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch +++ b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch @@ -1,8 +1,7 @@ -From e8a59cc11de85f30f12606737d71f367167ca16c Mon Sep 17 00:00:00 2001 +From cfbfb7c44eed90c3d6bb0edd8af3ab534e1410b3 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Tue, 25 Jan 2011 14:48:39 +0100 -Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for - frameworks. +Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks. --- qtbase/mkspecs/features/qt_functions.prf | 4 ++-- @@ -31,5 +30,5 @@ index c44419c..b16c848 100644 QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch index 373fddd..2ae03f0 100644 --- a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch +++ b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch @@ -1,8 +1,7 @@ -From 62c5615e584e3f927685f4fc30322fbb1838b2a7 Mon Sep 17 00:00:00 2001 +From 4ed1e56350c8c75a5dcb203fae633c6be7e02f52 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Thu, 27 Jan 2011 09:34:10 +0100 -Subject: [PATCH] Changed various path references in ActiveQt to match - modularization. +Subject: [PATCH] Changed various path references in ActiveQt to match modularization. --- qtactiveqt/src/activeqt/container/container.pro | 6 ++++-- @@ -36,7 +35,7 @@ index 4c9b3a8..57845b0 100644 LIBS += -lole32 -loleaut32 !wince*:LIBS += -luser32 -lgdi32 -ladvapi32 diff --git a/qtactiveqt/src/activeqt/control/control.pro b/qtactiveqt/src/activeqt/control/control.pro -index 361ca29..3f7af07 100644 +index 361ca29..3f7af07a 100644 --- a/qtactiveqt/src/activeqt/control/control.pro +++ b/qtactiveqt/src/activeqt/control/control.pro @@ -4,7 +4,7 @@ TARGET = ActiveQt @@ -76,5 +75,5 @@ index 89f8067..07df464 100644 } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0065-Changed-path-references-to-ActiveQt.patch b/patches/0065-Changed-path-references-to-ActiveQt.patch index fd27886..acebbc3 100644 --- a/patches/0065-Changed-path-references-to-ActiveQt.patch +++ b/patches/0065-Changed-path-references-to-ActiveQt.patch @@ -1,4 +1,4 @@ -From 8f10d0ea1cb8486ebacb12f92d68b66968c4ad95 Mon Sep 17 00:00:00 2001 +From a7f3d2673743bad6baf16b92c42cc18b2ffc5d02 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Thu, 27 Jan 2011 09:47:08 +0100 Subject: [PATCH] Changed path references to ActiveQt. @@ -24,7 +24,7 @@ index 34c6dfe..2d0ff85 100644 dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} diff --git a/qtbase/mkspecs/features/win32/qaxserver.prf b/qtbase/mkspecs/features/win32/qaxserver.prf -index 2899976..6022a3f 100644 +index a6c0869..678c2cc 100644 --- a/qtbase/mkspecs/features/win32/qaxserver.prf +++ b/qtbase/mkspecs/features/win32/qaxserver.prf @@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION @@ -33,9 +33,9 @@ index 2899976..6022a3f 100644 DEFINES += QAXSERVER +INCLUDEPATH += $$QT.activeqt.includes - ACTIVEQT_IDE = makefile - equals(TEMPLATE_PREFIX, "vc"):ACTIVEQT_IDE = VisualStudio -@@ -62,4 +63,6 @@ qt:!target_qt { + contains(TEMPLATE, "vc.*") { + ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me +@@ -56,4 +57,6 @@ qt:!target_qt { QMAKE_LIBS_QT_ENTRY = -lQAxServer } dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY @@ -43,5 +43,5 @@ index 2899976..6022a3f 100644 + QMAKE_LIBS += $$QMAKE_LIBS_GUI } -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch index 0970e13..1881b18 100644 --- a/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch +++ b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch @@ -1,8 +1,7 @@ -From 900bcda0e3684f0b932e91426e624e4212531e0d Mon Sep 17 00:00:00 2001 +From 2256b18637703e9f63ab11dfd0605f913139f29e Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Thu, 27 Jan 2011 10:16:36 +0100 -Subject: [PATCH] Made ActiveQt Designer plugin refer to right source - location. +Subject: [PATCH] Made ActiveQt Designer plugin refer to right source location. --- .../src/designer/src/plugins/activeqt/activeqt.pro | 11 ++++++----- @@ -44,5 +43,5 @@ index f58df8a..d71e387 100644 # install target.path = $$[QT_INSTALL_PLUGINS]/designer -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch index ea8983b..c5ad9a6 100644 --- a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch +++ b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch @@ -1,8 +1,7 @@ -From 97113c469f9f8903279c8c8da8e20ccad253e79d Mon Sep 17 00:00:00 2001 +From 8345298a621b0dacf36f4ac89eddca2d83eab9fe Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Fri, 28 Jan 2011 15:17:00 +0100 -Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in - the PATH. +Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in the PATH. --- qtbase/bin/syncqt.bat | 6 ++++-- @@ -38,5 +37,5 @@ index b8779c8..adcdbb7 100644 unset(PRO_BASENAME) } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-li.patch b/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-li.patch index c5c927d..742268e 100644 --- a/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-li.patch +++ b/patches/0076-Temporarily-pointing-QT_MODULE_LIB_BASE-to-qtbase-li.patch @@ -1,4 +1,4 @@ -From d7e6ef5dd55cae2b89fbe16acdbf472a93200307 Mon Sep 17 00:00:00 2001 +From 0fe4cfeb94430775b0fb6cb6b4c4861a3aa671e9 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Mon, 28 Feb 2011 16:19:40 +0100 Subject: [PATCH] Temporarily pointing QT_MODULE_LIB_BASE to qtbase/lib @@ -10,10 +10,10 @@ in their respective lib/bin folders. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index d575c33..9d6a17f 100755 +index a5434ca..4c996cc 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1008,7 +1008,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1010,7 +1010,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; @@ -23,5 +23,5 @@ index d575c33..9d6a17f 100755 close MODULE_PRI_FILE; utime(time, (stat($modulepri))[9], $moduleprifwd); -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch index 034c4a4..9fb308b 100644 --- a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch +++ b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch @@ -1,4 +1,4 @@ -From 2dafeb1c875f81af7815e338a6320c6adb95d2e6 Mon Sep 17 00:00:00 2001 +From 65ee9147e4c87d46f1ff54412afafe29a857b562 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Date: Thu, 24 Feb 2011 13:01:18 -0600 Subject: [PATCH] Make qmake respect <subdir>.CONFIG = no_default_install @@ -9,10 +9,10 @@ It already respects no_default_target 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/qtbase/qmake/generators/makefile.cpp b/qtbase/qmake/generators/makefile.cpp -index 9e2be31..1c4f74b2 100644 +index 4f3b113..61e7ac5 100644 --- a/qtbase/qmake/generators/makefile.cpp +++ b/qtbase/qmake/generators/makefile.cpp -@@ -2569,6 +2569,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT +@@ -2570,6 +2570,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; } @@ -24,5 +24,5 @@ index 9e2be31..1c4f74b2 100644 if(flags & SubTargetOrdered) targetRule += "-ordered"; -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch b/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch index c8b6be4..6db3ed9 100644 --- a/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch +++ b/patches/0084-Load-the-sync.profile-after-setting-the-variables.patch @@ -1,4 +1,4 @@ -From de6bbe65a5b10457caa2e4e65c88f955e3c84f4a Mon Sep 17 00:00:00 2001 +From 12eddfa96ad7e18f1a04745b6b4c0ba9d9a2e2f5 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Thu, 10 Mar 2011 16:23:01 +0100 Subject: [PATCH] Load the sync.profile after setting the variables. @@ -8,10 +8,10 @@ Subject: [PATCH] Load the sync.profile after setting the variables. 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 9d6a17f..c6f5007 100755 +index 4c996cc..e6ef527 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -716,6 +716,16 @@ die "Cannot automatically detect/use provided path to QtBase's build directory!\ +@@ -718,6 +718,16 @@ die "Cannot automatically detect/use provided path to QtBase's build directory!\ # 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); @@ -28,7 +28,7 @@ index 9d6a17f..c6f5007 100755 # load the module's sync.profile here, before we can loadSyncProfile(\$basedir, \$out_basedir); -@@ -727,15 +737,6 @@ $isunix = checkUnix; #cache checkUnix +@@ -729,15 +739,6 @@ $isunix = checkUnix; #cache checkUnix mkpath "$out_basedir/include", !$quiet; mkpath "$out_basedir/include/Qt", !$quiet; @@ -45,5 +45,5 @@ index 9d6a17f..c6f5007 100755 foreach my $lib (@modules_to_sync) { #iteration info -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch index 0383eea..eabc08b 100644 --- a/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch +++ b/patches/0086-Added-QT.-module-.imports-support-to-module-profiles.patch @@ -1,4 +1,4 @@ -From be7cc408bc8cc17963fc43f64680bc96ce60f72f Mon Sep 17 00:00:00 2001 +From 6cb4fa6b295770b4828f51993a51a911c7620b39 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Thu, 17 Mar 2011 10:57:48 +0100 Subject: [PATCH] Added QT.<module>.imports support to module profiles. @@ -55,10 +55,10 @@ index fe6a421..c10d06d 100644 QT.activeqt.DEFINES = QT_ACTIVEQT_LIB diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index c6f5007..2bb2baf 100755 +index e6ef527..d7dbc23 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1009,6 +1009,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) { print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n"; print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; @@ -228,7 +228,7 @@ index 24af6d6..af1b222 100644 QT.phonon.DEFINES = QT_PHONON_LIB diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -index 2063693..ff4494f 100644 +index 2063693..ff4494f2 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -9,6 +9,7 @@ QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript @@ -307,5 +307,5 @@ index 329b784..3f37d50 100644 QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0090-Fixed-syncqt-generation-of-bin-path.patch b/patches/0090-Fixed-syncqt-generation-of-bin-path.patch index 4647a0c..b627df3 100644 --- a/patches/0090-Fixed-syncqt-generation-of-bin-path.patch +++ b/patches/0090-Fixed-syncqt-generation-of-bin-path.patch @@ -1,4 +1,4 @@ -From 1f1ead81d8da8c1082c33431b95f31e61c0a7618 Mon Sep 17 00:00:00 2001 +From 2c4c567b6dcc38f893fb3729a9ee01ab5895e31c Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Fri, 18 Mar 2011 12:14:01 +0100 Subject: [PATCH] Fixed syncqt generation of bin path. @@ -11,10 +11,10 @@ having to install them first. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 7446f3e..cf61270 100755 +index d7dbc23..d37d077 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1007,7 +1007,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1009,7 +1009,7 @@ foreach my $lib (@modules_to_sync) { my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; open MODULE_PRI_FILE, ">$moduleprifwd"; print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; @@ -24,5 +24,5 @@ index 7446f3e..cf61270 100755 print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch index 25536a0..081d951 100644 --- a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch +++ b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch @@ -1,8 +1,7 @@ -From fb1f2fa3e375382df16d1e9c8b5137ddad3e96e5 Mon Sep 17 00:00:00 2001 +From d1a1c4e858b90188b911912e690b4d2f35006c55 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Tue, 22 Mar 2011 09:19:46 +0100 -Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a - global test. +Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a global test. --- .../auto/maketestselftest/tst_maketestselftest.cpp | 3 ++- @@ -23,5 +22,5 @@ index 8ed8cb8..9fbfd5a 100644 continue; } -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch index 2076e0f..b184ddf 100644 --- a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch +++ b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch @@ -1,8 +1,7 @@ -From 232edb9da29393cc92a996955622aa9f90070f80 Mon Sep 17 00:00:00 2001 +From b6ca35b95311e4fdc490e2523c8a8860d8436657 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Tue, 22 Mar 2011 13:20:53 +0100 -Subject: [PATCH] Introduced the QT.<module>.plugins variable to module - profiles. +Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles. --- qt3support/modules/qt_qt3support.pri | 1 + @@ -77,7 +76,7 @@ Subject: [PATCH] Introduced the QT.<module>.plugins variable to module qtbase/src/plugins/s60/s60pluginbase.pri | 2 +- qtbase/src/plugins/sqldrivers/qsqldriverbase.pri | 2 +- qtdeclarative/modules/qt_declarative.pri | 1 + - .../src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- + .../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 +- qtmultimedia/modules/qt_multimedia.pri | 1 + qtphonon/modules/qt_phonon.pri | 1 + qtphonon/src/plugins/phonon/mmf/mmf.pro | 2 +- @@ -135,10 +134,10 @@ index c10d06d..e2f8132 100644 QT.activeqt.depends = gui QT.activeqt.DEFINES = QT_ACTIVEQT_LIB diff --git a/qtbase/bin/syncqt b/qtbase/bin/syncqt -index 8f0047f..05d8ecb 100755 +index d37d077..45ac9d0 100755 --- a/qtbase/bin/syncqt +++ b/qtbase/bin/syncqt -@@ -1011,6 +1011,7 @@ foreach my $lib (@modules_to_sync) { +@@ -1013,6 +1013,7 @@ foreach my $lib (@modules_to_sync) { 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"; @@ -1002,10 +1001,10 @@ index 01c525d..d4dfecd 100644 QT.declarative.imports = $$QT_MODULE_IMPORT_BASE QT.declarative.depends = gui script network QT.declarative.DEFINES = QT_DECLARATIVE_LIB -diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -index f4f2666..0a89b9e 100644 ---- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -+++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro +diff --git a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +index e8ab962..25f05c2 100644 +--- a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro ++++ b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -3,7 +3,7 @@ QT += declarative network include(../../qpluginbase.pri) @@ -1053,7 +1052,7 @@ index 9bf50c7..e3f9f82 100644 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri -index ff4494f..18c6632 100644 +index ff4494f2..18c6632 100644 --- a/qtscript/modules/qt_script.pri +++ b/qtscript/modules/qt_script.pri @@ -9,6 +9,7 @@ QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript @@ -1065,7 +1064,7 @@ index ff4494f..18c6632 100644 QT.script.depends = core QT.script.DEFINES = QT_SCRIPT_LIB diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri -index 70acaf4..63ae470a 100644 +index 70acaf4..63ae470 100644 --- a/qtscript/modules/qt_scripttools.pri +++ b/qtscript/modules/qt_scripttools.pri @@ -9,6 +9,7 @@ QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSc @@ -1225,5 +1224,5 @@ index 3f37d50..3c15c46 100644 QT.xmlpatterns.depends = core network QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0099-Changed-the-path-for-qpluginbase.pri.patch b/patches/0099-Changed-the-path-for-qpluginbase.pri.patch index 2365fe2..41ec0bd 100644 --- a/patches/0099-Changed-the-path-for-qpluginbase.pri.patch +++ b/patches/0099-Changed-the-path-for-qpluginbase.pri.patch @@ -1,18 +1,18 @@ -From 25666412edd8d7cfe728369d11d2fb3cd1be3e70 Mon Sep 17 00:00:00 2001 +From 05bc1645437bc080ad1d848eec3708ad633af020 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil <prasanth.ullattil@nokia.com> Date: Wed, 23 Mar 2011 10:55:02 +0100 Subject: [PATCH] Changed the path for qpluginbase.pri --- - .../src/plugins/qmltooling/tcpserver/tcpserver.pro | 2 +- + .../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -index 0a89b9e..3789084 100644 ---- a/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro -+++ b/qtdeclarative/src/plugins/qmltooling/tcpserver/tcpserver.pro +diff --git a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +index 25f05c2..14113fb 100644 +--- a/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro ++++ b/qtdeclarative/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -1,7 +1,7 @@ - TARGET = tcpserver + TARGET = qmldbg_tcp QT += declarative network -include(../../qpluginbase.pri) @@ -21,5 +21,5 @@ index 0a89b9e..3789084 100644 DESTDIR = $$QT.declarative.plugins/qmltooling QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)" -- -1.7.4.2.g597a6 +1.7.3.4 diff --git a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch index f6c9761..b0411c0 100644 --- a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch +++ b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch @@ -1,8 +1,7 @@ -From e44875d469b9d4976a59e6ce9fccb57b913a8411 Mon Sep 17 00:00:00 2001 +From a14690194aba891afb3a450bf29c179e819bfd4e Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Tue, 22 Mar 2011 16:13:21 +0100 -Subject: [PATCH] Modularized tst_bic and add some helper functions for global - test +Subject: [PATCH] Modularized tst_bic and add some helper functions for global test --- qt3support/tests/global/global.cfg | 5 + @@ -451,5 +450,5 @@ index 0000000..fb1042d +</modules> +</config> -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 diff --git a/patches/0102-Modularized-tst_compilerwarnings.patch b/patches/0102-Modularized-tst_compilerwarnings.patch index cccfe2a..1121155 100644 --- a/patches/0102-Modularized-tst_compilerwarnings.patch +++ b/patches/0102-Modularized-tst_compilerwarnings.patch @@ -1,237 +1,341 @@ -From 8c37eae68f683de8420b372dcb46e201f54cb458 Mon Sep 17 00:00:00 2001 +From 0213c02683226834ff0c228f72ab123bdb10b6e4 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Wed, 23 Mar 2011 17:25:22 +0100 Subject: [PATCH] Modularized tst_compilerwarnings --- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 9 ++-- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 23 +------- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 69 +++++++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 51 ++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ .../auto/compilerwarnings/compilerwarnings.pro | 2 +- .../auto/compilerwarnings/compilerwarnings.qrc | 5 -- - .../auto/compilerwarnings/tst_compilerwarnings.cpp | 57 ++++++++++++++++---- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 ++------ - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- - .../tests/auto/compilerwarnings/data}/test_cpp.txt | 22 +------- - 12 files changed, 69 insertions(+), 181 deletions(-) - copy {qtqa/tests/auto/compilerwarnings => phonon/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) - copy {qtqa/tests/auto/compilerwarnings => qt3support/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) - copy {qtqa/tests/auto/compilerwarnings => qtbase/tests/auto/compilerwarnings/data}/test_cpp.txt (96%) - copy {qtqa/tests/auto/compilerwarnings => qtdeclarative/tests/auto/compilerwarnings/data}/test_cpp.txt (83%) - copy {qtqa/tests/auto/compilerwarnings => qtmultimedia/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) + qtqa/tests/auto/compilerwarnings/test_cpp.txt | 70 -------------------- + .../auto/compilerwarnings/tst_compilerwarnings.cpp | 57 +++++++++++++--- + .../tests/auto/compilerwarnings/data/test_cpp.txt | 56 ++++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ + .../tests/auto/compilerwarnings/data/test_cpp.txt | 52 +++++++++++++++ + 13 files changed, 535 insertions(+), 87 deletions(-) + create mode 100644 phonon/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qt3support/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qtbase/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt delete mode 100644 qtqa/tests/auto/compilerwarnings/compilerwarnings.qrc - copy {qtqa/tests/auto/compilerwarnings => qtscript/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) - copy {qtqa/tests/auto/compilerwarnings => qtsvg/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) - copy {qtqa/tests/auto/compilerwarnings => qttools/tests/auto/compilerwarnings/data}/test_cpp.txt (82%) - rename {qtqa/tests/auto/compilerwarnings => qtxmlpatterns/tests/auto/compilerwarnings/data}/test_cpp.txt (81%) + delete mode 100644 qtqa/tests/auto/compilerwarnings/test_cpp.txt + create mode 100644 qtscript/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qttools/tests/auto/compilerwarnings/data/test_cpp.txt + create mode 100644 qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to phonon/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..775619a 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt +diff --git a/phonon/tests/auto/compilerwarnings/data/test_cpp.txt b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..775619a +--- /dev/null +++ b/phonon/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,13 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifndef QT_NO_PHONON +#include <phonon/phonon> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qt3support/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..1c52f27 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..1c52f27 +--- /dev/null +++ b/qt3support/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,13 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifdef QT3_SUPPORT +#include <Qt3Support/Qt3Support> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 96% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtbase/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..9b8d11c 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt b/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..9b8d11c +--- /dev/null +++ b/qtbase/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -44,22 +44,22 @@ - #include <QtNetwork/QtNetwork> - #include <QtXml/QtXml> - #include <QtSql/QtSql> +@@ -0,0 +1,69 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ ++#include <QtCore/QtCore> ++#include <QtNetwork/QtNetwork> ++#include <QtXml/QtXml> ++#include <QtSql/QtSql> + +#ifndef QT_NO_GUI - #include <QtGui/QtGui> ++#include <QtGui/QtGui> +#endif - - #ifndef QT_NO_OPENGL - #include <QtOpenGL/QtOpenGL> - #endif - --#include <QtDesigner/QtDesigner> -- - #include <QtTest/QtTest> - - #if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) - #include <QtDBus/QtDBus> - #endif - --#include <QtDeclarative/QtDeclarative> -- ++ ++#ifndef QT_NO_OPENGL ++#include <QtOpenGL/QtOpenGL> ++#endif ++ ++#include <QtTest/QtTest> ++ ++#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) ++#include <QtDBus/QtDBus> ++#endif ++ +#include <QtUiTools/QtUiTools> - - #ifndef Q_OS_MAC - int main(int, char **) -@@ -67,4 +67,3 @@ int main(int, char **) - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 83% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..a3d65db 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt b/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..a3d65db +--- /dev/null +++ b/qtdeclarative/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -39,27 +39,9 @@ - ** - ****************************************************************************/ - -- --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> --#endif -- +@@ -0,0 +1,51 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ +#ifndef QT_NO_DECLARATIVE - #include <QtDeclarative/QtDeclarative> -- ++#include <QtDeclarative/QtDeclarative> +#endif - - #ifndef Q_OS_MAC - int main(int, char **) -@@ -67,4 +49,3 @@ int main(int, char **) - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..3e33574 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..3e33574 +--- /dev/null +++ b/qtmultimedia/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,13 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifndef QT_NO_MULTIMEDIA +#include <QtMultimedia/QtMultimedia> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif diff --git a/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro b/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro index beb0279..301834c 100644 --- a/qtqa/tests/auto/compilerwarnings/compilerwarnings.pro @@ -253,6 +357,82 @@ index 3fa313c..0000000 - <file>test_cpp.txt</file> - </qresource> - </RCC> +diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtqa/tests/auto/compilerwarnings/test_cpp.txt +deleted file mode 100644 +index d27e972..0000000 +--- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++++ /dev/null +@@ -1,70 +0,0 @@ +-/**************************************************************************** +-** +-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +-** All rights reserved. +-** Contact: Nokia Corporation (qt-info@nokia.com) +-** +-** This file is part of the test suite of the Qt Toolkit. +-** +-** $QT_BEGIN_LICENSE:LGPL$ +-** No Commercial Usage +-** This file contains pre-release code and may not be distributed. +-** You may use this file in accordance with the terms and conditions +-** contained in the Technology Preview License Agreement accompanying +-** this package. +-** +-** GNU Lesser General Public License Usage +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** +-** In addition, as a special exception, Nokia gives you certain additional +-** rights. These rights are described in the Nokia Qt LGPL Exception +-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +-** +-** If you have questions regarding the use of this file, please contact +-** Nokia at qt-info@nokia.com. +-** +-** +-** +-** +-** +-** +-** +-** +-** $QT_END_LICENSE$ +-** +-****************************************************************************/ +- +- +-#include <QtCore/QtCore> +-#include <QtNetwork/QtNetwork> +-#include <QtXml/QtXml> +-#include <QtSql/QtSql> +-#include <QtGui/QtGui> +- +-#ifndef QT_NO_OPENGL +-#include <QtOpenGL/QtOpenGL> +-#endif +- +-#include <QtDesigner/QtDesigner> +- +-#include <QtTest/QtTest> +- +-#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) +-#include <QtDBus/QtDBus> +-#endif +- +-#include <QtDeclarative/QtDeclarative> +- +- +-#ifndef Q_OS_MAC +-int main(int, char **) +-{ +- return 0; +-} +-#endif +- diff --git a/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp index b518e20..d33ad6e 100644 --- a/qtqa/tests/auto/compilerwarnings/tst_compilerwarnings.cpp @@ -406,172 +586,242 @@ index b518e20..d33ad6e 100644 << "-c" << "-woff" << "3303" // const qualifier on return << "-o" << tmpFile -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtscript/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..c5c5933 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt +diff --git a/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..c5c5933 +--- /dev/null +++ b/qtscript/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,17 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> +@@ -0,0 +1,56 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifndef QT_NO_SCRIPT +#include <QtScript/QtScript> - #endif - --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> ++#endif ++ +#ifndef QT_NO_SCRIPTTOOLS +#include <QtScriptTools/QtScriptTools> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..4ac69de 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..4ac69de +--- /dev/null +++ b/qtsvg/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,13 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifndef QT_NO_SVG +#include <QtSvg/QtSvg> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 82% -copy from qtqa/tests/auto/compilerwarnings/test_cpp.txt -copy to qttools/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..5e0cbf3 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qttools/tests/auto/compilerwarnings/data/test_cpp.txt b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..5e0cbf3 +--- /dev/null +++ b/qttools/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,26 +40,9 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- - #include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> --#endif -- --#include <QtDeclarative/QtDeclarative> -- +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ ++#include <QtDesigner/QtDesigner> +#include <QtHelp/QtHelp> +//#include <QtCLucene/QtCLucene> - - #ifndef Q_OS_MAC - int main(int, char **) -@@ -67,4 +50,3 @@ int main(int, char **) - return 0; - } - #endif -- -diff --git a/qtqa/tests/auto/compilerwarnings/test_cpp.txt b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt -similarity index 81% -rename from qtqa/tests/auto/compilerwarnings/test_cpp.txt -rename to qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt -index d27e972..77fa9ba 100644 ---- a/qtqa/tests/auto/compilerwarnings/test_cpp.txt ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif +diff --git a/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt +new file mode 100644 +index 0000000..77fa9ba +--- /dev/null +++ b/qtxmlpatterns/tests/auto/compilerwarnings/data/test_cpp.txt -@@ -40,31 +40,13 @@ - ****************************************************************************/ - - --#include <QtCore/QtCore> --#include <QtNetwork/QtNetwork> --#include <QtXml/QtXml> --#include <QtSql/QtSql> --#include <QtGui/QtGui> -- --#ifndef QT_NO_OPENGL --#include <QtOpenGL/QtOpenGL> --#endif -- --#include <QtDesigner/QtDesigner> -- --#include <QtTest/QtTest> -- --#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) --#include <QtDBus/QtDBus> +@@ -0,0 +1,52 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ++** All rights reserved. ++** Contact: Nokia Corporation (qt-info@nokia.com) ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** No Commercial Usage ++** This file contains pre-release code and may not be distributed. ++** You may use this file in accordance with the terms and conditions ++** contained in the Technology Preview License Agreement accompanying ++** this package. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** ++** In addition, as a special exception, Nokia gives you certain additional ++** rights. These rights are described in the Nokia Qt LGPL Exception ++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ++** ++** If you have questions regarding the use of this file, please contact ++** Nokia at qt-info@nokia.com. ++** ++** ++** ++** ++** ++** ++** ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++ +#ifndef QT_NO_XMLPATTERNS +#include <QtXmlPatterns/QtXmlPatterns> - #endif - --#include <QtDeclarative/QtDeclarative> -- -- - #ifndef Q_OS_MAC - int main(int, char **) - { - return 0; - } - #endif -- ++#endif ++ ++#ifndef Q_OS_MAC ++int main(int, char **) ++{ ++ return 0; ++} ++#endif -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0105-Add-tst_headersclean-for-each-module.patch b/patches/0105-Add-tst_headersclean-for-each-module.patch index ecdd79d..6aae488 100644 --- a/patches/0105-Add-tst_headersclean-for-each-module.patch +++ b/patches/0105-Add-tst_headersclean-for-each-module.patch @@ -1,4 +1,4 @@ -From 9d4104a7a2f5d92dea85808f2e4017436431a726 Mon Sep 17 00:00:00 2001 +From 8fd6e206a6fd913e78c1343a0f5d52cbd2d0ceb8 Mon Sep 17 00:00:00 2001 From: Liang Qi <liang.qi@nokia.com> Date: Fri, 25 Mar 2011 10:32:15 +0100 Subject: [PATCH] Add tst_headersclean for each module @@ -7,65 +7,65 @@ Subject: [PATCH] Add tst_headersclean for each module qt3support/tests/auto/auto.pro | 1 + .../tests/auto/headersclean/headersclean.pro | 5 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - .../auto.pro => qt3support/tests/auto/host.pro | 2 +- + qt3support/tests/auto/host.pro | 4 + qtbase/tests/auto/headersclean/headersclean.pro | 7 ++ .../tests/auto/headersclean/tst_headersclean.cpp | 79 ++++++++++++++++++++ qtbase/tests/auto/host.pro | 1 + qtdeclarative/tests/auto/auto.pro | 1 + .../tests/auto/headersclean/headersclean.pro | 5 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - qtdeclarative/tests/auto/{auto.pro => host.pro} | 2 +- + qtdeclarative/tests/auto/host.pro | 4 + qtmultimedia/tests/auto/auto.pro | 2 +- .../tests/auto/headersclean/headersclean.pro | 4 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - .../auto.pro => qtmultimedia/tests/auto/host.pro | 2 +- + qtmultimedia/tests/auto/host.pro | 4 + qtphonon/tests/auto/auto.pro | 1 + qtphonon/tests/auto/headersclean/headersclean.pro | 5 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - .../auto/auto.pro => qtphonon/tests/auto/host.pro | 2 +- + qtphonon/tests/auto/host.pro | 4 + qtscript/tests/auto/auto.pro | 2 +- qtscript/tests/auto/headersclean/headersclean.pro | 6 ++ .../tests/auto/headersclean/tst_headersclean.cpp | 63 ++++++++++++++++ - .../auto/auto.pro => qtscript/tests/auto/host.pro | 2 +- + qtscript/tests/auto/host.pro | 4 + qtsvg/tests/auto/auto.pro | 1 + qtsvg/tests/auto/headersclean/headersclean.pro | 5 + qtsvg/tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - .../auto/auto.pro => qtsvg/tests/auto/host.pro | 2 +- + qtsvg/tests/auto/host.pro | 4 + qttools/tests/auto/auto.pro | 1 + qttools/tests/auto/headersclean/headersclean.pro | 4 + .../tests/auto/headersclean/tst_headersclean.cpp | 63 ++++++++++++++++ - .../auto/auto.pro => qttools/tests/auto/host.pro | 2 +- + qttools/tests/auto/host.pro | 4 + qtxmlpatterns/tests/auto/auto.pro | 1 + .../tests/auto/headersclean/headersclean.pro | 5 + .../tests/auto/headersclean/tst_headersclean.cpp | 62 +++++++++++++++ - .../auto.pro => qtxmlpatterns/tests/auto/host.pro | 2 +- - 35 files changed, 640 insertions(+), 10 deletions(-) + qtxmlpatterns/tests/auto/host.pro | 4 + + 35 files changed, 664 insertions(+), 2 deletions(-) create mode 100644 qt3support/tests/auto/headersclean/headersclean.pro create mode 100644 qt3support/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qt3support/tests/auto/host.pro (51%) + create mode 100644 qt3support/tests/auto/host.pro create mode 100644 qtbase/tests/auto/headersclean/headersclean.pro create mode 100644 qtbase/tests/auto/headersclean/tst_headersclean.cpp create mode 100644 qtdeclarative/tests/auto/headersclean/headersclean.pro create mode 100644 qtdeclarative/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/{auto.pro => host.pro} (51%) + create mode 100644 qtdeclarative/tests/auto/host.pro create mode 100644 qtmultimedia/tests/auto/headersclean/headersclean.pro create mode 100644 qtmultimedia/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qtmultimedia/tests/auto/host.pro (51%) + create mode 100644 qtmultimedia/tests/auto/host.pro create mode 100644 qtphonon/tests/auto/headersclean/headersclean.pro create mode 100644 qtphonon/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qtphonon/tests/auto/host.pro (51%) + create mode 100644 qtphonon/tests/auto/host.pro create mode 100644 qtscript/tests/auto/headersclean/headersclean.pro create mode 100644 qtscript/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qtscript/tests/auto/host.pro (51%) + create mode 100644 qtscript/tests/auto/host.pro create mode 100644 qtsvg/tests/auto/headersclean/headersclean.pro create mode 100644 qtsvg/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qtsvg/tests/auto/host.pro (51%) + create mode 100644 qtsvg/tests/auto/host.pro create mode 100644 qttools/tests/auto/headersclean/headersclean.pro create mode 100644 qttools/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qttools/tests/auto/host.pro (51%) + create mode 100644 qttools/tests/auto/host.pro create mode 100644 qtxmlpatterns/tests/auto/headersclean/headersclean.pro create mode 100644 qtxmlpatterns/tests/auto/headersclean/tst_headersclean.cpp - copy qtdeclarative/tests/auto/auto.pro => qtxmlpatterns/tests/auto/host.pro (51%) + create mode 100644 qtxmlpatterns/tests/auto/host.pro diff --git a/qt3support/tests/auto/auto.pro b/qt3support/tests/auto/auto.pro index 83fe8e3..b576bb4 100644 @@ -157,19 +157,16 @@ index 0000000..c114740 +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" \ No newline at end of file -diff --git a/qtdeclarative/tests/auto/auto.pro b/qt3support/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qt3support/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qt3support/tests/auto/host.pro b/qt3support/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qt3support/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtbase/tests/auto/headersclean/headersclean.pro b/qtbase/tests/auto/headersclean/headersclean.pro new file mode 100644 index 0000000..d9b6ae3 @@ -370,19 +367,16 @@ index 0000000..68bc9d7 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtdeclarative/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtdeclarative/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtdeclarative/tests/auto/host.pro b/qtdeclarative/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtdeclarative/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtmultimedia/tests/auto/auto.pro b/qtmultimedia/tests/auto/auto.pro index 0a89f53..1a4210c 100644 --- a/qtmultimedia/tests/auto/auto.pro @@ -471,19 +465,16 @@ index 0000000..5a61a86 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtmultimedia/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtmultimedia/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtmultimedia/tests/auto/host.pro b/qtmultimedia/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtmultimedia/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtphonon/tests/auto/auto.pro b/qtphonon/tests/auto/auto.pro index ef6bdf4..ba475cb 100644 --- a/qtphonon/tests/auto/auto.pro @@ -572,19 +563,16 @@ index 0000000..cca8928 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtphonon/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtphonon/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtphonon/tests/auto/host.pro b/qtphonon/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtphonon/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtscript/tests/auto/auto.pro b/qtscript/tests/auto/auto.pro index c4d0544..2cfdcfd 100644 --- a/qtscript/tests/auto/auto.pro @@ -676,19 +664,16 @@ index 0000000..a8e64b4 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtscript/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtscript/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtscript/tests/auto/host.pro b/qtscript/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtscript/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtsvg/tests/auto/auto.pro b/qtsvg/tests/auto/auto.pro index cb3cccb..9a7e229 100644 --- a/qtsvg/tests/auto/auto.pro @@ -777,19 +762,16 @@ index 0000000..ef12064 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtsvg/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtsvg/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtsvg/tests/auto/host.pro b/qtsvg/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtsvg/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qttools/tests/auto/auto.pro b/qttools/tests/auto/auto.pro index c1e3bd1..49c179f 100644 --- a/qttools/tests/auto/auto.pro @@ -878,19 +860,16 @@ index 0000000..77ca939 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qttools/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qttools/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qttools/tests/auto/host.pro b/qttools/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qttools/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ diff --git a/qtxmlpatterns/tests/auto/auto.pro b/qtxmlpatterns/tests/auto/auto.pro index b9244d6..accf5ac 100644 --- a/qtxmlpatterns/tests/auto/auto.pro @@ -979,19 +958,16 @@ index 0000000..0a21174 + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc" -diff --git a/qtdeclarative/tests/auto/auto.pro b/qtxmlpatterns/tests/auto/host.pro -similarity index 51% -copy from qtdeclarative/tests/auto/auto.pro -copy to qtxmlpatterns/tests/auto/host.pro -index f2173f0..6bc8753 100644 ---- a/qtdeclarative/tests/auto/auto.pro +diff --git a/qtxmlpatterns/tests/auto/host.pro b/qtxmlpatterns/tests/auto/host.pro +new file mode 100644 +index 0000000..6bc8753 +--- /dev/null +++ b/qtxmlpatterns/tests/auto/host.pro -@@ -1,4 +1,4 @@ - TEMPLATE=subdirs - SUBDIRS=\ -- declarative \ +@@ -0,0 +1,4 @@ ++TEMPLATE=subdirs ++SUBDIRS=\ + headersclean \ - ++ -- -1.7.3.2.343.g7d43d +1.7.3.4 diff --git a/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch index 58823cc..9534645 100644 --- a/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch +++ b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch @@ -1,8 +1,7 @@ -From dc82cb52f2512120a98ba775a0b4b300f28372cd Mon Sep 17 00:00:00 2001 +From 90f07c3a74b7a0027e6441b6040ee9de51daa40f Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Fri, 1 Apr 2011 11:21:36 +0200 -Subject: [PATCH] Switched to more explicit signal/slot definitions - (Q_SIGNALS/SLOTS). +Subject: [PATCH] Switched to more explicit signal/slot definitions (Q_SIGNALS/SLOTS). This is required for public headers. --- @@ -116,5 +115,5 @@ index 27949ec..62c885c 100644 void tick(qint64); void seekableChanged(bool); -- -1.7.5.rc2.4.g4d8b3 +1.7.3.4 |