diff options
359 files changed, 3228 insertions, 868 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..5b4d2f2440 --- /dev/null +++ b/.gitignore @@ -0,0 +1,261 @@ +# This file is used to ignore files which are generated in the Qt build system +# ---------------------------------------------------------------------------- + +examples/*/*/* +!examples/*/*/*[.]* +!examples/*/*/README +examples/*/*/*[.]app +!examples/declarative/* +!examples/tutorials/* +!examples/tutorials/*/* +!examples/ja_JP/*/* +demos/*/* +!demos/spectrum/* +demos/spectrum/bin +!demos/*/*[.]* +demos/*/*[.]app +!demos/declarative/* +config.tests/*/*/* +!config.tests/*/*/*[.]* +config.tests/*/*/*[.]app + +callgrind.out.* +pcviewer.cfg +*~ +*.a +*.la +*.core +*.moc +*.o +*.obj +*.orig +*.swp +*.rej +*.so +*.pbxuser +*.mode1 +*.mode1v3 +*_pch.h.cpp +*_resource.rc +.#* +*.*# +core +.qmake.cache +.qmake.vars +*.prl +tags +.DS_Store +*.debug +Makefile* +!qmake/Makefile.win32* +!qmake/Makefile.unix +*.prl +*.app +*.pro.user +*.qmlproject.user +*.gcov +bin/Qt*.dll +bin/assistant* +bin/designer* +bin/dumpcpp* +bin/idc* +bin/linguist* +bin/lrelease* +bin/lupdate* +bin/lconvert* +bin/moc* +bin/makeqpf* +bin/pixeltool* +bin/qmake* +bin/qdoc3* +bin/qt3to4* +bin/qtdemo* +bin/qttracereplay* +bin/rcc* +bin/uic* +bin/patternist* +bin/phonon* +bin/qcollectiongenerator* +bin/qdbus* +bin/qhelpconverter* +bin/qhelpgenerator* +bin/qtconfig* +bin/xmlpatterns* +bin/cetest* +bin/collectiongenerator +bin/helpconverter +bin/helpgenerator +bin/kmap2qmap* +bin/qlalr* +bin/qmlconv* +bin/qmldebugger* +bin/qml* +bin/qttracereplay* +configure.cache +config.status +mkspecs/default +mkspecs/qconfig.pri +moc_*.cpp +qmake/qmake.exe +qmake/Makefile.bak +src/corelib/global/qconfig.cpp +src/corelib/global/qconfig.h +src/corelib/global/qconfig.h.qmake +ui_*.h +tests/auto/qprocess/test*/*.exe +tests/auto/qtcpsocket/stressTest/*.exe +tests/auto/qprocess/fileWriterProcess/*.exe +tests/auto/qmake/testdata/quotedfilenames/*.exe +tests/auto/compilerwarnings/*.exe +tests/auto/qmake/testdata/quotedfilenames/test.cpp +tests/auto/qprocess/fileWriterProcess.txt +.com.apple.timemachine.supported +tests/auto/qlibrary/libmylib.so* +tests/auto/qresourceengine/runtime_resource.rcc +tools/qtestlib/chart/chart* +tools/qtestlib/updater/updater* +tools/activeqt/testcon/testcon.tlb +translations/*.qm +translations/*_untranslated.ts +qrc_*.cpp + +# Test generated files +QObject.log +tst_* +!tst_*.* +tst_*.log +tst_*.debug +tst_*~ + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.vcxproj +*.vcxproj.filters +*.vcxproj.user + +# MinGW generated files +*.Debug +*.Release + +# WebKit temp files +src/3rdparty/webkit/WebCore/mocinclude.tmp +src/3rdparty/webkit/includes.txt +src/3rdparty/webkit/includes2.txt + +# Symlinks generated by configure +tools/qvfb/qvfbhdr.h +tools/qvfb/qlock_p.h +tools/qvfb/qlock.cpp +tools/qvfb/qwssignalhandler.cpp +tools/qvfb/qwssignalhandler_p.h +.DS_Store +.pch +.rcc +*.app +config.status +config.tests/unix/cups/cups +config.tests/unix/getaddrinfo/getaddrinfo +config.tests/unix/getifaddrs/getifaddrs +config.tests/unix/iconv/iconv +config.tests/unix/ipv6/ipv6 +config.tests/unix/ipv6ifname/ipv6ifname +config.tests/unix/largefile/largefile +config.tests/unix/nis/nis +config.tests/unix/odbc/odbc +config.tests/unix/openssl/openssl +config.tests/unix/stl/stl +config.tests/unix/zlib/zlib +config.tests/unix/3dnow/3dnow +config.tests/unix/mmx/mmx +config.tests/unix/sse/sse +config.tests/unix/sse2/sse2 + + + +# Directories to ignore +# --------------------- + +debug +examples/tools/plugandpaint/plugins +include/* +include/*/* +lib/* +!lib/fonts +!lib/README +plugins/*/* +release +tmp +doc-build +doc/html/* +doc/qch +doc-build +.rcc +.pch +.metadata + +# Symbian build system generated files +# --------------------- + +ABLD.BAT +bld.inf* +*.mmp +*.mk +*.rss +*.loc +!s60main.rss +*.pkg +plugin_commonu.def +*.qtplugin +*.sis +*.sisx +*.lst +*.exe +*.mif +*.rsc +*.sym +*.lib + +# runonphone crash dumps +d_exc_*.txt +d_exc_*.stk + +# Generated by abldfast.bat from devtools. +.abldsteps.* + +# Carbide project files +# --------------------- +.project +.cproject +.make.cache +*.d + +qtc-debugging-helper +src/corelib/lib +src/network/lib +src/xml/lib/ + +.pc/ + +# INTEGRITY generated files +*.gpj +*.int +*.ael +*.dla +*.dnm +*.dep +*.map +work diff --git a/bin/syncqt b/bin/syncqt index b25a432d56..45ac9d0fb0 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -12,55 +12,30 @@ use File::Basename; use File::Path; use Cwd; +use Cwd 'abs_path'; use Config; use strict; -for (my $i = 0; $i < $#ARGV; $i++) { - if ($ARGV[$i] eq "-base-dir" && $i < $#ARGV - 1) { - $ENV{"QTDIR"} = $ARGV[$i + 1]; - last; - } -} +# set output basedir to be where ever syncqt is run from +our $out_basedir = getcwd(); +$out_basedir =~ s=\\=/=g; +our $basedir; +our $quoted_basedir; -die "syncqt: QTDIR not defined" if ! $ENV{"QTDIR"}; # sanity check -# global variables -my $isunix = 0; -my $basedir = $ENV{"QTDIR"}; -$basedir =~ s=\\=/=g; -my %modules = ( # path to module name map - "QtGui" => "$basedir/src/gui", - "QtOpenGL" => "$basedir/src/opengl", - "QtOpenVG" => "$basedir/src/openvg", - "QtCore" => "$basedir/src/corelib", - "QtXml" => "$basedir/src/xml", - "QtXmlPatterns" => "$basedir/src/xmlpatterns", - "QtSql" => "$basedir/src/sql", - "QtNetwork" => "$basedir/src/network", - "QtSvg" => "$basedir/src/svg", - "QtDeclarative" => "$basedir/src/declarative", - "QtScript" => "$basedir/src/script", - "QtScriptTools" => "$basedir/src/scripttools", - "Qt3Support" => "$basedir/src/qt3support", - "ActiveQt" => "$basedir/src/activeqt", - "QtTest" => "$basedir/src/testlib", - "QtHelp" => "$basedir/tools/assistant/lib", - "QtDesigner" => "$basedir/tools/designer/src/lib", - "QtUiTools" => "$basedir/tools/designer/src/uitools", - "QtDBus" => "$basedir/src/dbus", - "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore", - "phonon" => "$basedir/src/phonon", - "QtMultimedia" => "$basedir/src/multimedia", - "QtMeeGoGraphicsSystemHelper" => "$basedir/tools/qmeegographicssystemhelper", -); -my %moduleheaders = ( # restrict the module headers to those found in relative path - "QtWebKit" => "../WebKit/qt/Api", - "phonon" => "../3rdparty/phonon/phonon", -); - -#$modules{"QtCore"} .= ";$basedir/mkspecs/" . $ENV{"MKSPEC"} if defined $ENV{"MKSPEC"}; +# try to figure out where QtBase is located +# normally the script location should be enough, if not fall back to +# QTDIR environment variable. If that doesn't work, later ask the +# user to use the -qtdir option explicitly. +my $qtbasedir = dirname(dirname($0)); +$qtbasedir = $ENV{"QTDIR"} if ($qtbasedir !~ /qtbase/); +$qtbasedir =~ s=\\=/=g if (defined $qtbasedir); + +# will be defined based on the modules sync.profile +our (%modules, %moduleheaders, %classnames, %mastercontent, %modulepris); # global variables (modified by options) +my $isunix = 0; my $module = 0; my $showonly = 0; my $quiet = 0; @@ -69,13 +44,12 @@ my $force_win = 0; my $force_relative = 0; my $check_includes = 0; my $copy_headers = 0; -my $create_uic_class_map = 1; +my $create_uic_class_map = 0; my $create_private_headers = 1; +my $no_module_fwd = 0; my @modules_to_sync ; $force_relative = 1 if ( -d "/System/Library/Frameworks" ); -my $out_basedir = $basedir; -$out_basedir =~ s=\\=/=g; -my $quoted_basedir = "\Q$basedir"; + # functions ---------------------------------------------------------- @@ -89,14 +63,20 @@ my $quoted_basedir = "\Q$basedir"; sub showUsage { print "$0 usage:\n"; + print " <module directory> Specifies which module to sync header files for (required for shadow builds!)\n\n"; + print " -copy Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n"; print " -remove-stale Removes stale headers (default: " . ($remove_stale ? "yes" : "no") . ")\n"; print " -relative Force relative symlinks (default: " . ($force_relative ? "yes" : "no") . ")\n"; print " -windows Force platform to Windows (default: " . ($force_win ? "yes" : "no") . ")\n"; print " -showonly Show action but not perform (default: " . ($showonly ? "yes" : "no") . ")\n"; print " -outdir <PATH> Specify output directory for sync (default: $out_basedir)\n"; + print " -qtdir <PATH> Set the path to QtBase (detected: " . (defined $qtbasedir ? $qtbasedir : "-none-") . ")\n"; print " -quiet Only report problems, not activity (default: " . ($quiet ? "yes" : "no") . ")\n"; - print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR> Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; + print " -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n"; + print " Create headers for <NAME> with original headers in <HEADERDIR> relative to <PROFILEDIR> \n"; + print " -private Force copy private headers (default: " . ($create_private_headers ? "yes" : "no") . ")\n"; + print " -no-module-fwd Don't create fwd includes for module pri files\n"; print " -help This help\n"; exit 0; } @@ -169,37 +149,9 @@ sub shouldMasterInclude { sub classNames { my @ret; my ($iheader) = @_; - if(basename($iheader) eq "qglobal.h") { - push @ret, "QtGlobal"; - } elsif(basename($iheader) eq "qendian.h") { - push @ret, "QtEndian"; - } elsif(basename($iheader) eq "qconfig.h") { - push @ret, "QtConfig"; - } elsif(basename($iheader) eq "qplugin.h") { - push @ret, "QtPlugin"; - } elsif(basename($iheader) eq "qalgorithms.h") { - push @ret, "QtAlgorithms"; - } elsif(basename($iheader) eq "qcontainerfwd.h") { - push @ret, "QtContainerFwd"; - } elsif(basename($iheader) eq "qdebug.h") { - push @ret, "QtDebug"; - } elsif(basename($iheader) eq "qevent.h") { - push @ret, "QtEvents"; - } elsif(basename($iheader) eq "qnamespace.h") { - push @ret, "Qt" - } elsif(basename($iheader) eq "qssl.h") { - push @ret, "QSsl"; - } elsif(basename($iheader) eq "qtest.h") { - push @ret, "QTest" - } elsif(basename($iheader) eq "qtconcurrentmap.h") { - push @ret, "QtConcurrentMap" - } elsif(basename($iheader) eq "qtconcurrentfilter.h") { - push @ret, "QtConcurrentFilter" - } elsif(basename($iheader) eq "qtconcurrentrun.h") { - push @ret, "QtConcurrentRun" - } elsif(basename($iheader) eq "qaudio.h") { - push @ret, "QAudio" - } + + my $classname = $classnames{basename($iheader)}; + push @ret, $classname if ($classname); my $parsable = ""; if(open(F, "<$iheader")) { @@ -353,7 +305,6 @@ sub syncHeader { ###################################################################### sub fixPaths { my ($file, $dir) = @_; - $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir)); $file =~ s=\\=/=g; $dir =~ s=\\=/=g; @@ -374,6 +325,8 @@ sub fixPaths { return basename($file) if($file_dir eq $dir); #guts + while ($file_dir =~ s,/[^/]+/\.\./,/,) {} + while ($dir =~ s,/[^/]+/\.\./,/,) {} my $match_dir = 0; for(my $i = 1; $i < length($file_dir); $i++) { my $slash = index($file_dir, "/", $i); @@ -562,6 +515,52 @@ sub findFiles { return @files; } +###################################################################### +# Syntax: loadSyncProfile() +# +# Purpose: Locates the sync.profile. +# Returns: Hashmap of module name -> directory. +###################################################################### +sub loadSyncProfile { + my ($srcbase, $outbase) = @_; + print("srcbase = $$srcbase \n"); + print("outbase = $$outbase \n"); + + my $syncprofile = "$$srcbase/sync.profile"; + my $result; + unless ($result = do "$syncprofile") { + die "syncqt couldn't parse $syncprofile: $@" if $@; + die "syncqt couldn't execute $syncprofile: $!" unless defined $result; + } + return $result; +} + +sub locateSyncProfile +{ + my ($directory) = @_; + my $syncprofile; + $directory = abs_path($directory); + while(!defined $syncprofile) { + local(*D); + if (opendir(D, $directory)) { + foreach my $file (sort readdir(D)) { + next if ($file =~ /^\.\.?$/); + $syncprofile = "$directory/$file" if ($file =~ /^sync\.profile$/); + last if (defined $syncprofile); + } + closedir(D); + } + last if (defined $syncprofile || $directory eq "/" || $directory =~ /^?:[\/\\]$/); + $directory = dirname($directory); + } + return $syncprofile; +} + +# check if this is an in-source build, and if so use that as the basedir too +$basedir = locateSyncProfile($out_basedir); +$basedir = dirname($basedir) if ($basedir); +$quoted_basedir = "\Q$basedir"; + # -------------------------------------------------------------------- # "main" function # -------------------------------------------------------------------- @@ -572,7 +571,7 @@ while ( @ARGV ) { #parse my $arg = shift @ARGV; - if ($arg eq "-h" || $arg eq "-help" || $arg eq "?") { + if ($arg eq "-h" || $arg eq "-help" || $arg eq "-?" || $arg eq "?") { $var = "show_help"; $val = "yes"; } elsif($arg eq "-copy") { @@ -604,10 +603,28 @@ while ( @ARGV ) { } elsif($arg eq "-quiet") { $var = "quiet"; $val = "yes"; + } elsif($arg eq "-private") { + $var = "create_private_headers"; + $val = "yes"; + } elsif($arg eq "-qtdir") { + $var = "qtdir"; + $val = shift @ARGV; } elsif($arg eq "-base-dir") { # skip, it's been dealt with at the top of the file shift @ARGV; next; + } elsif($arg eq "-no-module-fwd") { + $var = "no_module_fwd"; + $val = "yes"; + } elsif($arg =~/^-/) { + print "Unknown option: $arg\n\n" if(!$var); + showUsage(); + } else { + $basedir = locateSyncProfile($arg); + die "Could not find a sync.profile for '$arg'\n" if (!$basedir); + $basedir = dirname($basedir); + $basedir =~ s=\\=/=g; + $var = "ignore"; } #do something @@ -666,7 +683,15 @@ while ( @ARGV ) { push @modules_to_sync, $module; $moduleheaders{$module} = $headerdir; $create_uic_class_map = 0; - $create_private_headers = 0; + } elsif ($var eq "qtdir") { + if($val) { + $qtbasedir = $val; + $qtbasedir =~ s=\\=/=g; + } else { + die "The -qtdir option requires an argument"; + } + } elsif ($var eq "no_module_fwd") { + $no_module_fwd = 1; } elsif ($var eq "output") { my $outdir = $val; if(checkRelative($outdir)) { @@ -680,6 +705,32 @@ while ( @ARGV ) { $out_basedir =~ s=\\=/=g; } } + +# if the $qtbasedir neither has 'qtbase' somewhere in its path, nor a +# '.qmake.cache' file in its directory, we assume it's not a valid path +# (remember that a yet-to-be-built qtbase doesn't have this file either, +# thus the 'qtbase' path check!) +die "Cannot automatically detect/use provided path to QtBase's build directory!\n" . + "QTDIR detected/provided: " . (defined $qtbasedir ? $qtbasedir : "-none-") . "\n" . + "Please -qtdir option to provide the correct path.\nsyncqt failed" + if (!defined $qtbasedir || (!-e "$qtbasedir/.qmake.cache" && $qtbasedir !~ /qtbase/)); + +# if we have no $basedir we cannot be sure which sources you want, so die +die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir); + +my @ignore_headers = (); +my $class_lib_map_contents = ""; +our @ignore_for_master_contents = (); +our @ignore_for_include_check = (); +our @ignore_for_qt_begin_header_check = (); +our @ignore_for_qt_begin_namespace_check = (); +our @ignore_for_qt_module_check = (); +my %colliding_headers = (); +my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir + +# load the module's sync.profile here, before we can +loadSyncProfile(\$basedir, \$out_basedir); + @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); $isunix = checkUnix; #cache checkUnix @@ -688,15 +739,6 @@ $isunix = checkUnix; #cache checkUnix mkpath "$out_basedir/include", !$quiet; mkpath "$out_basedir/include/Qt", !$quiet; -my @ignore_headers = (); -my $class_lib_map_contents = ""; -my @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); -my @ignore_for_include_check = ( "qatomic.h" ); -my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" ); -my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" ); -my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" ); -my %colliding_headers = (); -my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir foreach my $lib (@modules_to_sync) { #iteration info @@ -720,19 +762,8 @@ foreach my $lib (@modules_to_sync) { chomp $line; if($line =~ /^ *QT *\+?= *([^\r\n]*)/) { foreach(split(/ /, $1)) { - $master_contents .= "#include <QtCore/QtCore>\n" if($_ eq "core"); - $master_contents .= "#include <QtGui/QtGui>\n" if($_ eq "gui"); - $master_contents .= "#include <QtNetwork/QtNetwork>\n" if($_ eq "network"); - $master_contents .= "#include <QtSvg/QtSvg>\n" if($_ eq "svg"); - $master_contents .= "#include <QtDeclarative/QtDeclarative>\n" if($_ eq "declarative"); - $master_contents .= "#include <QtScript/QtScript>\n" if($_ eq "script"); - $master_contents .= "#include <QtScriptTools/QtScriptTools>\n" if($_ eq "scripttools"); - $master_contents .= "#include <Qt3Support/Qt3Support>\n" if($_ eq "qt3support"); - $master_contents .= "#include <QtSql/QtSql>\n" if($_ eq "sql"); - $master_contents .= "#include <QtXml/QtXml>\n" if($_ eq "xml"); - $master_contents .= "#include <QtXmlPatterns/QtXmlPatterns>\n" if($_ eq "xmlpatterns"); - $master_contents .= "#include <QtOpenGL/QtOpenGL>\n" if($_ eq "opengl"); - $master_contents .= "#include <QtOpenVG/QtOpenVG>\n" if($_ eq "openvg"); + my $content = $mastercontent{$_}; + $master_contents .= $content if ($content); } } } @@ -969,6 +1000,27 @@ foreach my $lib (@modules_to_sync) { print HEADERS_PRI_FILE $headers_pri_contents; close HEADERS_PRI_FILE; } + + # create forwarding module pri in qtbase/mkspecs/modules + unless ($no_module_fwd) { + my $modulepri = $modulepris{$lib}; + if (-e $modulepri) { + my $modulepriname = basename($modulepri); + my $moduleprifwd = "$qtbasedir/mkspecs/modules/$modulepriname"; + open MODULE_PRI_FILE, ">$moduleprifwd"; + print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n"; + print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $qtbasedir/bin\n"; + print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n"; + print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtbasedir/imports\n"; + print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtbasedir/lib\n"; + print MODULE_PRI_FILE "QT_MODULE_PLUGIN_BASE = $qtbasedir/plugins\n"; + print MODULE_PRI_FILE "include($modulepri)\n"; + close MODULE_PRI_FILE; + utime(time, (stat($modulepri))[9], $moduleprifwd); + } elsif ($modulepri) { + print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating forwarding pri for $lib.\n"; + } + } } } unless($showonly || !$create_uic_class_map) { diff --git a/bin/syncqt.bat b/bin/syncqt.bat index dd0da87f19..5167f3b4ab 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -38,5 +38,7 @@ :: $QT_END_LICENSE$ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@rem ***** This assumes PERL is in the PATH ***** -@perl.exe -S syncqt %* +@echo off +rem ***** This assumes PERL is in the PATH ***** +set scriptpath=%~dp0 +perl.exe %scriptpath%syncqt %* @@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto CFG_QWS_FREETYPE=auto CFG_LIBFREETYPE=auto CFG_SQL_AVAILABLE= -QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations" +QT_DEFAULT_BUILD_PARTS="libs examples demos" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_RELEASE_QMAKE=no @@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt" + echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"$relpath\" \"\$@\"" >>"$outpath/bin/syncqt" chmod 755 "$outpath/bin/syncqt" fi @@ -6959,12 +6958,13 @@ esac # enable Qt 3 support functionality if [ "$CFG_QT3SUPPORT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG qt3support" + QT_CONFIG="$QT_CONFIG gui-qt3support" fi # enable Phonon if [ "$CFG_PHONON" = "yes" ]; then - QT_CONFIG="$QT_CONFIG phonon" + # No longer needed after modularization + #QT_CONFIG="$QT_CONFIG phonon" if [ "$CFG_PHONON_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG phonon-backend" fi @@ -7539,17 +7539,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then elif [ "$CFG_EXCEPTIONS" = "no" ]; then CFG_XMLPATTERNS="no" fi -if [ "$CFG_XMLPATTERNS" = "yes" ]; then - QT_CONFIG="$QT_CONFIG xmlpatterns" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" -fi +# No longer needed after modularization +#if [ "$CFG_XMLPATTERNS" = "yes" ]; then +# QT_CONFIG="$QT_CONFIG xmlpatterns" +#else +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" +#fi -if [ "$CFG_MULTIMEDIA" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA" -else - QT_CONFIG="$QT_CONFIG multimedia" -fi +# No longer needed after modularization +#if [ "$CFG_MULTIMEDIA" = "no" ]; then +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA" +#else +# QT_CONFIG="$QT_CONFIG multimedia" +#fi if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG audio-backend" @@ -7575,26 +7577,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then fi if [ "$CFG_WEBKIT" != "no" ]; then - # This include takes care of adding "webkit" to QT_CONFIG. - cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri" + # No longer needed after modularization + #QT_CONFIG="$QT_CONFIG webkit" # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly. if [ "$CFG_WEBKIT" = "debug" ]; then QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" fi -else - rm -f "$outpath/mkspecs/modules/qt_webkit_version.pri" - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT" fi if [ "$CFG_SCRIPT" = "auto" ]; then CFG_SCRIPT="yes" fi -if [ "$CFG_SCRIPT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG script" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT" -fi +# No longer needed after modularization +#if [ "$CFG_SCRIPT" = "yes" ]; then +# QT_CONFIG="$QT_CONFIG script" +#else +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT" +#fi if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled." @@ -7613,11 +7613,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then CFG_SCRIPTTOOLS="no" fi -if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then - QT_CONFIG="$QT_CONFIG scripttools" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS" -fi +# No longer needed after modularization +#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then +# QT_CONFIG="$QT_CONFIG scripttools" +#else +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS" +#fi if [ "$CFG_DECLARATIVE" = "yes" ]; then @@ -7635,7 +7636,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then fi if [ "$CFG_DECLARATIVE" = "yes" ]; then - QT_CONFIG="$QT_CONFIG declarative" + # No longer needed after modularization + #QT_CONFIG="$QT_CONFIG declarative" if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL" fi @@ -8299,10 +8301,10 @@ else ln -s "$outpath/src/corelib/global/qconfig.h" "$conf" done fi + #------------------------------------------------------------------------------- # save configuration into qconfig.pri #------------------------------------------------------------------------------- - QTCONFIG="$outpath/mkspecs/qconfig.pri" QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend" [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp" @@ -8402,23 +8404,19 @@ else fi #------------------------------------------------------------------------------- -# save configuration into .qmake.cache +# save configuration into qmodule.pri #------------------------------------------------------------------------------- +QTMODULE="$outpath/mkspecs/qmodule.pri" -CACHEFILE="$outpath/.qmake.cache" -[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" -cat >>"$CACHEFILE.tmp" <<EOF -CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build +cat >>"$QTMODULE.tmp" <<EOF +#paths QT_SOURCE_TREE = \$\$quote($relpath) QT_BUILD_TREE = \$\$quote($outpath) QT_BUILD_PARTS = $CFG_BUILD_PARTS -QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE -QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include @@ -8428,65 +8426,86 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then - echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp" + echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp" fi if [ -n "$QT_CFLAGS_PSQL" ]; then - echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$CACHEFILE.tmp" + echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp" fi if [ -n "$QT_LFLAGS_PSQL" ]; then - echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" >> "$CACHEFILE.tmp" + echo "QT_LFLAGS_PSQL = $QT_LFLAGS_PSQL" >> "$QTMODULE.tmp" fi if [ -n "$QT_CFLAGS_MYSQL" ]; then - echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" >> "$CACHEFILE.tmp" + echo "QT_CFLAGS_MYSQL = $QT_CFLAGS_MYSQL" >> "$QTMODULE.tmp" fi if [ -n "$QT_LFLAGS_MYSQL" ]; then - echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" >> "$CACHEFILE.tmp" + echo "QT_LFLAGS_MYSQL = $QT_LFLAGS_MYSQL" >> "$QTMODULE.tmp" fi if [ -n "$QT_CFLAGS_SQLITE" ]; then - echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" >> "$CACHEFILE.tmp" + echo "QT_CFLAGS_SQLITE = $QT_CFLAGS_SQLITE" >> "$QTMODULE.tmp" fi if [ -n "$QT_LFLAGS_SQLITE" ]; then - echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp" + echo "QT_LFLAGS_SQLITE = $QT_LFLAGS_SQLITE" >> "$QTMODULE.tmp" fi if [ -n "$QT_LFLAGS_ODBC" ]; then - echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp" + echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$QTMODULE.tmp" fi if [ -n "$QT_LFLAGS_TDS" ]; then - echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp" + echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$QTMODULE.tmp" fi if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then - echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" + echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$QTMODULE.tmp" fi #dump in the OPENSSL_LIBS info if [ '!' -z "$OPENSSL_LIBS" ]; then - echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp" + echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$QTMODULE.tmp" elif [ "$CFG_OPENSSL" = "linked" ]; then - echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp" + echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$QTMODULE.tmp" fi #dump in the SDK info if [ '!' -z "$CFG_SDK" ]; then - echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$CACHEFILE.tmp" + echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$QTMODULE.tmp" fi # mac gcc -Xarch support if [ "$CFG_MAC_XARCH" = "no" ]; then - echo "QMAKE_MAC_XARCH = no" >> "$CACHEFILE.tmp" + echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp" fi #dump the qmake spec if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then - echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$CACHEFILE.tmp" + echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$QTMODULE.tmp" else - echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp" + echo "QMAKESPEC = $XPLATFORM" >> "$QTMODULE.tmp" fi # cmdline args -cat "$QMAKE_VARS_FILE" >> "$CACHEFILE.tmp" +cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp" rm -f "$QMAKE_VARS_FILE" 2>/dev/null +# replace qmodule.pri if it differs from the newly created temp file +if cmp -s "$QTMODULE.tmp" "$QTMODULE"; then + rm -f "$QTMODULE.tmp" +else + mv -f "$QTMODULE.tmp" "$QTMODULE" +fi + +#------------------------------------------------------------------------------- +# save configuration into .qmake.cache +#------------------------------------------------------------------------------- + +CACHEFILE="$outpath/.qmake.cache" +[ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" +cat >>"$CACHEFILE.tmp" <<EOF +include(\$\$PWD/mkspecs/qmodule.pri) +CONFIG += $QMAKE_CONFIG dylib create_prl link_prl depend_includepath fix_output_dirs QTDIR_build +QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE +QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc + +EOF + # incrementals INCREMENTAL="" [ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes" @@ -8820,11 +8839,11 @@ EXEC="" echo "Finding project files. Please wait..." if [ "$CFG_NOPROCESS" != "yes" ]; then - "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" - if [ -f "${relpath}/projects.pro" ]; then + "$outpath/bin/qmake" -prl -r "${relpath}/qtbase.pro" + if [ -f "${relpath}/qtbase.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" - QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/qtbase.pro" -o "$mkfile" fi fi diff --git a/configure.exe b/configure.exe Binary files differindex a1fceebf5b..e30778119a 100755..100644 --- a/configure.exe +++ b/configure.exe diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro index 4f869987b9..a3d6e30ad1 100644 --- a/demos/affine/affine.pro +++ b/demos/affine/affine.pro @@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg sources.path = $$[QT_INSTALL_DEMOS]/qtbase/affine INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/demos/books/books.pro b/demos/books/books.pro index ad4009035c..1588288f3e 100644 --- a/demos/books/books.pro +++ b/demos/books/books.pro @@ -13,7 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images sources.path = $$[QT_INSTALL_DEMOS]/qtbase/books INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro index 8ff2aa45f1..1e1a7de735 100644 --- a/demos/chip/chip.pro +++ b/demos/chip/chip.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images sources.path = $$[QT_INSTALL_DEMOS]/qtbase/chip INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro index bb5cac5dea..59b91126b9 100644 --- a/demos/composition/composition.pro +++ b/demos/composition/composition.pro @@ -17,7 +17,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/qtbase/composition INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo win32-msvc* { QMAKE_CXXFLAGS += /Zm500 diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro index ee15d2cc3e..3393b8e83c 100644 --- a/demos/deform/deform.pro +++ b/demos/deform/deform.pro @@ -20,5 +20,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63D - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/demos.pro b/demos/demos.pro index f1d5b009a8..81968fd61d 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -48,25 +48,18 @@ SUBDIRS += demos_boxes mac* && !qpa: SUBDIRS += demos_macmainwindow wince*|symbian|embedded|x11: SUBDIRS += demos_embedded -!contains(QT_EDITION, Console):!cross_compile:!embedded:!wince*:SUBDIRS += demos_arthurplugin - !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ -!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -wince*:SUBDIRS += demos_sqlbrowser +SUBDIRS += demos_sqlbrowser } } -contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer -contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser -contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative -contains(QT_CONFIG, multimedia):!static:SUBDIRS += demos_spectrum # install sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS] INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo demos_chip.subdir = chip demos_embeddeddialogs.subdir = embeddeddialogs @@ -89,20 +82,9 @@ demos_arthurplugin.subdir = arthurplugin demos_sqlbrowser.subdir = sqlbrowser demos_undo.subdir = undo demos_qtdemo.subdir = qtdemo -demos_mediaplayer.subdir = qmediaplayer -demos_declarative.subdir = declarative - -#mobile demos. Requires QtMobility sources. Not included in demo build -demos_guitartuner.subdir = mobile/guitartuner -demos_qcamera.subdir = mobile/qcamera -demos_qtbubblelevel.subdir = mobile/qtbubblelevel -demos_quickhit.subdir = mobile/quickhit - -demos_browser.subdir = browser demos_boxes.subdir = boxes demos_sub-attaq.subdir = sub-attaq -demos_spectrum.subdir = spectrum #CONFIG += ordered !ordered { diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro index 73309db9e5..7fa06fa90a 100644 --- a/demos/embedded/digiflip/digiflip.pro +++ b/demos/embedded/digiflip/digiflip.pro @@ -2,7 +2,7 @@ SOURCES = digiflip.cpp symbian { TARGET.UID3 = 0xA000CF72 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index efe3af5122..e9a448b1e3 100644 --- a/demos/embedded/embedded.pro +++ b/demos/embedded/embedded.pro @@ -1,32 +1,12 @@ TEMPLATE = subdirs SUBDIRS = styledemo raycasting flickable digiflip -contains(QT_CONFIG, svg) { - SUBDIRS += embeddedsvgviewer \ - desktopservices - fluidlauncher.subdir = fluidlauncher - fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo - !vxworks:!qnx:SUBDIRS += fluidlauncher -} - SUBDIRS += lightmaps SUBDIRS += flightinfo -contains(QT_CONFIG, svg) { - SUBDIRS += weatherinfo -} - -contains(QT_CONFIG, webkit) { - SUBDIRS += anomaly -} - -contains(QT_CONFIG, declarative) { - # Qml demos require DEPLOYMENT support. Therefore, only symbian. - symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter -} # install sources.files = README *.pro sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro index 0fa15d939f..6ee744bc63 100644 --- a/demos/embedded/flickable/flickable.pro +++ b/demos/embedded/flickable/flickable.pro @@ -3,7 +3,7 @@ HEADERS = flickable.h symbian { TARGET.UID3 = 0xA000CF73 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index c015fdf0af..a33423f543 100644 --- a/demos/embedded/flightinfo/flightinfo.pro +++ b/demos/embedded/flightinfo/flightinfo.pro @@ -7,7 +7,7 @@ QT += network symbian { TARGET.UID3 = 0xA000CF74 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices } diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index a792e60709..2751c3a647 100644 --- a/demos/embedded/lightmaps/lightmaps.pro +++ b/demos/embedded/lightmaps/lightmaps.pro @@ -10,7 +10,7 @@ QT += network symbian { TARGET.UID3 = 0xA000CF75 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro index bc1692a458..a4bb1826b9 100644 --- a/demos/embedded/raycasting/raycasting.pro +++ b/demos/embedded/raycasting/raycasting.pro @@ -4,7 +4,7 @@ RESOURCES += raycasting.qrc symbian { TARGET.UID3 = 0xA000CF76 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro index 81a45403ad..60700dd1df 100644 --- a/demos/embedded/styledemo/styledemo.pro +++ b/demos/embedded/styledemo/styledemo.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63F - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro index 7e403112aa..675a9889a2 100644 --- a/demos/embeddeddialogs/embeddeddialogs.pro +++ b/demos/embeddeddialogs/embeddeddialogs.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.ic sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embeddeddialogs INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro index ba8910351a..ed4120e01c 100644 --- a/demos/gradients/gradients.pro +++ b/demos/gradients/gradients.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html sources.path = $$[QT_INSTALL_DEMOS]/qtbase/gradients INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro index c69f7ba975..a497fbc407 100644 --- a/demos/interview/interview.pro +++ b/demos/interview/interview.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro index 1e9d513c0a..6da113d722 100644 --- a/demos/mainwindow/mainwindow.pro +++ b/demos/mainwindow/mainwindow.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro index dd95c72769..9bbf8a6f77 100644 --- a/demos/pathstroke/pathstroke.pro +++ b/demos/pathstroke/pathstroke.pro @@ -20,5 +20,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A63E - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro index 4fc3809be0..b2a338e7f3 100644 --- a/demos/shared/shared.pro +++ b/demos/shared/shared.pro @@ -34,5 +34,5 @@ INSTALLS += sources symbian { TARGET.UID3 = 0xA000A63C - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo } diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro index 8f414b8596..7179d98eba 100644 --- a/demos/spreadsheet/spreadsheet.pro +++ b/demos/spreadsheet/spreadsheet.pro @@ -31,4 +31,4 @@ sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS sources.path = $$[QT_INSTALL_DEMOS]/qtbase/spreadsheet INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro index 8b089d1ebd..dc6214622c 100644 --- a/demos/sqlbrowser/sqlbrowser.pro +++ b/demos/sqlbrowser/sqlbrowser.pro @@ -18,7 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$FORMS *.pro sources.path = $$[QT_INSTALL_DEMOS]/qtbase/sqlbrowser INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo wince*: { DEPLOYMENT_PLUGIN += qsqlite diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro index 129b8fb519..b37ac3036a 100644 --- a/demos/textedit/textedit.pro +++ b/demos/textedit/textedit.pro @@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro index ba647cb95d..84f1d7b326 100644 --- a/demos/undo/undo.pro +++ b/demos/undo/undo.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) +symbian: CONFIG += qt_demo diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/animation/animatedtiles/animatedtiles.pro index 66a54edc05..763357f8ec 100644 --- a/examples/animation/animatedtiles/animatedtiles.pro +++ b/examples/animation/animatedtiles/animatedtiles.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000D7D1 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro index d4599db840..65e2345165 100644 --- a/examples/animation/appchooser/appchooser.pro +++ b/examples/animation/appchooser/appchooser.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3F5 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/animation/easing/easing.pro b/examples/animation/easing/easing.pro index 4715f2c826..3a10004022 100644 --- a/examples/animation/easing/easing.pro +++ b/examples/animation/easing/easing.pro @@ -15,5 +15,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3F6 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/animation/moveblocks/moveblocks.pro index 6451b67886..b9c8542f4f 100644 --- a/examples/animation/moveblocks/moveblocks.pro +++ b/examples/animation/moveblocks/moveblocks.pro @@ -8,5 +8,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3F7 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/animation/states/states.pro b/examples/animation/states/states.pro index dd5e09f365..00963fe8c0 100644 --- a/examples/animation/states/states.pro +++ b/examples/animation/states/states.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3F8 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro index a4f5aafb2d..2fefe72c4f 100644 --- a/examples/animation/stickman/stickman.pro +++ b/examples/animation/stickman/stickman.pro @@ -20,5 +20,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E3F9 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro index ff4b9c236a..de4ed61f79 100644 --- a/examples/dbus/complexpingpong/complexping.pro +++ b/examples/dbus/complexpingpong/complexping.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro index 166293beed..b3a2e75e37 100644 --- a/examples/dbus/complexpingpong/complexpong.pro +++ b/examples/dbus/complexpingpong/complexpong.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro index b474ff8c15..8de055afdb 100644 --- a/examples/dbus/dbus-chat/dbus-chat.pro +++ b/examples/dbus/dbus-chat/dbus-chat.pro @@ -18,4 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro index 90865bd3f6..7a83e8864e 100644 --- a/examples/dbus/dbus.pro +++ b/examples/dbus/dbus.pro @@ -14,4 +14,4 @@ sources.files = *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro index c965de451a..f633f10c11 100644 --- a/examples/dbus/listnames/listnames.pro +++ b/examples/dbus/listnames/listnames.pro @@ -15,5 +15,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro index 7166dba16e..66fc196462 100644 --- a/examples/dbus/pingpong/ping.pro +++ b/examples/dbus/pingpong/ping.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro index 4b18cc5c93..afd5f51776 100644 --- a/examples/dbus/pingpong/pong.pro +++ b/examples/dbus/pingpong/pong.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index 0d7971f9d7..8bca29c6a3 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro index 71cdb54b17..00a5a2a317 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.pro +++ b/examples/dbus/remotecontrolledcar/controller/controller.pro @@ -20,4 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro index 586507683c..41a7476b11 100644 --- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro +++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro @@ -7,4 +7,4 @@ sources.files = *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro index eb3cbaca42..58c7b977fb 100644 --- a/examples/desktop/desktop.pro +++ b/examples/desktop/desktop.pro @@ -2,12 +2,10 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = screenshot -!symbian:contains(QT_CONFIG, svg): SUBDIRS += systray - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/desktop/screenshot/screenshot.pro b/examples/desktop/screenshot/screenshot.pro index ab2700fed1..c2c6ead8cc 100644 --- a/examples/desktop/screenshot/screenshot.pro +++ b/examples/desktop/screenshot/screenshot.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/classwizard/classwizard.pro b/examples/dialogs/classwizard/classwizard.pro index 13341c4f0e..0952e8f724 100644 --- a/examples/dialogs/classwizard/classwizard.pro +++ b/examples/dialogs/classwizard/classwizard.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/configdialog/configdialog.pro b/examples/dialogs/configdialog/configdialog.pro index e73e7401e5..c6e47485bb 100644 --- a/examples/dialogs/configdialog/configdialog.pro +++ b/examples/dialogs/configdialog/configdialog.pro @@ -11,6 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/dialogs/dialogs.pro b/examples/dialogs/dialogs.pro index 50d665f45e..f4ea5713df 100644 --- a/examples/dialogs/dialogs.pro +++ b/examples/dialogs/dialogs.pro @@ -16,4 +16,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro index 4f56a949ff..108906f483 100644 --- a/examples/dialogs/extension/extension.pro +++ b/examples/dialogs/extension/extension.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/dialogs/findfiles/findfiles.pro index 8e80b27f33..ffae120bda 100644 --- a/examples/dialogs/findfiles/findfiles.pro +++ b/examples/dialogs/findfiles/findfiles.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/dialogs/licensewizard/licensewizard.pro index 2f72bd97f3..cdf6aa7fdc 100644 --- a/examples/dialogs/licensewizard/licensewizard.pro +++ b/examples/dialogs/licensewizard/licensewizard.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/dialogs/sipdialog/sipdialog.pro b/examples/dialogs/sipdialog/sipdialog.pro index 31794b7866..ffc9693604 100644 --- a/examples/dialogs/sipdialog/sipdialog.pro +++ b/examples/dialogs/sipdialog/sipdialog.pro @@ -8,7 +8,7 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/dialogs/standarddialogs/standarddialogs.pro index 4fcbeebb1f..f7b3cef905 100644 --- a/examples/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/dialogs/standarddialogs/standarddialogs.pro @@ -8,6 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/dialogs/tabdialog/tabdialog.pro index f327580714..c67fcbd157 100644 --- a/examples/dialogs/tabdialog/tabdialog.pro +++ b/examples/dialogs/tabdialog/tabdialog.pro @@ -8,5 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/dialogs/trivialwizard/trivialwizard.pro index ffbb8e9aa8..31422de763 100644 --- a/examples/dialogs/trivialwizard/trivialwizard.pro +++ b/examples/dialogs/trivialwizard/trivialwizard.pro @@ -6,4 +6,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro index 9cc0e2bd2f..8f737f1918 100644 --- a/examples/draganddrop/draganddrop.pro +++ b/examples/draganddrop/draganddrop.pro @@ -5,8 +5,6 @@ SUBDIRS = draggableicons \ fridgemagnets \ puzzle -contains(QT_CONFIG, svg): SUBDIRS += delayedencoding - wince*: SUBDIRS -= dropsite symbian: SUBDIRS -= dropsite # install diff --git a/examples/draganddrop/draggableicons/draggableicons.pro b/examples/draganddrop/draggableicons/draggableicons.pro index f28769adad..db56b7cc95 100644 --- a/examples/draganddrop/draggableicons/draggableicons.pro +++ b/examples/draganddrop/draggableicons/draggableicons.pro @@ -11,5 +11,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C615 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/draganddrop/draggabletext/draggabletext.pro b/examples/draganddrop/draggabletext/draggabletext.pro index d2e8b0bef8..ffe219be14 100644 --- a/examples/draganddrop/draggabletext/draggabletext.pro +++ b/examples/draganddrop/draggabletext/draggabletext.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000CF64 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/draganddrop/dropsite/dropsite.pro b/examples/draganddrop/dropsite/dropsite.pro index 22b587ad7a..0ee9f600d1 100644 --- a/examples/draganddrop/dropsite/dropsite.pro +++ b/examples/draganddrop/dropsite/dropsite.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/draganddrop/fridgemagnets/fridgemagnets.pro index 9f9b3a0535..fe1377fb74 100644 --- a/examples/draganddrop/fridgemagnets/fridgemagnets.pro +++ b/examples/draganddrop/fridgemagnets/fridgemagnets.pro @@ -13,7 +13,7 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C610 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro index cb78a1da41..0d3a5dab2e 100644 --- a/examples/draganddrop/puzzle/puzzle.pro +++ b/examples/draganddrop/puzzle/puzzle.pro @@ -17,7 +17,7 @@ INSTALLS += target sources symbian:{ TARGET.UID3 = 0xA000CF65 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example addFile.files = example.jpg addFile.path = . DEPLOYMENT += addFile diff --git a/examples/examples.pro b/examples/examples.pro index 968740d0e5..0680ff45f6 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -30,8 +30,6 @@ SUBDIRS = \ gestures } -contains(QT_CONFIG, webkit):SUBDIRS += webkit - symbian: SUBDIRS = \ graphicsview \ itemviews \ @@ -50,22 +48,11 @@ symbian: SUBDIRS = \ SUBDIRS += multimedia } -contains(QT_CONFIG, script): SUBDIRS += script - -contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon embedded:SUBDIRS += qws -!wince*:!symbian: { - !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help -} else { - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib -} +contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, openvg): SUBDIRS += openvg contains(QT_CONFIG, dbus): SUBDIRS += dbus -contains(QT_CONFIG, declarative): SUBDIRS += declarative -win32: SUBDIRS += activeqt -contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent @@ -74,4 +61,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES] INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro index 10326e658d..2e75f06355 100644 --- a/examples/gestures/imagegestures/imagegestures.pro +++ b/examples/gestures/imagegestures/imagegestures.pro @@ -17,5 +17,5 @@ INSTALLS += target \ symbian { TARGET.UID3 = 0xA000D7D0 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro index f23bb7544d..8b667387a0 100644 --- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro +++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A645 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro index c88cf5306f..b49f44be4c 100644 --- a/examples/graphicsview/collidingmice/collidingmice.pro +++ b/examples/graphicsview/collidingmice/collidingmice.pro @@ -15,5 +15,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A643 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/graphicsview/diagramscene/diagramscene.pro b/examples/graphicsview/diagramscene/diagramscene.pro index 02660b1427..6af1160015 100644 --- a/examples/graphicsview/diagramscene/diagramscene.pro +++ b/examples/graphicsview/diagramscene/diagramscene.pro @@ -18,5 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/graphicsview/dragdroprobot/dragdroprobot.pro index 736958baa1..5240b4208f 100644 --- a/examples/graphicsview/dragdroprobot/dragdroprobot.pro +++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro index cb7cc1b928..208c849d13 100644 --- a/examples/graphicsview/elasticnodes/elasticnodes.pro +++ b/examples/graphicsview/elasticnodes/elasticnodes.pro @@ -19,5 +19,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A642 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index 5e49855104..a1458ded91 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -13,7 +13,6 @@ SUBDIRS = \ simpleanchorlayout \ weatheranchorlayout -contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids contains(DEFINES, QT_NO_CURSOR)|contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= dragdroprobot # install @@ -22,4 +21,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro index de492f3e9e..45ebfdcf2a 100644 --- a/examples/graphicsview/padnavigator/padnavigator.pro +++ b/examples/graphicsview/padnavigator/padnavigator.pro @@ -28,5 +28,5 @@ CONFIG += console symbian { TARGET.UID3 = 0xA000A644 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro index 429fde29dc..ed20b2627c 100644 --- a/examples/ipc/ipc.pro +++ b/examples/ipc/ipc.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro index 914ed75657..a66d4b2eca 100644 --- a/examples/ipc/localfortuneclient/localfortuneclient.pro +++ b/examples/ipc/localfortuneclient/localfortuneclient.pro @@ -9,6 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneclient INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro index 1f160f9ec8..ae09d8007c 100644 --- a/examples/ipc/localfortuneserver/localfortuneserver.pro +++ b/examples/ipc/localfortuneserver/localfortuneserver.pro @@ -9,6 +9,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/localfortuneserver INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro index 8316a2c884..252fb29ca1 100644 --- a/examples/ipc/sharedmemory/sharedmemory.pro +++ b/examples/ipc/sharedmemory/sharedmemory.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/ipc/sharedmemory INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/addressbook/addressbook.pro b/examples/itemviews/addressbook/addressbook.pro index 3fbbace5c5..21a9f329b9 100644 --- a/examples/itemviews/addressbook/addressbook.pro +++ b/examples/itemviews/addressbook/addressbook.pro @@ -18,5 +18,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A646 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro index 0b845aff97..da06113587 100644 --- a/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro +++ b/examples/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/basicsortfiltermodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/chart/chart.pro b/examples/itemviews/chart/chart.pro index 250e1e120c..3da23d4038 100644 --- a/examples/itemviews/chart/chart.pro +++ b/examples/itemviews/chart/chart.pro @@ -16,5 +16,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A647 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro index a8187b139d..3147375a45 100644 --- a/examples/itemviews/coloreditorfactory/coloreditorfactory.pro +++ b/examples/itemviews/coloreditorfactory/coloreditorfactory.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/coloreditorfactory INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro index 193dfd9da3..e04c5dfaae 100644 --- a/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro +++ b/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/customsortfiltermodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/dirview/dirview.pro b/examples/itemviews/dirview/dirview.pro index fc87b4cfe6..28be5d782d 100644 --- a/examples/itemviews/dirview/dirview.pro +++ b/examples/itemviews/dirview/dirview.pro @@ -6,4 +6,4 @@ sources.files = $$SOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/dirview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/editabletreemodel/editabletreemodel.pro b/examples/itemviews/editabletreemodel/editabletreemodel.pro index 1137f5cfa5..6ed901c4a4 100644 --- a/examples/itemviews/editabletreemodel/editabletreemodel.pro +++ b/examples/itemviews/editabletreemodel/editabletreemodel.pro @@ -15,4 +15,4 @@ sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/editabletreemodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/itemviews.pro b/examples/itemviews/itemviews.pro index adc313b864..68fbc91c8c 100644 --- a/examples/itemviews/itemviews.pro +++ b/examples/itemviews/itemviews.pro @@ -26,4 +26,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/pixelator/pixelator.pro b/examples/itemviews/pixelator/pixelator.pro index fecffcc64b..2f71d34158 100644 --- a/examples/itemviews/pixelator/pixelator.pro +++ b/examples/itemviews/pixelator/pixelator.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro index 3939397b7c..16cbc5e72c 100644 --- a/examples/itemviews/puzzle/puzzle.pro +++ b/examples/itemviews/puzzle/puzzle.pro @@ -13,7 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/puzzle INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince* { DEPLOYMENT_PLUGIN += qjpeg qgif qtiff diff --git a/examples/itemviews/simpledommodel/simpledommodel.pro b/examples/itemviews/simpledommodel/simpledommodel.pro index 87d673f3a1..a0b8f06794 100644 --- a/examples/itemviews/simpledommodel/simpledommodel.pro +++ b/examples/itemviews/simpledommodel/simpledommodel.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpledommodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/simpletreemodel/simpletreemodel.pro b/examples/itemviews/simpletreemodel/simpletreemodel.pro index 8b1f78e54f..3ff238ba03 100644 --- a/examples/itemviews/simpletreemodel/simpletreemodel.pro +++ b/examples/itemviews/simpletreemodel/simpletreemodel.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simpletreemodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro index bdb0219537..0be57ba7e3 100644 --- a/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro +++ b/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/simplewidgetmapper INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro index c7162eb69c..561ee29538 100644 --- a/examples/itemviews/spinboxdelegate/spinboxdelegate.pro +++ b/examples/itemviews/spinboxdelegate/spinboxdelegate.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/spinboxdelegate INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/itemviews/stardelegate/stardelegate.pro b/examples/itemviews/stardelegate/stardelegate.pro index 078ef143c3..9e710f0bad 100644 --- a/examples/itemviews/stardelegate/stardelegate.pro +++ b/examples/itemviews/stardelegate/stardelegate.pro @@ -12,5 +12,5 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/stardelegate INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/ja_JP/linguist/hellotr/hellotr.pro b/examples/ja_JP/linguist/hellotr/hellotr.pro index 3aa6bdd15f..40d37e2472 100644 --- a/examples/ja_JP/linguist/hellotr/hellotr.pro +++ b/examples/ja_JP/linguist/hellotr/hellotr.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/layouts/basiclayouts/basiclayouts.pro b/examples/layouts/basiclayouts/basiclayouts.pro index 4b0a657cc1..cd0552f9ff 100644 --- a/examples/layouts/basiclayouts/basiclayouts.pro +++ b/examples/layouts/basiclayouts/basiclayouts.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/layouts/borderlayout/borderlayout.pro b/examples/layouts/borderlayout/borderlayout.pro index 372029aaf9..6ddbb94f92 100644 --- a/examples/layouts/borderlayout/borderlayout.pro +++ b/examples/layouts/borderlayout/borderlayout.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/layouts/dynamiclayouts/dynamiclayouts.pro index 5a4133c76c..e0fbecceca 100644 --- a/examples/layouts/dynamiclayouts/dynamiclayouts.pro +++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/layouts/flowlayout/flowlayout.pro b/examples/layouts/flowlayout/flowlayout.pro index 609f9881e5..6d1a160cf6 100644 --- a/examples/layouts/flowlayout/flowlayout.pro +++ b/examples/layouts/flowlayout/flowlayout.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/layouts/layouts.pro b/examples/layouts/layouts.pro index 57d85b4b35..65bf7f235a 100644 --- a/examples/layouts/layouts.pro +++ b/examples/layouts/layouts.pro @@ -9,4 +9,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro index 2f8c5f5786..e1ff6f648d 100644 --- a/examples/linguist/arrowpad/arrowpad.pro +++ b/examples/linguist/arrowpad/arrowpad.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro index 6995f11b2a..9c03bdc3e0 100644 --- a/examples/linguist/hellotr/hellotr.pro +++ b/examples/linguist/hellotr/hellotr.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/linguist/linguist.pro b/examples/linguist/linguist.pro index 69b6c83def..7de32ef2ec 100644 --- a/examples/linguist/linguist.pro +++ b/examples/linguist/linguist.pro @@ -8,4 +8,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro index 48ebacf293..fe3dc20e59 100644 --- a/examples/linguist/trollprint/trollprint.pro +++ b/examples/linguist/trollprint/trollprint.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/application/application.pro b/examples/mainwindows/application/application.pro index 285568da85..10b2b84219 100644 --- a/examples/mainwindows/application/application.pro +++ b/examples/mainwindows/application/application.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/application INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/dockwidgets/dockwidgets.pro b/examples/mainwindows/dockwidgets/dockwidgets.pro index 3485ca5e02..daba00c99c 100644 --- a/examples/mainwindows/dockwidgets/dockwidgets.pro +++ b/examples/mainwindows/dockwidgets/dockwidgets.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro index d44f9f0b49..6471c1406a 100644 --- a/examples/mainwindows/mainwindows.pro +++ b/examples/mainwindows/mainwindows.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/mdi/mdi.pro b/examples/mainwindows/mdi/mdi.pro index 3eedff1949..74c418b52f 100644 --- a/examples/mainwindows/mdi/mdi.pro +++ b/examples/mainwindows/mdi/mdi.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/mdi INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/menus/menus.pro b/examples/mainwindows/menus/menus.pro index dc762ff44d..c437f160bb 100644 --- a/examples/mainwindows/menus/menus.pro +++ b/examples/mainwindows/menus/menus.pro @@ -10,5 +10,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000CF66 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/mainwindows/recentfiles/recentfiles.pro b/examples/mainwindows/recentfiles/recentfiles.pro index b4cf79b630..a8e83ffa20 100644 --- a/examples/mainwindows/recentfiles/recentfiles.pro +++ b/examples/mainwindows/recentfiles/recentfiles.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/recentfiles INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/mainwindows/sdi/sdi.pro b/examples/mainwindows/sdi/sdi.pro index 1ca9746c9e..70bbf6543c 100644 --- a/examples/mainwindows/sdi/sdi.pro +++ b/examples/mainwindows/sdi/sdi.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/sdi INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro index 38832acbe5..2faedaa810 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pr sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro index 602ad373c4..458585def3 100644 --- a/examples/network/broadcastreceiver/broadcastreceiver.pro +++ b/examples/network/broadcastreceiver/broadcastreceiver.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastreceiver INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro index 9a03765bb7..eb76c38071 100644 --- a/examples/network/broadcastsender/broadcastsender.pro +++ b/examples/network/broadcastsender/broadcastsender.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/broadcastsender INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro index 780d61fae0..4bea359f16 100644 --- a/examples/network/download/download.pro +++ b/examples/network/download/download.pro @@ -18,4 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro index 5c618cdfbf..8855aae94c 100644 --- a/examples/network/downloadmanager/downloadmanager.pro +++ b/examples/network/downloadmanager/downloadmanager.pro @@ -19,4 +19,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro index 550ba91bd7..2e3ec01abb 100644 --- a/examples/network/fortuneclient/fortuneclient.pro +++ b/examples/network/fortuneclient/fortuneclient.pro @@ -10,7 +10,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/fortuneclient INSTALLS += target sources symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro index 3e95bfe3f9..c34c565a0f 100644 --- a/examples/network/fortuneserver/fortuneserver.pro +++ b/examples/network/fortuneserver/fortuneserver.pro @@ -11,7 +11,7 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000E406 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.CAPABILITY = "NetworkServices ReadUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro index 4f17850cc8..74a8e49d90 100644 --- a/examples/network/http/http.pro +++ b/examples/network/http/http.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro index daf4fc35f5..ea175b3e3c 100644 --- a/examples/network/loopback/loopback.pro +++ b/examples/network/loopback/loopback.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro index 8c13c34450..958a13f11d 100644 --- a/examples/network/multicastreceiver/multicastreceiver.pro +++ b/examples/network/multicastreceiver/multicastreceiver.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastreceiver INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro index db97334d8e..479251ca0b 100644 --- a/examples/network/multicastsender/multicastsender.pro +++ b/examples/network/multicastsender/multicastsender.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/multicastsender INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro index 11f2d2ef30..7c1514f727 100644 --- a/examples/network/network-chat/network-chat.pro +++ b/examples/network/network-chat/network-chat.pro @@ -19,7 +19,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/network-chat INSTALLS += target sources symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example LIBS += -lcharconv TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 diff --git a/examples/network/network.pro b/examples/network/network.pro index 1ebb499f8b..09765a622a 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -20,10 +20,6 @@ SUBDIRS = \ multicastreceiver \ multicastsender - contains(QT_CONFIG, svg) { - SUBDIRS += bearercloud - } - # no QProcess !vxworks:!qnx:SUBDIRS += network-chat @@ -38,4 +34,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/qftp/qftp.pro b/examples/network/qftp/qftp.pro index 3f0f07ae30..0e62d153d9 100644 --- a/examples/network/qftp/qftp.pro +++ b/examples/network/qftp/qftp.pro @@ -12,7 +12,7 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A648 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData" } diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro index 3bbd9a81df..f6276dd0bf 100644 --- a/examples/network/securesocketclient/securesocketclient.pro +++ b/examples/network/securesocketclient/securesocketclient.pro @@ -17,5 +17,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000CF67 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro index c053c36afe..a76974a57e 100644 --- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro +++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pr sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/threadedfortuneserver INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index a9acf7bbc0..0dc3aa7950 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -36,4 +36,4 @@ sources.files += icons forms 3rdparty sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/torrent INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro index 120d6e4986..3998cf55a5 100644 --- a/examples/opengl/2dpainting/2dpainting.pro +++ b/examples/opengl/2dpainting/2dpainting.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/2dpainting INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro index cf59cc3679..8a26573c84 100644 --- a/examples/opengl/framebufferobject2/framebufferobject2.pro +++ b/examples/opengl/framebufferobject2/framebufferobject2.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/framebufferobject2 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro index 994026391f..7f5c3d63c9 100644 --- a/examples/opengl/grabber/grabber.pro +++ b/examples/opengl/grabber/grabber.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/grabber INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro index fd9699b4cb..1c67fe01bd 100644 --- a/examples/opengl/hellogl/hellogl.pro +++ b/examples/opengl/hellogl/hellogl.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 77b6fa13aa..f9ca0bdaf4 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -19,11 +19,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ framebufferobject2 \ samplebuffers \ textures - - contains(QT_CONFIG, svg) { - SUBDIRS += framebufferobject \ - pbuffers2 - } } # install @@ -32,4 +27,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro index 741199d210..31adf0fb34 100644 --- a/examples/opengl/overpainting/overpainting.pro +++ b/examples/opengl/overpainting/overpainting.pro @@ -20,4 +20,4 @@ sources.files = $$SOURCES \ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/overpainting INSTALLS += target \ sources -symbian:include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian:CONFIG += qt_example diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro index 48797ab142..79d5a6d96c 100644 --- a/examples/opengl/pbuffers/pbuffers.pro +++ b/examples/opengl/pbuffers/pbuffers.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES \ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers INSTALLS += target \ sources -symbian:include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian:CONFIG += qt_example diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro index ea1f6bd293..0fb75c1f00 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -20,4 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro index c284318524..34720736df 100644 --- a/examples/opengl/samplebuffers/samplebuffers.pro +++ b/examples/opengl/samplebuffers/samplebuffers.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS samplebuffers.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/samplebuffers INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro index d2e311bc2d..78555d58cb 100644 --- a/examples/opengl/textures/textures.pro +++ b/examples/opengl/textures/textures.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/textures INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro index 0e5d3f68b8..e607721ffb 100644 --- a/examples/painting/basicdrawing/basicdrawing.pro +++ b/examples/painting/basicdrawing/basicdrawing.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A649 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro index a47ac18193..f7e050ba21 100644 --- a/examples/painting/concentriccircles/concentriccircles.pro +++ b/examples/painting/concentriccircles/concentriccircles.pro @@ -12,5 +12,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A64A - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro index 9d845c413d..b9328a6439 100644 --- a/examples/painting/fontsampler/fontsampler.pro +++ b/examples/painting/fontsampler/fontsampler.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro index 883d7edc0c..e8be8fa2b5 100644 --- a/examples/painting/imagecomposition/imagecomposition.pro +++ b/examples/painting/imagecomposition/imagecomposition.pro @@ -11,5 +11,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A64B - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index c61ad897a0..84bbecaa83 100644 --- a/examples/painting/painterpaths/painterpaths.pro +++ b/examples/painting/painterpaths/painterpaths.pro @@ -13,5 +13,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A64C - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro index 1885f217cb..4108a64edd 100644 --- a/examples/painting/painting.pro +++ b/examples/painting/painting.pro @@ -7,12 +7,10 @@ SUBDIRS = basicdrawing \ !wince*:!symbian: SUBDIRS += fontsampler -contains(QT_CONFIG, svg): SUBDIRS += svggenerator svgviewer - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/painting/transformations/transformations.pro b/examples/painting/transformations/transformations.pro index 9256f1499a..8fe8be932e 100644 --- a/examples/painting/transformations/transformations.pro +++ b/examples/painting/transformations/transformations.pro @@ -12,5 +12,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A64D - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index b9601ad48b..f6c029b678 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -12,6 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index 76a19964e0..da8b5cb664 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index 9ec11a4ae1..be3e62ceeb 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index 72af020e38..a224b4a633 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro index a003d9afe2..f5b359c5ef 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro index 40ae58891f..c6e4d852f5 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index a7357363eb..7fce5967c7 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -7,4 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro index 2dd7aef66c..439e8403ef 100644 --- a/examples/qtestlib/tutorial1/tutorial1.pro +++ b/examples/qtestlib/tutorial1/tutorial1.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C60B - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro index ed60608c1a..2c44466d47 100644 --- a/examples/qtestlib/tutorial2/tutorial2.pro +++ b/examples/qtestlib/tutorial2/tutorial2.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C60C - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro index 91024b9470..ec24447347 100644 --- a/examples/qtestlib/tutorial3/tutorial3.pro +++ b/examples/qtestlib/tutorial3/tutorial3.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C60D - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro index 6d189a255a..ca3985ea21 100644 --- a/examples/qtestlib/tutorial4/tutorial4.pro +++ b/examples/qtestlib/tutorial4/tutorial4.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C60E - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro index 47d2e86e08..c263a74278 100644 --- a/examples/qtestlib/tutorial5/tutorial5.pro +++ b/examples/qtestlib/tutorial5/tutorial5.pro @@ -9,5 +9,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C60F - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro index 5f53ed4cea..7ecc8ab6b9 100644 --- a/examples/richtext/calendar/calendar.pro +++ b/examples/richtext/calendar/calendar.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro index 6a5041ba70..6760dad7aa 100644 --- a/examples/richtext/orderform/orderform.pro +++ b/examples/richtext/orderform/orderform.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro index aec3936833..102181ec26 100644 --- a/examples/richtext/richtext.pro +++ b/examples/richtext/richtext.pro @@ -3,12 +3,10 @@ SUBDIRS = calendar \ orderform \ syntaxhighlighter -contains(QT_CONFIG, svg): SUBDIRS += textobject - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro index 5939134557..e981a912ad 100644 --- a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro +++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro @@ -10,7 +10,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro ex sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/syntaxhighlighter INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: { addFiles.files = main.cpp mainwindow.cpp diff --git a/examples/sql/cachedtable/cachedtable.pro b/examples/sql/cachedtable/cachedtable.pro index c03e7213f4..0b015fd0fc 100644 --- a/examples/sql/cachedtable/cachedtable.pro +++ b/examples/sql/cachedtable/cachedtable.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS cachedtable.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/cachedtable INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro index e3f05c2293..6448e43d82 100644 --- a/examples/sql/drilldown/drilldown.pro +++ b/examples/sql/drilldown/drilldown.pro @@ -17,5 +17,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C612 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/sql/masterdetail/masterdetail.pro b/examples/sql/masterdetail/masterdetail.pro index 39d93ec017..98bfac4352 100644 --- a/examples/sql/masterdetail/masterdetail.pro +++ b/examples/sql/masterdetail/masterdetail.pro @@ -17,5 +17,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000D7CF - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/sql/querymodel/querymodel.pro b/examples/sql/querymodel/querymodel.pro index cd8b202b44..f376e126df 100644 --- a/examples/sql/querymodel/querymodel.pro +++ b/examples/sql/querymodel/querymodel.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS querymodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/querymodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.pro b/examples/sql/relationaltablemodel/relationaltablemodel.pro index 3cf3e312f2..41c1c170c4 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.pro +++ b/examples/sql/relationaltablemodel/relationaltablemodel.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS relationaltablemodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/relationaltablemodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 7de4a5c3a0..36738fbeed 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -17,4 +17,4 @@ sources.files = connection.h sql.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql INSTALLS += sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/sql/tablemodel/tablemodel.pro b/examples/sql/tablemodel/tablemodel.pro index 55956c05e7..41280eec52 100644 --- a/examples/sql/tablemodel/tablemodel.pro +++ b/examples/sql/tablemodel/tablemodel.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES *.h $$RESOURCES $$FORMS tablemodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/sql/tablemodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro index cffaefe525..fe72cd58a7 100644 --- a/examples/threads/mandelbrot/mandelbrot.pro +++ b/examples/threads/mandelbrot/mandelbrot.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/mandelbrot INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro index 027c65ca5e..185a051986 100644 --- a/examples/threads/semaphores/semaphores.pro +++ b/examples/threads/semaphores/semaphores.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/semaphores INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro index e8f8c09ab9..fd62ccec11 100644 --- a/examples/threads/threads.pro +++ b/examples/threads/threads.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index a2359c3d84..53350d2dae 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -18,4 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/codecs/codecs.pro b/examples/tools/codecs/codecs.pro index 097601fa0b..2403fc8506 100644 --- a/examples/tools/codecs/codecs.pro +++ b/examples/tools/codecs/codecs.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS encodedfiles codecs.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/codecs INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/completer/completer.pro b/examples/tools/completer/completer.pro index 8c389e4b24..3db4484662 100644 --- a/examples/tools/completer/completer.pro +++ b/examples/tools/completer/completer.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS completer.pro resources sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/completer INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/customcompleter/customcompleter.pro b/examples/tools/customcompleter/customcompleter.pro index 9af70c06d0..3b0874cbdc 100644 --- a/examples/tools/customcompleter/customcompleter.pro +++ b/examples/tools/customcompleter/customcompleter.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro reso sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/customcompleter INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/echoplugin/echoplugin.pro b/examples/tools/echoplugin/echoplugin.pro index 80520b274d..164dcadcf5 100644 --- a/examples/tools/echoplugin/echoplugin.pro +++ b/examples/tools/echoplugin/echoplugin.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro index 7bd772ae80..c1b65bfec7 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/tools/echoplugin/echowindow/echowindow.pro @@ -18,4 +18,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/echowindow INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/echoplugin/plugin/plugin.pro b/examples/tools/echoplugin/plugin/plugin.pro index 1354e95ff7..617c1dd58f 100644 --- a/examples/tools/echoplugin/plugin/plugin.pro +++ b/examples/tools/echoplugin/plugin/plugin.pro @@ -14,6 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/echoplugin/plugin INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example symbian:TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/tools/i18n/i18n.pro b/examples/tools/i18n/i18n.pro index fded91971c..c68620a989 100644 --- a/examples/tools/i18n/i18n.pro +++ b/examples/tools/i18n/i18n.pro @@ -25,4 +25,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES translations i18n.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/i18n INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/inputpanel/inputpanel.pro b/examples/tools/inputpanel/inputpanel.pro index a1e5f0f926..e8582a9ea0 100644 --- a/examples/tools/inputpanel/inputpanel.pro +++ b/examples/tools/inputpanel/inputpanel.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS inputpanel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/inputpanel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/plugandpaint/plugandpaint.pro b/examples/tools/plugandpaint/plugandpaint.pro index 9ed0402d05..8b91053230 100644 --- a/examples/tools/plugandpaint/plugandpaint.pro +++ b/examples/tools/plugandpaint/plugandpaint.pro @@ -25,4 +25,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaint.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaint INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/plugandpaintplugins/basictools/basictools.pro b/examples/tools/plugandpaintplugins/basictools/basictools.pro index 6dc626be32..26a3f98bce 100644 --- a/examples/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/tools/plugandpaintplugins/basictools/basictools.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/basictools INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro index 91c9ce94b6..a9dc116bc5 100644 --- a/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro @@ -14,6 +14,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins/extrafilters INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example symbian:TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro index 8309f01191..857b62e88e 100644 --- a/examples/tools/plugandpaintplugins/plugandpaintplugins.pro +++ b/examples/tools/plugandpaintplugins/plugandpaintplugins.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaintplugins.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/plugandpaintplugins INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/regexp/regexp.pro b/examples/tools/regexp/regexp.pro index ef99a090e7..66904809f9 100644 --- a/examples/tools/regexp/regexp.pro +++ b/examples/tools/regexp/regexp.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS regexp.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/regexp INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/settingseditor/settingseditor.pro b/examples/tools/settingseditor/settingseditor.pro index 79296b80a0..140e59f6ac 100644 --- a/examples/tools/settingseditor/settingseditor.pro +++ b/examples/tools/settingseditor/settingseditor.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS settingseditor.pro inifi sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/settingseditor INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/styleplugin/plugin/plugin.pro b/examples/tools/styleplugin/plugin/plugin.pro index 442cc8ac8b..319a2be15b 100644 --- a/examples/tools/styleplugin/plugin/plugin.pro +++ b/examples/tools/styleplugin/plugin/plugin.pro @@ -20,6 +20,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/plugin INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example symbian:TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/tools/styleplugin/styleplugin.pro b/examples/tools/styleplugin/styleplugin.pro index c7669aacab..69935f666e 100644 --- a/examples/tools/styleplugin/styleplugin.pro +++ b/examples/tools/styleplugin/styleplugin.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/styleplugin/stylewindow/stylewindow.pro b/examples/tools/styleplugin/stylewindow/stylewindow.pro index bfa26ef3a1..6d6d9f5049 100644 --- a/examples/tools/styleplugin/stylewindow/stylewindow.pro +++ b/examples/tools/styleplugin/stylewindow/stylewindow.pro @@ -16,4 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stylewindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/styleplugin/stylewindow INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index 1c7f6eb0d8..4b8c896484 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -23,4 +23,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/treemodelcompleter/treemodelcompleter.pro b/examples/tools/treemodelcompleter/treemodelcompleter.pro index aafd718201..11f59085e3 100644 --- a/examples/tools/treemodelcompleter/treemodelcompleter.pro +++ b/examples/tools/treemodelcompleter/treemodelcompleter.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS treemodelcompleter.pro r sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/treemodelcompleter INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tools/undoframework/undoframework.pro b/examples/tools/undoframework/undoframework.pro index 0f03091ce0..ce11d353ad 100644 --- a/examples/tools/undoframework/undoframework.pro +++ b/examples/tools/undoframework/undoframework.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS undoframework.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tools/undoframework INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/addressbook.pro b/examples/tutorials/addressbook/addressbook.pro index 0605a5b2d5..575f5cb518 100644 --- a/examples/tutorials/addressbook/addressbook.pro +++ b/examples/tutorials/addressbook/addressbook.pro @@ -7,4 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part1/part1.pro b/examples/tutorials/addressbook/part1/part1.pro index 113887ee30..b392ee06c9 100644 --- a/examples/tutorials/addressbook/part1/part1.pro +++ b/examples/tutorials/addressbook/part1/part1.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part1 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part2/part2.pro b/examples/tutorials/addressbook/part2/part2.pro index 4cee9a49d5..8dbf7f21f5 100644 --- a/examples/tutorials/addressbook/part2/part2.pro +++ b/examples/tutorials/addressbook/part2/part2.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part2 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part3/part3.pro b/examples/tutorials/addressbook/part3/part3.pro index 9d70d1b9c3..7ab6731a0a 100644 --- a/examples/tutorials/addressbook/part3/part3.pro +++ b/examples/tutorials/addressbook/part3/part3.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part3 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part4/part4.pro b/examples/tutorials/addressbook/part4/part4.pro index 231425803a..8dbba2e982 100644 --- a/examples/tutorials/addressbook/part4/part4.pro +++ b/examples/tutorials/addressbook/part4/part4.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part4 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part5/part5.pro b/examples/tutorials/addressbook/part5/part5.pro index f44362e942..134a7e0461 100644 --- a/examples/tutorials/addressbook/part5/part5.pro +++ b/examples/tutorials/addressbook/part5/part5.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part5 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part6/part6.pro b/examples/tutorials/addressbook/part6/part6.pro index 0eec36ef21..42401bd515 100644 --- a/examples/tutorials/addressbook/part6/part6.pro +++ b/examples/tutorials/addressbook/part6/part6.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part6 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/addressbook/part7/part7.pro b/examples/tutorials/addressbook/part7/part7.pro index 81a5d5cebe..ffa94448ee 100644 --- a/examples/tutorials/addressbook/part7/part7.pro +++ b/examples/tutorials/addressbook/part7/part7.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/addressbook/part7 INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/1_readonly/1_readonly.pro b/examples/tutorials/modelview/1_readonly/1_readonly.pro index 8ef0bdca5e..102bad59e6 100755 --- a/examples/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/tutorials/modelview/1_readonly/1_readonly.pro @@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/1_readonly INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/2_formatting/2_formatting.pro b/examples/tutorials/modelview/2_formatting/2_formatting.pro index f8babd5799..f7a950a4fd 100755 --- a/examples/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/tutorials/modelview/2_formatting/2_formatting.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/2_formatting INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 205571d4e1..d1f8971aaa 100755 --- a/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/tutorials/modelview/3_changingmodel/3_changingmodel.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/3_changingmodel INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/4_headers/4_headers.pro b/examples/tutorials/modelview/4_headers/4_headers.pro index d3004e39d2..2a8b2dbbfa 100755 --- a/examples/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/tutorials/modelview/4_headers/4_headers.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/4_headers INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/5_edit/5_edit.pro b/examples/tutorials/modelview/5_edit/5_edit.pro index d2fb983a13..f8d725d5c0 100755 --- a/examples/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/tutorials/modelview/5_edit/5_edit.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/5_edit INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/6_treeview/6_treeview.pro b/examples/tutorials/modelview/6_treeview/6_treeview.pro index 63b43e06da..56b00aa81b 100755 --- a/examples/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/tutorials/modelview/6_treeview/6_treeview.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/6_treeview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/7_selections/7_selections.pro b/examples/tutorials/modelview/7_selections/7_selections.pro index 5b01b0a190..5dd65ad6e5 100755 --- a/examples/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/tutorials/modelview/7_selections/7_selections.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview/7_selections INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/modelview/modelview.pro b/examples/tutorials/modelview/modelview.pro index 45dc9c0612..853edfba6e 100755 --- a/examples/tutorials/modelview/modelview.pro +++ b/examples/tutorials/modelview/modelview.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/modelview INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/threads/clock/clock.pro b/examples/tutorials/threads/clock/clock.pro index 697c7bf7fc..5c817b1473 100755 --- a/examples/tutorials/threads/clock/clock.pro +++ b/examples/tutorials/threads/clock/clock.pro @@ -10,5 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/clock INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro index 817b5a809d..4ee3585687 100755 --- a/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro +++ b/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro @@ -11,6 +11,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/helloconcurrent INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/threads/hellothread/hellothread.pro b/examples/tutorials/threads/hellothread/hellothread.pro index 46a2709327..efe4e931f8 100755 --- a/examples/tutorials/threads/hellothread/hellothread.pro +++ b/examples/tutorials/threads/hellothread/hellothread.pro @@ -13,5 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothread INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro index d1f3efd5b8..320ba53f27 100755 --- a/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro +++ b/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro @@ -11,7 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/hellothreadpool INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/tutorials/threads/movedobject/movedobject.pro b/examples/tutorials/threads/movedobject/movedobject.pro index 4b5a1ce159..e2aa2d1dbb 100755 --- a/examples/tutorials/threads/movedobject/movedobject.pro +++ b/examples/tutorials/threads/movedobject/movedobject.pro @@ -15,4 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/tutorials/threads/movedobject INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro index d6aa6c3fec..83b4a1331e 100644 --- a/examples/uitools/multipleinheritance/multipleinheritance.pro +++ b/examples/uitools/multipleinheritance/multipleinheritance.pro @@ -12,5 +12,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000D7C1 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro index 6ec523b37b..9604ceac9e 100644 --- a/examples/uitools/textfinder/textfinder.pro +++ b/examples/uitools/textfinder/textfinder.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro forms sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro index 5c3f3de111..7b11c98e7f 100644 --- a/examples/uitools/uitools.pro +++ b/examples/uitools/uitools.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS uitools.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/analogclock/analogclock.pro b/examples/widgets/analogclock/analogclock.pro index 3183fe0eab..77f4b7fd83 100644 --- a/examples/widgets/analogclock/analogclock.pro +++ b/examples/widgets/analogclock/analogclock.pro @@ -10,5 +10,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000A64F - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/calculator/calculator.pro b/examples/widgets/calculator/calculator.pro index 958661736e..d6bda73629 100644 --- a/examples/widgets/calculator/calculator.pro +++ b/examples/widgets/calculator/calculator.pro @@ -12,5 +12,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C602 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/calendarwidget/calendarwidget.pro index 9922266200..cce3fb5161 100644 --- a/examples/widgets/calendarwidget/calendarwidget.pro +++ b/examples/widgets/calendarwidget/calendarwidget.pro @@ -10,5 +10,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C603 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/charactermap/charactermap.pro b/examples/widgets/charactermap/charactermap.pro index 290e7d6379..8356321413 100644 --- a/examples/widgets/charactermap/charactermap.pro +++ b/examples/widgets/charactermap/charactermap.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/charactermap INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/digitalclock/digitalclock.pro b/examples/widgets/digitalclock/digitalclock.pro index 2d0e7ce709..ae90686529 100644 --- a/examples/widgets/digitalclock/digitalclock.pro +++ b/examples/widgets/digitalclock/digitalclock.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/digitalclock INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/groupbox/groupbox.pro b/examples/widgets/groupbox/groupbox.pro index 817ff26c41..48056a3f3b 100644 --- a/examples/widgets/groupbox/groupbox.pro +++ b/examples/widgets/groupbox/groupbox.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/groupbox INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/icons/icons.pro b/examples/widgets/icons/icons.pro index deeb5881ba..b355dc75d0 100644 --- a/examples/widgets/icons/icons.pro +++ b/examples/widgets/icons/icons.pro @@ -14,7 +14,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/icons INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: { imageFiles.files = images/* diff --git a/examples/widgets/imageviewer/imageviewer.pro b/examples/widgets/imageviewer/imageviewer.pro index 2c0624e773..1c0ac78115 100644 --- a/examples/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/imageviewer/imageviewer.pro @@ -8,7 +8,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/imageviewer INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: { DEPLOYMENT_PLUGIN += qjpeg qmng qgif diff --git a/examples/widgets/lineedits/lineedits.pro b/examples/widgets/lineedits/lineedits.pro index 749c171e8f..b568aac164 100644 --- a/examples/widgets/lineedits/lineedits.pro +++ b/examples/widgets/lineedits/lineedits.pro @@ -10,5 +10,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C604 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro index 82bc3c4a4d..f41bbbbe03 100644 --- a/examples/widgets/movie/movie.pro +++ b/examples/widgets/movie/movie.pro @@ -8,7 +8,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/movie INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: { addFiles.files += *.mng diff --git a/examples/widgets/scribble/scribble.pro b/examples/widgets/scribble/scribble.pro index 90084b5b98..09c6882f60 100644 --- a/examples/widgets/scribble/scribble.pro +++ b/examples/widgets/scribble/scribble.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/shapedclock/shapedclock.pro b/examples/widgets/shapedclock/shapedclock.pro index 1286951943..5563d34258 100644 --- a/examples/widgets/shapedclock/shapedclock.pro +++ b/examples/widgets/shapedclock/shapedclock.pro @@ -10,5 +10,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C605 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/sliders/sliders.pro b/examples/widgets/sliders/sliders.pro index 1d9e779b8a..74ca76426d 100644 --- a/examples/widgets/sliders/sliders.pro +++ b/examples/widgets/sliders/sliders.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/sliders INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/softkeys/softkeys.pro b/examples/widgets/softkeys/softkeys.pro index 14a899c803..b4be01fd5f 100644 --- a/examples/widgets/softkeys/softkeys.pro +++ b/examples/widgets/softkeys/softkeys.pro @@ -11,5 +11,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000CF6B - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/spinboxes/spinboxes.pro b/examples/widgets/spinboxes/spinboxes.pro index cef0671362..11c471bc9e 100644 --- a/examples/widgets/spinboxes/spinboxes.pro +++ b/examples/widgets/spinboxes/spinboxes.pro @@ -8,4 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/spinboxes INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/styles/styles.pro b/examples/widgets/styles/styles.pro index 7920b89356..4806a1d78f 100644 --- a/examples/widgets/styles/styles.pro +++ b/examples/widgets/styles/styles.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/styles INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/stylesheet/stylesheet.pro b/examples/widgets/stylesheet/stylesheet.pro index d677d4eefc..42df886e53 100644 --- a/examples/widgets/stylesheet/stylesheet.pro +++ b/examples/widgets/stylesheet/stylesheet.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/stylesheet INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/tablet/tablet.pro b/examples/widgets/tablet/tablet.pro index 4229ed0aaa..8519997045 100644 --- a/examples/widgets/tablet/tablet.pro +++ b/examples/widgets/tablet/tablet.pro @@ -12,4 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tablet INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/tetrix/tetrix.pro b/examples/widgets/tetrix/tetrix.pro index 10b3f66435..1c777f6021 100644 --- a/examples/widgets/tetrix/tetrix.pro +++ b/examples/widgets/tetrix/tetrix.pro @@ -14,5 +14,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C606 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/tooltips/tooltips.pro b/examples/widgets/tooltips/tooltips.pro index 4cbb6ca6ea..d0725371de 100644 --- a/examples/widgets/tooltips/tooltips.pro +++ b/examples/widgets/tooltips/tooltips.pro @@ -11,4 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/tooltips INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/validators/validators.pro b/examples/widgets/validators/validators.pro index 7e1cb1eea7..5f36bb8fdb 100644 --- a/examples/widgets/validators/validators.pro +++ b/examples/widgets/validators/validators.pro @@ -20,4 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 72652e3bc5..8811f8b0cd 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -40,4 +40,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/widgets/wiggly/wiggly.pro b/examples/widgets/wiggly/wiggly.pro index ce8b514eda..e3a8fbc452 100644 --- a/examples/widgets/wiggly/wiggly.pro +++ b/examples/widgets/wiggly/wiggly.pro @@ -12,5 +12,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C607 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/widgets/windowflags/windowflags.pro b/examples/widgets/windowflags/windowflags.pro index 58985d8a66..23599d0ac8 100644 --- a/examples/widgets/windowflags/windowflags.pro +++ b/examples/widgets/windowflags/windowflags.pro @@ -10,4 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/windowflags INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index d071ccd0ee..aa815457f5 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -11,7 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/dombookmarks INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example wince*: { addFiles.files = frank.xbel jennifer.xbel diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index ca64b346a7..b7a262580b 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -15,5 +15,5 @@ INSTALLS += target sources symbian { TARGET.UID3 = 0xA000C609 - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example } diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro index 01bc9e2ad6..c883b77ada 100644 --- a/examples/xml/rsslisting/rsslisting.pro +++ b/examples/xml/rsslisting/rsslisting.pro @@ -8,5 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/rsslisting INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index 3091947afc..bb1e0961e7 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -21,7 +21,7 @@ wince*: { symbian: { TARGET.UID3 = 0xA000C60A - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example addFiles.files = frank.xbel jennifer.xbel addFiles.path = /data/qt/saxbookmarks DEPLOYMENT += addFiles diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro index febd3cd85f..91abf97ec2 100644 --- a/examples/xml/streambookmarks/streambookmarks.pro +++ b/examples/xml/streambookmarks/streambookmarks.pro @@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xb sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/streambookmarks INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro index a6c8aa18b4..7ef5eadbaa 100644 --- a/examples/xml/xml.pro +++ b/examples/xml/xml.pro @@ -17,4 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro index 838ef042ab..9eb5b2a49e 100644 --- a/examples/xml/xmlstreamlint/xmlstreamlint.pro +++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro @@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/xml/xmlstreamlint INSTALLS += target sources -symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) +symbian: CONFIG += qt_example diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 2e82f03eb9..adcdbb73e9 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -1,3 +1,32 @@ load(exclusive_builds) ### Qt 5: remove "uic" and "resources" - or add "qt" CONFIG = lex yacc warn_on debug uic resources $$CONFIG + +exists($$_PRO_FILE_PWD_/sync.profile) { + PRO_BASENAME = $$basename(_PRO_FILE_) + + # Try to detect proper QTDIR path. We require QTDIR, as syncqt uses that to create qt_module.pri + # forwarding files. If we don't find QTDIR, we avoid creating the fwd files, since you then need + # to do a 'make install;' before you can use the module + # (ie. we don't use QT_INSTALL_DATA for fwd includes. This path needs a full copy) + isEmpty(QTDIR) { + QTDIR = $$(QTDIR) + isEmpty(QTDIR):QTDIR = $$QT_BUILD_TREE + isEmpty(QTDIR):QTDIR = $$dirname(_QMAKE_CACHE_) + isEmpty(QTDIR) { + QMAKE_BASED_QTDIR = $$dirname(QMAKE_QMAKE) + QMAKE_BASED_QTDIR = $$dirname(QMAKE_BASED_QTDIR) + exists($$QMAKE_BASED_QTDIR/mkspecs/qconfig.pri): QTDIR = $$QMAKE_BASED_QTDIR + unset(QMAKE_BASED_QTDIR) + } + } + + isEmpty(QTDIR):QTFWD="-no-module-fwd" + else:QTFWD="-qtdir $$QTDIR" + + message("Running syncqt for $$PRO_BASENAME in $$OUT_PWD") + qtPrepareTool(QMAKE_SYNCQT, syncqt) + system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_") + unset(QTFWD) + unset(PRO_BASENAME) +} diff --git a/mkspecs/features/help.prf b/mkspecs/features/help.prf index 15685e7a57..d8ba8c3537 100644 --- a/mkspecs/features/help.prf +++ b/mkspecs/features/help.prf @@ -1,4 +1,3 @@ -INCLUDEPATH = $$QMAKE_INCDIR_QT/QtHelp $$INCLUDEPATH QT += xml sql -qtAddLibrary(QtHelp) +qtAddModule(help) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index e4a5ef7162..21fdd38e70 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -11,6 +11,11 @@ win32 { } contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1 } + # Some files include qplatformdefs.h, which lives in the individual mkspec directory + # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase + # directory, and using the default profile. So we add the original mkspecs directory + # to the include path + !isEmpty(QMAKESPEC_ORIGINAL):INCLUDEPATH += $$QMAKESPEC_ORIGINAL } CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG no_keywords:DEFINES += QT_NO_KEYWORDS @@ -35,23 +40,6 @@ plugin { #Qt plugins INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt -# As declarative now uses OpenGL in the API, force include it to avoid having to update all projects -contains(QT, declarative): QT += opengl - -# As order does matter for static libs, we reorder the QT variable here -TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper -for(QTLIB, $$list($$TMPLIBS)) { - contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB -} - -QT_UNKNOWN = $$QT -QT_UNKNOWN -= $$QT_ORDERED -QT = $$QT_ORDERED -for(QTLIB, $$list($$QT_UNKNOWN)) { - !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB") -} - - QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { @@ -132,71 +120,35 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { } } } + + + #specific module settings !isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT + +# Topological ordering of modules based on their QT.<module>.depends variable +QT = $$resolve_depends($$QT, "QT.") +QT_DEPENDS= + for(QTLIB, $$list($$lower($$unique(QT)))) { - unset(qlib_style) - !qt_debug:!qt_release { - CONFIG(debug, debug|release):qlib_style = debug - else:qlib_style = release - } else:CONFIG(qt_debug, qt_debug|qt_release) { - qlib_style = debug - } else { - qlib_style = release - } + isEmpty(QT.$${QTLIB}.name) { + message("Warning: unknown QT module: $$QTLIB") + next() + } - unset(qlib) - isEqual(QTLIB, gui):qlib = QtGui - else:isEqual(QTLIB, network):qlib = QtNetwork - else:isEqual(QTLIB, xml):qlib = QtXml - else:isEqual(QTLIB, xmlpatterns):qlib = QtXmlPatterns - else:isEqual(QTLIB, opengl):qlib = QtOpenGL - else:isEqual(QTLIB, openvg):qlib = QtOpenVG - else:isEqual(QTLIB, sql):qlib = QtSql - else:isEqual(QTLIB, core):qlib = QtCore - else:isEqual(QTLIB, canvas):qlib = QtCanvas - else:isEqual(QTLIB, qt3support):qlib = Qt3Support - else:isEqual(QTLIB, svg):qlib = QtSvg - else:isEqual(QTLIB, script):qlib = QtScript - else:isEqual(QTLIB, scripttools):qlib = QtScriptTools - else:isEqual(QTLIB, testlib):qlib = QtTest - else:isEqual(QTLIB, dbus):qlib = QtDBus - else:isEqual(QTLIB, phonon) { - qlib = phonon - INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat - - # The Helix backend requires this. Since we can't let a plugin set it, - # we bump the values for all Symbian Phonon plugins. - symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000 - - } else:isEqual(QTLIB, webkit) { - qlib = QtWebKit - aix-xlc { - # Flags recommended by IBM when using WebKit - QMAKE_LFLAGS -= -bmaxdata:0x80000000 - QMAKE_LFLAGS += -bmaxdata:0xD0000000/dsa - } - } else:isEqual(QTLIB, declarative):qlib = QtDeclarative - else:isEqual(QTLIB, multimedia):qlib = QtMultimedia - else:isEqual(QTLIB, meegographicssystemhelper):qlib = QtMeeGoGraphicsSystemHelper - else:message("Unknown QT: $$QTLIB"):qlib = - !isEmpty(qlib) { - target_qt:isEqual(TARGET, qlib) { - warning($$TARGET cannot have a QT of $$QTLIB) - } else { - DEFINES *= $$upper(QT_$${QTLIB}_LIB) - isEqual(QTLIB, opengl):CONFIG += opengl - isEqual(QTLIB, openvg):CONFIG += openvg - isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT - isEqual(QTLIB, testlib):CONFIG += console - isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces - - qtAddLibrary($$qlib) - } - } + target_qt:isEqual(TARGET, QTLIB) { + warning($$TARGET cannot have a QT of $$QTLIB) + next() + } + qtAddModule($$QTLIB) + QT_DEPENDS += $$eval(QT.$${QTLIB}.depends) } +# add include paths for all .depends, since module/application might need f.ex. template specializations etc. +QT_DEPENDS -= $$QT +for(QTLIB, $$list($$lower($$unique(QT_DEPENDS)))):INCLUDEPATH += $$INCLUDEPATH $$eval(QT.$${QTLIB}.includes) + qt_compat { !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index de1cac4651..5afd82c84a 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -14,7 +14,17 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \ $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) { debug(1, "Loading modules from $${dir}") - for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod) + for(mod, $$list($$files($$dir/modules/qt_*.pri))) { + # For installed Qt these paths will be common for all modules + # For development these will vary per module, and syncqt will override the value in the + # qt_<module>.pri forwarding file + QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] + QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] + QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS] + QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] + QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS] + include($$mod) + } } } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 5baf7ce2b4..b16c84864f 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -92,12 +92,79 @@ defineTest(qtAddLibrary) { return(true) } +defineTest(qtAddModule) { + MODULE_NAME = $$eval(QT.$${1}.name) + MODULE_INCLUDES = $$eval(QT.$${1}.includes) + MODULE_LIBS = $$eval(QT.$${1}.libs) + + CONFIG += $$eval(QT.$${1}.CONFIG) + DEFINES += $$eval(QT.$${1}.DEFINES) + + INCLUDEPATH -= $$MODULE_INCLUDES + INCLUDEPATH = $$MODULE_INCLUDES $$INCLUDEPATH + + unset(LINKAGE) + mac { + CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced + QMAKE_FRAMEWORKPATH *= $${MODULE_LIBS} + FRAMEWORK_INCLUDE = $$MODULE_INCLUDES.framework/Headers + !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } + LINKAGE = -framework $${MODULE_NAME}$${QT_LIBINFIX} + } else:!qt_no_framework { #detection + for(frmwrk_dir, $$list($$MODULE_LIBS $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { + exists($${frmwrk_dir}/$${MODULE_NAME}.framework) { + QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} + FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers + !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } + LINKAGE = -framework $${MODULE_NAME} + break() + } + } + } + } + isEmpty(LINKAGE) { + # Make sure we can link to uninstalled libraries + !isEqual(MODULE_LIBS, $[QT_INSTALL_LIBS]) { + QMAKE_LIBDIR *= $$MODULE_LIBS + unix:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS" + } + if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { + win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d + mac:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}_debug + } + isEmpty(LINKAGE):LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX} + } + !isEmpty(QMAKE_LSB) { + QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT + QMAKE_LFLAGS *= -L/opt/lsb/lib + QMAKE_LFLAGS *= --lsb-shared-libs=$${MODULE_NAME}$${QT_LIBINFIX} + } + LIBS += $$LINKAGE + export(CONFIG) + export(DEFINES) + export(LIBS) + export(INCLUDEPATH) + export(QMAKE_FRAMEWORKPATH) + export(QMAKE_LFLAGS) + export(QMAKE_LIBDIR) + return(true) +} + # variable, default defineTest(qtPrepareTool) { - isEmpty($$1) { - !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2 - else:$$1 = $$[QT_INSTALL_BINS]/$$2 + MODBASE = $$[QT_INSTALL_BINS] + !isEmpty(QT_BUILD_TREE):MODBASE = $$QT_BUILD_TREE/bin + count(ARGS, 2, greaterThan) { + isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)") + else:MODBASE = $$eval(QT.$${3}.bins) } + isEmpty($$1):$$1 = $$MODBASE/$$2 $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { exists($$eval($$1).bat) { diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf new file mode 100644 index 0000000000..c49a41581f --- /dev/null +++ b/mkspecs/features/qt_module.prf @@ -0,0 +1,23 @@ +# This file is loaded on-demand, before any .qmake.cache (sometimes *in* .qmake.cache), to loaded +# important settings for modules, such as paths to QtBase, settings etc. +# Consequently, we have to do some stunts to figure out where to find qmodule.pri. + +isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) { + exists($$QTDIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QTDIR/mkspecs/qmodule.pri + QMAKE_CACHE_DIR = $$dirname(_QMAKE_CACHE_) + !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/mkspecs/qmodule.pri + !exists($$QMAKE_QT_MODULE):exists($$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$QMAKE_CACHE_DIR/qtbase/mkspecs/qmodule.pri + !exists($$QMAKE_QT_MODULE):if(!isEmpty(QT_BUILD_TREE) & exists($$QT_BUILD_TREE/mkspecs/qmodule.pri)):QMAKE_QT_MODULE = $$QT_BUILD_TREE/mkspecs/qmodule.pri + !exists($$QMAKE_QT_MODULE):exists($$[QT_INSTALL_DATA]/mkspecs/qmodule.pri):QMAKE_QT_MODULE = $$[QT_INSTALL_DATA]/mkspecs/qmodule.pri +} + +!exists($$QMAKE_QT_MODULE)|!include($$QMAKE_QT_MODULE, "", true) { + error("Cannot load qmodule.pri!") +} else { + debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)") +} +mac { + !isEmpty(QMAKE_RPATHDIR){ + CONFIG += absolute_library_soname + } +} diff --git a/demos/symbianpkgrules.pri b/mkspecs/features/symbian/qt_demo.prf index ef6dfd8419..9c4d96c1da 100644 --- a/demos/symbianpkgrules.pri +++ b/mkspecs/features/symbian/qt_demo.prf @@ -1,5 +1,3 @@ -!symbian: error(Only include this file for Symbian platforms) - RSS_RULES ="group_name=\"QtDemos\";" nokiaVendor = "Nokia, Qt" diff --git a/examples/symbianpkgrules.pri b/mkspecs/features/symbian/qt_example.prf index fe9b487d55..8c523fb00f 100644 --- a/examples/symbianpkgrules.pri +++ b/mkspecs/features/symbian/qt_example.prf @@ -1,5 +1,3 @@ -!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 } - diff --git a/mkspecs/features/uitools.prf b/mkspecs/features/uitools.prf index 65995770de..10835d4ab3 100644 --- a/mkspecs/features/uitools.prf +++ b/mkspecs/features/uitools.prf @@ -11,4 +11,4 @@ CONFIG(debug, debug|release) { } LIBS += $$QTUITOOLS_LINKAGE -INCLUDEPATH = $$QMAKE_INCDIR_QT/QtUiTools $$INCLUDEPATH +INCLUDEPATH = $$QT.uitools.includes $$INCLUDEPATH diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/qaxcontainer.prf index 34c6dfed42..2d0ff851ba 100644 --- a/mkspecs/features/win32/qaxcontainer.prf +++ b/mkspecs/features/win32/qaxcontainer.prf @@ -8,6 +8,10 @@ LIBS += -lQAxContainer } +QMAKE_LIBDIR += $$QT.activeqt.libs +INCLUDEPATH += $$QT.activeqt.includes +QMAKE_LIBS += $$QMAKE_LIBS_GUI + qtPrepareTool(QMAKE_DUMPCPP, dumpcpp) dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf index a6c0869540..678c2ccb83 100644 --- a/mkspecs/features/win32/qaxserver.prf +++ b/mkspecs/features/win32/qaxserver.prf @@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 DEFINES += QAXSERVER +INCLUDEPATH += $$QT.activeqt.includes 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 + QMAKE_LIBDIR += $$QT.activeqt.libs + QMAKE_LIBS += $$QMAKE_LIBS_GUI } diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 4f3b1137f5..61e7ac55ca 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2570,6 +2570,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) { continue; } + if((suffix == "install_subtargets" || suffix == "uninstall_subtargets") + && project->values(subTarget->name + ".CONFIG").indexOf("no_default_install") != -1) { + continue; + } QString targetRule = subTarget->target + "-" + suffix; if(flags & SubTargetOrdered) targetRule += "-ordered"; diff --git a/qmake/project.cpp b/qmake/project.cpp index d4fa786ac5..993c16185e 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -81,7 +81,7 @@ enum ExpandFunc { E_MEMBER=1, E_FIRST, E_LAST, E_CAT, E_FROMFILE, E_EVAL, E_LIST E_SPRINTF, E_JOIN, E_SPLIT, E_BASENAME, E_DIRNAME, E_SECTION, E_FIND, E_SYSTEM, E_UNIQUE, E_QUOTE, E_ESCAPE_EXPAND, E_UPPER, E_LOWER, E_FILES, E_PROMPT, E_RE_ESCAPE, E_REPLACE, - E_SIZE, E_GENERATE_UID }; + E_SIZE, E_GENERATE_UID, E_RESOLVE_DEPENDS }; QMap<QString, ExpandFunc> qmake_expandFunctions() { static QMap<QString, ExpandFunc> *qmake_expand_functions = 0; @@ -114,6 +114,7 @@ QMap<QString, ExpandFunc> qmake_expandFunctions() qmake_expand_functions->insert("replace", E_REPLACE); qmake_expand_functions->insert("size", E_SIZE); qmake_expand_functions->insert("generate_uid", E_GENERATE_UID); + qmake_expand_functions->insert("resolve_depends", E_RESOLVE_DEPENDS); } return *qmake_expand_functions; } @@ -1800,6 +1801,39 @@ QMakeProject::doProjectExpand(QString func, QStringList args, // defined in symbian generator extern QString generate_test_uid(const QString& target); + +void calculateDeps(QStringList &sortedList, const QString &item, const QString &prefix, + QStringList &org, QMap<QString, QStringList> &place) +{ + if (sortedList.contains(item)) + return; + + foreach(QString dep, place.value(prefix + item + ".depends")) { + calculateDeps(sortedList, dep, prefix, org, place); + if (org.isEmpty()) + break; + } + + if (org.contains(item)) { + sortedList += item; + org.removeAll(item); + } +} + +QStringList +QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, + QMap<QString, QStringList> &place) +{ + QStringList sortedList; + QStringList org = deps; + foreach(QString item, deps) { + calculateDeps(sortedList, item, prefix, org, place); + if (org.isEmpty()) + break; + } + return sortedList; +} + QStringList QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, QMap<QString, QStringList> &place) @@ -2246,6 +2280,16 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list, ret += generate_test_uid(args.first()); } break; + case E_RESOLVE_DEPENDS: { + if(args.count() < 1 || args.count() > 2) { + fprintf(stderr, "%s:%d: resolve_depends(var, prefix) requires one or two arguments.\n", + parser.file.toLatin1().constData(), parser.line_no); + } else { + ret += resolveDepends(args[0].split(QString(Option::field_sep)), + (args.count() != 2 ? QString() : args[1]), + place); + } + break; } default: { fprintf(stderr, "%s:%d: Unknown replace function: %s\n", parser.file.toLatin1().constData(), parser.line_no, diff --git a/qmake/project.h b/qmake/project.h index 0e6131d3a2..aea18afd52 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -107,6 +107,7 @@ class QMakeProject QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0); void init(QMakeProperty *, const QMap<QString, QStringList> *); QStringList &values(const QString &v, QMap<QString, QStringList> &place); + QStringList resolveDepends(const QStringList &deps, const QString &prefix, QMap<QString, QStringList> &place); void validateModes(); public: diff --git a/qtbase.pro b/qtbase.pro index 408c8e580c..d3ca3e1d9a 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -7,46 +7,14 @@ TEMPLATE = subdirs cross_compile: CONFIG += nostrip -isEmpty(QT_BUILD_PARTS) { #defaults - symbian { - QT_BUILD_PARTS = libs tools examples demos - } else { - QT_BUILD_PARTS = libs tools examples demos docs translations - } -} else { #make sure the order makes sense - contains(QT_BUILD_PARTS, translations) { - QT_BUILD_PARTS -= translations - QT_BUILD_PARTS = translations $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, tools) { - QT_BUILD_PARTS -= tools - QT_BUILD_PARTS = tools $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, libs) { - QT_BUILD_PARTS -= libs - QT_BUILD_PARTS = libs $$QT_BUILD_PARTS - } - contains(QT_BUILD_PARTS, qmake) { - QT_BUILD_PARTS -= qmake - QT_BUILD_PARTS = qmake $$QT_BUILD_PARTS - } -} - #process the projects for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { - isEqual(PROJECT, tools) { - SUBDIRS += tools - } else:isEqual(PROJECT, examples) { + isEqual(PROJECT, examples) { SUBDIRS += examples } else:isEqual(PROJECT, demos) { SUBDIRS += demos } else:isEqual(PROJECT, libs) { include(src/src.pro) - } else:isEqual(PROJECT, docs) { - contains(QT_BUILD_PARTS, tools):include(doc/doc.pri) - } else:isEqual(PROJECT, translations) { - !contains(QT_BUILD_PARTS, tools):!wince*:SUBDIRS += tools/linguist/lrelease - SUBDIRS += translations } else:isEqual(PROJECT, qmake) { # SUBDIRS += qmake } else { @@ -54,6 +22,12 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } } +module_qtbase_tests.subdir = tests +module_qtbase_tests.target = module-qtbase-tests +module_qtbase_tests.depends = module_qtbase_src +module_qtbase_tests.CONFIG = no_default_target no_default_install +SUBDIRS += module_qtbase_tests + !symbian: confclean.depends += clean confclean.commands = unix:!symbian { @@ -163,10 +137,3 @@ win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { mkspecs.files += $$QT_BUILD_TREE/mkspecs/default } INSTALLS += mkspecs - -false:macx { #mac install location - macdocs.files = $$htmldocs.files - macdocs.path = /Developer/Documentation/Qt - INSTALLS += macdocs -} - diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index cd23e5e855..5ed5a25a4d 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -35,4 +35,6 @@ integrity:HEADERS += arch/qatomic_integrity.h QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH DEPENDPATH += $$QT_ARCH_CPP -include($$QT_ARCH_CPP/arch.pri, "", true) +!isEmpty(QT_ARCH) { + include($$QT_ARCH_CPP/arch.pri, "", true) +}
\ No newline at end of file diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 58d2c7b2c6..4efb1b9a22 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -1,3 +1,4 @@ +MODULE = core TARGET = QtCore QPRO_PWD = $$PWD QT = diff --git a/src/modules/qt_core.pri b/src/modules/qt_core.pri new file mode 100644 index 0000000000..9636fb2500 --- /dev/null +++ b/src/modules/qt_core.pri @@ -0,0 +1,15 @@ +QT_CORE_VERSION = $$QT_VERSION +QT_CORE_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_CORE_MINOR_VERSION = $$QT_MINOR_VERSION +QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.core.name = QtCore +QT.core.bins = $$QT_MODULE_BIN_BASE +QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore +QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private +QT.core.sources = $$QT_MODULE_BASE/src/corelib +QT.core.libs = $$QT_MODULE_LIB_BASE +QT.core.plugins = $$QT_MODULE_PLUGIN_BASE +QT.core.imports = $$QT_MODULE_IMPORT_BASE +QT.core.depends = +QT.core.DEFINES = QT_CORE_LIB diff --git a/src/modules/qt_dbus.pri b/src/modules/qt_dbus.pri new file mode 100644 index 0000000000..13c9914f0d --- /dev/null +++ b/src/modules/qt_dbus.pri @@ -0,0 +1,16 @@ +QT_DBUS_VERSION = $$QT_VERSION +QT_DBUS_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_DBUS_MINOR_VERSION = $$QT_MINOR_VERSION +QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.dbus.name = QtDBus +QT.dbus.bins = $$QT_MODULE_BIN_BASE +QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus +QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private +QT.dbus.sources = $$QT_MODULE_BASE/src/dbus +QT.dbus.libs = $$QT_MODULE_LIB_BASE +QT.dbus.plugins = $$QT_MODULE_PLUGIN_BASE +QT.dbus.imports = $$QT_MODULE_IMPORT_BASE +QT.dbus.depends = core xml +QT.dbus.CONFIG = dbusadaptors dbusinterfaces +QT.dbus.DEFINES = QT_DBUS_LIB diff --git a/src/modules/qt_gui.pri b/src/modules/qt_gui.pri new file mode 100644 index 0000000000..444f5c4804 --- /dev/null +++ b/src/modules/qt_gui.pri @@ -0,0 +1,14 @@ +QT_GUI_VERSION = $$QT_VERSION +QT_GUI_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_GUI_MINOR_VERSION = $$QT_MINOR_VERSION +QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.gui.name = QtGui +QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui +QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private +QT.gui.sources = $$QT_MODULE_BASE/src/gui +QT.gui.libs = $$QT_MODULE_LIB_BASE +QT.gui.plugins = $$QT_MODULE_PLUGIN_BASE +QT.gui.imports = $$QT_MODULE_IMPORT_BASE +QT.gui.depends = core network +QT.gui.DEFINES = QT_GUI_LIB diff --git a/src/modules/qt_network.pri b/src/modules/qt_network.pri new file mode 100644 index 0000000000..f54afd21a0 --- /dev/null +++ b/src/modules/qt_network.pri @@ -0,0 +1,15 @@ +QT_CORE_VERSION = $$QT_VERSION +QT_NETWORK_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_NETWORK_MINOR_VERSION = $$QT_MINOR_VERSION +QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.network.name = QtNetwork +QT.network.bins = $$QT_MODULE_BIN_BASE +QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork +QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private +QT.network.sources = $$QT_MODULE_BASE/src/network +QT.network.libs = $$QT_MODULE_LIB_BASE +QT.network.plugins = $$QT_MODULE_PLUGIN_BASE +QT.network.imports = $$QT_MODULE_IMPORT_BASE +QT.network.depends = core +QT.network.DEFINES = QT_NETWORK_LIB diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri new file mode 100644 index 0000000000..4d9a7029ef --- /dev/null +++ b/src/modules/qt_opengl.pri @@ -0,0 +1,16 @@ +QT_OPENGL_VERSION = $$QT_VERSION +QT_OPENGL_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_OPENGL_MINOR_VERSION = $$QT_MINOR_VERSION +QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.opengl.name = QtOpenGL +QT.opengl.bins = $$QT_MODULE_BIN_BASE +QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL +QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private +QT.opengl.sources = $$QT_MODULE_BASE/src/opengl +QT.opengl.libs = $$QT_MODULE_LIB_BASE +QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE +QT.opengl.imports = $$QT_MODULE_IMPORT_BASE +QT.opengl.depends = core gui +QT.opengl.CONFIG = opengl +QT.opengl.DEFINES = QT_OPENGL_LIB diff --git a/src/modules/qt_openvg.pri b/src/modules/qt_openvg.pri new file mode 100644 index 0000000000..1261fd99c2 --- /dev/null +++ b/src/modules/qt_openvg.pri @@ -0,0 +1,16 @@ +QT_OPENVG_VERSION = $$QT_VERSION +QT_OPENVG_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_OPENVG_MINOR_VERSION = $$QT_MINOR_VERSION +QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.openvg.name = QtOpenVG +QT.openvg.bins = $$QT_MODULE_BIN_BASE +QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG +QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private +QT.openvg.sources = $$QT_MODULE_BASE/src/openvg +QT.openvg.libs = $$QT_MODULE_LIB_BASE +QT.openvg.plugins = $$QT_MODULE_PLUGIN_BASE +QT.openvg.imports = $$QT_MODULE_IMPORT_BASE +QT.openvg.depends = core gui +QT.openvg.CONFIG = openvg +QT.openvg.DEFINES = QT_OPENVG_LIB diff --git a/src/modules/qt_sql.pri b/src/modules/qt_sql.pri new file mode 100644 index 0000000000..e7ca42a513 --- /dev/null +++ b/src/modules/qt_sql.pri @@ -0,0 +1,15 @@ +QT_SQL_VERSION = $$QT_VERSION +QT_SQL_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_SQL_MINOR_VERSION = $$QT_MINOR_VERSION +QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.sql.name = QtSql +QT.sql.bins = $$QT_MODULE_BIN_BASE +QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql +QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private +QT.sql.sources = $$QT_MODULE_BASE/src/sql +QT.sql.libs = $$QT_MODULE_LIB_BASE +QT.sql.plugins = $$QT_MODULE_PLUGIN_BASE +QT.sql.imports = $$QT_MODULE_IMPORT_BASE +QT.sql.depends = core +QT.sql.DEFINES = QT_SQL_LIB diff --git a/src/modules/qt_testlib.pri b/src/modules/qt_testlib.pri new file mode 100644 index 0000000000..6ef7939164 --- /dev/null +++ b/src/modules/qt_testlib.pri @@ -0,0 +1,16 @@ +QT_TEST_VERSION = $$QT_VERSION +QT_TEST_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_TEST_MINOR_VERSION = $$QT_MINOR_VERSION +QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.testlib.name = QtTest +QT.testlib.bins = $$QT_MODULE_BIN_BASE +QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest +QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private +QT.testlib.sources = $$QT_MODULE_BASE/src/testlib +QT.testlib.libs = $$QT_MODULE_LIB_BASE +QT.testlib.plugins = $$QT_MODULE_PLUGIN_BASE +QT.testlib.imports = $$QT_MODULE_IMPORT_BASE +QT.testlib.depends = core +QT.testlib.CONFIG = console +QT.testlib.DEFINES = QT_TESTLIB_LIB diff --git a/src/modules/qt_uilib.pri b/src/modules/qt_uilib.pri new file mode 100644 index 0000000000..7e1dc7ccd2 --- /dev/null +++ b/src/modules/qt_uilib.pri @@ -0,0 +1,14 @@ +QT_UILIB_VERSION = $$QT_VERSION +QT_UILIB_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_UILIB_MINOR_VERSION = $$QT_MINOR_VERSION +QT_UILIB_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.uilib.name = +QT.uilib.bins = $$QT_MODULE_BIN_BASE +QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner +QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private +QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib +QT.uilib.libs = $$QT_MODULE_LIB_BASE +QT.uilib.plugins = $$QT_MODULE_PLUGIN_BASE +QT.uilib.imports = $$QT_MODULE_IMPORT_BASE +QT.uilib.depends = xml diff --git a/src/modules/qt_uitools.pri b/src/modules/qt_uitools.pri new file mode 100644 index 0000000000..d221007684 --- /dev/null +++ b/src/modules/qt_uitools.pri @@ -0,0 +1,17 @@ +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/uitools +QT.uitools.libs = $$QT_MODULE_LIB_BASE +QT.uitools.plugins = $$QT_MODULE_PLUGIN_BASE +QT.uitools.imports = $$QT_MODULE_IMPORT_BASE +QT.uitools.depends = xml +QT.uitools.DEFINES = QT_UITOOLS_LIB + +QT_CONFIG += uitools diff --git a/src/modules/qt_xml.pri b/src/modules/qt_xml.pri new file mode 100644 index 0000000000..0ede3d2ddf --- /dev/null +++ b/src/modules/qt_xml.pri @@ -0,0 +1,15 @@ +QT_XML_VERSION = $$QT_VERSION +QT_XML_MAJOR_VERSION = $$QT_MAJOR_VERSION +QT_XML_MINOR_VERSION = $$QT_MINOR_VERSION +QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION + +QT.xml.name = QtXml +QT.xml.bins = $$QT_MODULE_BIN_BASE +QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml +QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private +QT.xml.sources = $$QT_MODULE_BASE/src/xml +QT.xml.libs = $$QT_MODULE_LIB_BASE +QT.xml.plugins = $$QT_MODULE_PLUGIN_BASE +QT.xml.imports = $$QT_MODULE_IMPORT_BASE +QT.xml.depends = core +QT.xml.DEFINES = QT_XML_LIB diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro index a7caf07106..26c7d3066d 100644 --- a/src/plugins/accessible/accessible.pro +++ b/src/plugins/accessible/accessible.pro @@ -2,5 +2,4 @@ TEMPLATE = subdirs contains(QT_CONFIG, accessibility) { SUBDIRS += widgets - contains(QT_CONFIG, qt3support):SUBDIRS += compat } diff --git a/src/plugins/accessible/widgets/widgets.pro b/src/plugins/accessible/widgets/widgets.pro index 79110cbcd4..092f3ca32c 100644 --- a/src/plugins/accessible/widgets/widgets.pro +++ b/src/plugins/accessible/widgets/widgets.pro @@ -2,7 +2,7 @@ TARGET = qtaccessiblewidgets include(../../qpluginbase.pri) include (../qaccessiblebase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/accessible +DESTDIR = $$QT.gui.plugins/accessible QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" diff --git a/src/plugins/bearer/connman/connman.pro b/src/plugins/bearer/connman/connman.pro index dec408c724..3ac54c3769 100644 --- a/src/plugins/bearer/connman/connman.pro +++ b/src/plugins/bearer/connman/connman.pro @@ -15,7 +15,7 @@ SOURCES += main.cpp \ qconnmanengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro index 90078e9290..ae5371a715 100644 --- a/src/plugins/bearer/corewlan/corewlan.pro +++ b/src/plugins/bearer/corewlan/corewlan.pro @@ -20,6 +20,6 @@ SOURCES += main.cpp \ OBJECTIVE_SOURCES += qcorewlanengine.mm -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/generic/generic.pro b/src/plugins/bearer/generic/generic.pro index c967f8c6dc..94ab36ce59 100644 --- a/src/plugins/bearer/generic/generic.pro +++ b/src/plugins/bearer/generic/generic.pro @@ -11,6 +11,6 @@ SOURCES += qgenericengine.cpp \ ../qnetworksession_impl.cpp \ main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/icd/icd.pro b/src/plugins/bearer/icd/icd.pro index 6700cdaaa8..4737045ae7 100644 --- a/src/plugins/bearer/icd/icd.pro +++ b/src/plugins/bearer/icd/icd.pro @@ -28,6 +28,6 @@ SOURCES += main.cpp \ include(../../../3rdparty/libgq.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/nativewifi/nativewifi.pro b/src/plugins/bearer/nativewifi/nativewifi.pro index 36dd36db19..6df346cd46 100644 --- a/src/plugins/bearer/nativewifi/nativewifi.pro +++ b/src/plugins/bearer/nativewifi/nativewifi.pro @@ -12,6 +12,6 @@ SOURCES += main.cpp \ qnativewifiengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/networkmanager/networkmanager.pro b/src/plugins/bearer/networkmanager/networkmanager.pro index e39626336c..b3e088344d 100644 --- a/src/plugins/bearer/networkmanager/networkmanager.pro +++ b/src/plugins/bearer/networkmanager/networkmanager.pro @@ -15,6 +15,6 @@ SOURCES += main.cpp \ qnetworkmanagerengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/nla/nla.pro b/src/plugins/bearer/nla/nla.pro index 5dfb6d7e2d..ecf958f559 100644 --- a/src/plugins/bearer/nla/nla.pro +++ b/src/plugins/bearer/nla/nla.pro @@ -18,6 +18,6 @@ SOURCES += main.cpp \ qnlaengine.cpp \ ../qnetworksession_impl.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index 8d92f57b68..5d2ae1a5cd 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/src/plugins/bearer/symbian/symbian.pri @@ -27,6 +27,6 @@ is_using_gnupoc { LIBS += -lConnMon } -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer +DESTDIR = $$QT.network.plugins/bearer target.path += $$[QT_INSTALL_PLUGINS]/bearer INSTALLS += target diff --git a/src/plugins/codecs/cn/cn.pro b/src/plugins/codecs/cn/cn.pro index b0a8a91779..51a2f41372 100644 --- a/src/plugins/codecs/cn/cn.pro +++ b/src/plugins/codecs/cn/cn.pro @@ -2,7 +2,7 @@ TARGET = qcncodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qgb18030codec.h diff --git a/src/plugins/codecs/jp/jp.pro b/src/plugins/codecs/jp/jp.pro index 6480e43418..e6b7a4bb7f 100644 --- a/src/plugins/codecs/jp/jp.pro +++ b/src/plugins/codecs/jp/jp.pro @@ -2,7 +2,7 @@ TARGET = qjpcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qjpunicode.h \ diff --git a/src/plugins/codecs/kr/kr.pro b/src/plugins/codecs/kr/kr.pro index 1cc28d80a5..14c162c6e8 100644 --- a/src/plugins/codecs/kr/kr.pro +++ b/src/plugins/codecs/kr/kr.pro @@ -2,7 +2,7 @@ TARGET = qkrcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qeuckrcodec.h \ diff --git a/src/plugins/codecs/tw/tw.pro b/src/plugins/codecs/tw/tw.pro index 2ebb94f013..b0d5a2b68a 100644 --- a/src/plugins/codecs/tw/tw.pro +++ b/src/plugins/codecs/tw/tw.pro @@ -2,7 +2,7 @@ TARGET = qtwcodecs include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/codecs +DESTDIR = $$QT.core.plugins/codecs QT = core HEADERS = qbig5codec.h diff --git a/src/plugins/decorations/default/default.pro b/src/plugins/decorations/default/default.pro index fb41d7fcda..a30899a62b 100644 --- a/src/plugins/decorations/default/default.pro +++ b/src/plugins/decorations/default/default.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationdefault_qws.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/src/plugins/decorations/styled/styled.pro b/src/plugins/decorations/styled/styled.pro index 5879992e89..151ef88178 100644 --- a/src/plugins/decorations/styled/styled.pro +++ b/src/plugins/decorations/styled/styled.pro @@ -1,7 +1,7 @@ TARGET = qdecorationstyled include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/src/plugins/decorations/windows/windows.pro b/src/plugins/decorations/windows/windows.pro index 3cac77de31..7f788a3d7e 100644 --- a/src/plugins/decorations/windows/windows.pro +++ b/src/plugins/decorations/windows/windows.pro @@ -5,6 +5,6 @@ HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.h SOURCES = main.cpp \ $$QT_SOURCE_TREE/src/gui/embedded/qdecorationwindows_qws.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/decorations +DESTDIR = $$QT.gui.plugins/decorations target.path += $$[QT_INSTALL_PLUGINS]/decorations INSTALLS += target diff --git a/src/plugins/generic/linuxinput/linuxinput.pro b/src/plugins/generic/linuxinput/linuxinput.pro index ad9f6a9754..d4dc4bbbcb 100644 --- a/src/plugins/generic/linuxinput/linuxinput.pro +++ b/src/plugins/generic/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic +DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target diff --git a/src/plugins/generic/tslib/tslib.pro b/src/plugins/generic/tslib/tslib.pro index 74c7fd2b96..485152181c 100644 --- a/src/plugins/generic/tslib/tslib.pro +++ b/src/plugins/generic/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputplugin include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/generic +DESTDIR = $$QT.gui.plugins/generic target.path = $$[QT_INSTALL_PLUGINS]/generic INSTALLS += target diff --git a/src/plugins/gfxdrivers/ahi/ahi.pro b/src/plugins/gfxdrivers/ahi/ahi.pro index 6fc8a5cc8d..3abe2a76cc 100644 --- a/src/plugins/gfxdrivers/ahi/ahi.pro +++ b/src/plugins/gfxdrivers/ahi/ahi.pro @@ -1,7 +1,7 @@ TARGET = qahiscreen include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro index d397050bdc..54d11ca159 100644 --- a/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/src/plugins/gfxdrivers/directfb/directfb.pro @@ -2,7 +2,7 @@ TARGET = qdirectfbscreen include(../../qpluginbase.pri) include($$QT_SOURCE_TREE/src/gui/embedded/directfb.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/eglnullws/eglnullws.pro b/src/plugins/gfxdrivers/eglnullws/eglnullws.pro index 242ab07ecd..30cebab41a 100644 --- a/src/plugins/gfxdrivers/eglnullws/eglnullws.pro +++ b/src/plugins/gfxdrivers/eglnullws/eglnullws.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) CONFIG += warn_on QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/linuxfb/linuxfb.pro b/src/plugins/gfxdrivers/linuxfb/linuxfb.pro index 2a376e4158..c1cdc0eda7 100644 --- a/src/plugins/gfxdrivers/linuxfb/linuxfb.pro +++ b/src/plugins/gfxdrivers/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qscreenlinuxfb include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro index 675be85460..2b5212a6b3 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.pro @@ -19,7 +19,7 @@ SOURCES = \ pvreglscreen.cpp \ pvreglwindowsurface.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/qvfb/qvfb.pro b/src/plugins/gfxdrivers/qvfb/qvfb.pro index a0996e77dc..e45319db87 100644 --- a/src/plugins/gfxdrivers/qvfb/qvfb.pro +++ b/src/plugins/gfxdrivers/qvfb/qvfb.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_QVFB QT_QWS_MOUSE_QVFB QT_QWS_KBD_QVFB -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qscreenvfb_qws.h \ diff --git a/src/plugins/gfxdrivers/transformed/transformed.pro b/src/plugins/gfxdrivers/transformed/transformed.pro index 173f7e99d4..f6e07704b3 100644 --- a/src/plugins/gfxdrivers/transformed/transformed.pro +++ b/src/plugins/gfxdrivers/transformed/transformed.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_TRANSFORMED -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = $$QT_SOURCE_TREE/src/gui/embedded/qscreentransformed_qws.h SOURCES = main.cpp \ diff --git a/src/plugins/gfxdrivers/vnc/vnc.pro b/src/plugins/gfxdrivers/vnc/vnc.pro index 31da2f404e..48bad8c6e3 100644 --- a/src/plugins/gfxdrivers/vnc/vnc.pro +++ b/src/plugins/gfxdrivers/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) DEFINES += QT_QWS_VNC -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers +DESTDIR = $$QT.gui.plugins/gfxdrivers HEADERS = \ qscreenvnc_qws.h \ diff --git a/src/plugins/graphicssystems/meego/meego.pro b/src/plugins/graphicssystems/meego/meego.pro index 0d3cce622f..c497ba2eb6 100644 --- a/src/plugins/graphicssystems/meego/meego.pro +++ b/src/plugins/graphicssystems/meego/meego.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += gui opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems HEADERS = qmeegographicssystem.h qmeegopixmapdata.h qmeegoextensions.h qmeegorasterpixmapdata.h qmeegolivepixmapdata.h SOURCES = qmeegographicssystem.cpp qmeegographicssystem.h qmeegographicssystemplugin.h qmeegographicssystemplugin.cpp qmeegopixmapdata.h qmeegopixmapdata.cpp qmeegoextensions.h qmeegoextensions.cpp qmeegorasterpixmapdata.h qmeegorasterpixmapdata.cpp qmeegolivepixmapdata.cpp qmeegolivepixmapdata.h dithering.cpp diff --git a/src/plugins/graphicssystems/opengl/opengl.pro b/src/plugins/graphicssystems/opengl/opengl.pro index 47e15c5ec5..fb3cb5331a 100644 --- a/src/plugins/graphicssystems/opengl/opengl.pro +++ b/src/plugins/graphicssystems/opengl/opengl.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp diff --git a/src/plugins/graphicssystems/openvg/openvg.pro b/src/plugins/graphicssystems/openvg/openvg.pro index 781cdc42e3..6f8b13907a 100644 --- a/src/plugins/graphicssystems/openvg/openvg.pro +++ b/src/plugins/graphicssystems/openvg/openvg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp qgraphicssystem_vg.cpp HEADERS = qgraphicssystem_vg_p.h diff --git a/src/plugins/graphicssystems/shivavg/shivavg.pro b/src/plugins/graphicssystems/shivavg/shivavg.pro index b8ea12ac4a..6bf9d7a975 100644 --- a/src/plugins/graphicssystems/shivavg/shivavg.pro +++ b/src/plugins/graphicssystems/shivavg/shivavg.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp shivavggraphicssystem.cpp shivavgwindowsurface.cpp HEADERS = shivavggraphicssystem.h shivavgwindowsurface.h diff --git a/src/plugins/graphicssystems/trace/trace.pro b/src/plugins/graphicssystems/trace/trace.pro index 07472e2daf..0958a86973 100644 --- a/src/plugins/graphicssystems/trace/trace.pro +++ b/src/plugins/graphicssystems/trace/trace.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems symbian:TARGET.UID3 = 0x2002130E SOURCES = main.cpp qgraphicssystem_trace.cpp diff --git a/src/plugins/imageformats/gif/gif.pro b/src/plugins/imageformats/gif/gif.pro index 439b43136c..4b72cae6e4 100644 --- a/src/plugins/imageformats/gif/gif.pro +++ b/src/plugins/imageformats/gif/gif.pro @@ -4,7 +4,7 @@ include(../../qpluginbase.pri) include(../../../gui/image/qgifhandler.pri) SOURCES += $$PWD/main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro index eadff416e3..cef92cedc8 100644 --- a/src/plugins/imageformats/ico/ico.pro +++ b/src/plugins/imageformats/ico/ico.pro @@ -7,7 +7,7 @@ HEADERS += qicohandler.h SOURCES += main.cpp \ qicohandler.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 5fff2deb7d..66dea099aa 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -3,6 +3,5 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif !contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng -contains(QT_CONFIG, svg):SUBDIRS += svg !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro index fb254b86c6..3a0e8754c0 100644 --- a/src/plugins/imageformats/jpeg/jpeg.pro +++ b/src/plugins/imageformats/jpeg/jpeg.pro @@ -6,6 +6,6 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-jpeg)" include(../../../gui/image/qjpeghandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 88085f363c..01dc418c1b 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -12,6 +12,6 @@ symbian: { include(../../../gui/image/qmnghandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index e78152611c..e4eb21b1e7 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -6,7 +6,7 @@ QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-tiff)" include(../../../gui/image/qtiffhandler.pri) SOURCES += main.cpp -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats +DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target diff --git a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro index f8dcb2cfcb..5d0535f3ac 100644 --- a/src/plugins/inputmethods/imsw-multi/imsw-multi.pro +++ b/src/plugins/inputmethods/imsw-multi/imsw-multi.pro @@ -2,7 +2,7 @@ TARGET = qimsw-multi include(../../qpluginbase.pri) CONFIG += warn_on -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/inputmethods +DESTDIR = $$QT.gui.plugins/inputmethods HEADERS += qmultiinputcontext.h \ qmultiinputcontextplugin.h diff --git a/src/plugins/kbddrivers/linuxinput/linuxinput.pro b/src/plugins/kbddrivers/linuxinput/linuxinput.pro index 862a22031c..c0af91c7f0 100644 --- a/src/plugins/kbddrivers/linuxinput/linuxinput.pro +++ b/src/plugins/kbddrivers/linuxinput/linuxinput.pro @@ -1,7 +1,7 @@ TARGET = qlinuxinputkbddriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/kbddrivers +DESTDIR = $$QT.gui.plugins/kbddrivers target.path = $$[QT_INSTALL_PLUGINS]/kbddrivers INSTALLS += target diff --git a/src/plugins/mousedrivers/linuxtp/linuxtp.pro b/src/plugins/mousedrivers/linuxtp/linuxtp.pro index ac1c8ff911..b8e26b4483 100644 --- a/src/plugins/mousedrivers/linuxtp/linuxtp.pro +++ b/src/plugins/mousedrivers/linuxtp/linuxtp.pro @@ -1,7 +1,7 @@ TARGET = qlinuxtpmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target diff --git a/src/plugins/mousedrivers/pc/pc.pro b/src/plugins/mousedrivers/pc/pc.pro index b93b25b8cf..d38e3fe5d1 100644 --- a/src/plugins/mousedrivers/pc/pc.pro +++ b/src/plugins/mousedrivers/pc/pc.pro @@ -1,7 +1,7 @@ TARGET = qpcmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers target.path = $$[QT_INSTALL_PLUGINS]/mousedrivers INSTALLS += target diff --git a/src/plugins/mousedrivers/tslib/tslib.pro b/src/plugins/mousedrivers/tslib/tslib.pro index 7b0748db9f..e2fa013fdb 100644 --- a/src/plugins/mousedrivers/tslib/tslib.pro +++ b/src/plugins/mousedrivers/tslib/tslib.pro @@ -1,7 +1,7 @@ TARGET = qtslibmousedriver include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mousedrivers +DESTDIR = $$QT.gui.plugins/mousedrivers HEADERS = \ $$QT_SOURCE_TREE/src/gui/embedded/qmousedriverplugin_qws.h \ diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 1633ee45c7..705e60439e 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -1,6 +1,6 @@ TARGET = qcocoa include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms OBJECTIVE_SOURCES = main.mm \ qcocoaintegration.mm \ diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 65c49e386f..4a637463ef 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -1,6 +1,6 @@ TARGET = qdirectfb include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms isEmpty(DIRECTFB_LIBS) { DIRECTFB_LIBS = -ldirectfb -lfusion -ldirect -lpthread diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro index 7ad8fd985b..3692e38e1b 100644 --- a/src/plugins/platforms/eglfs/eglfs.pro +++ b/src/plugins/platforms/eglfs/eglfs.pro @@ -4,7 +4,7 @@ CONFIG += plugin QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms #DEFINES += QEGL_EXTRA_DEBUG diff --git a/src/plugins/platforms/fb_base/fb_base.pro b/src/plugins/platforms/fb_base/fb_base.pro index e08c0c5571..4445516cc7 100644 --- a/src/plugins/platforms/fb_base/fb_base.pro +++ b/src/plugins/platforms/fb_base/fb_base.pro @@ -8,7 +8,7 @@ TARGET = fb_base #include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems TEMPLATE = lib diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index 216b899fdb..4e4fe6ff4b 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -1,7 +1,7 @@ TARGET = qlinuxfbgraphicssystem include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qlinuxfbintegration.cpp HEADERS = qlinuxfbintegration.h diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 438a88e95f..c8329387bf 100644 --- a/src/plugins/platforms/minimal/minimal.pro +++ b/src/plugins/platforms/minimal/minimal.pro @@ -1,7 +1,7 @@ TARGET = qminimal include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp \ qminimalintegration.cpp \ diff --git a/src/plugins/platforms/openkode/openkode.pro b/src/plugins/platforms/openkode/openkode.pro index c8ae4154c3..a6e7d7665a 100644 --- a/src/plugins/platforms/openkode/openkode.pro +++ b/src/plugins/platforms/openkode/openkode.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += opengl -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp \ qopenkodeintegration.cpp \ diff --git a/src/plugins/platforms/openvglite/openvglite.pro b/src/plugins/platforms/openvglite/openvglite.pro index 9d7860abe7..11e867d998 100644 --- a/src/plugins/platforms/openvglite/openvglite.pro +++ b/src/plugins/platforms/openvglite/openvglite.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += openvg -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems +DESTDIR = $$QT.gui.plugins/graphicssystems SOURCES = main.cpp qgraphicssystem_vglite.cpp qwindowsurface_vglite.cpp HEADERS = qgraphicssystem_vglite.h qwindowsurface_vglite.h diff --git a/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro index d2b332a6d5..bc17525104 100644 --- a/src/plugins/platforms/qvfb/qvfb.pro +++ b/src/plugins/platforms/qvfb/qvfb.pro @@ -1,7 +1,7 @@ TARGET = qvfbintegration include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro index 07f8d888fd..a7b8ca540a 100644 --- a/src/plugins/platforms/vnc/vnc.pro +++ b/src/plugins/platforms/vnc/vnc.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QT += network -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = main.cpp qvncintegration.cpp HEADERS = qvncintegration.h diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 8d2d4b50af..3139232afe 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -1,7 +1,7 @@ TARGET = qwayland include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms DEFINES += Q_PLATFORM_WAYLAND DEFINES += $$QMAKE_DEFINES_WAYLAND diff --git a/src/plugins/platforms/xlib/xlib.pro b/src/plugins/platforms/xlib/xlib.pro index ea77a2905b..ae02077100 100644 --- a/src/plugins/platforms/xlib/xlib.pro +++ b/src/plugins/platforms/xlib/xlib.pro @@ -1,7 +1,7 @@ TARGET = qxlib include(../../qpluginbase.pri) -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms +DESTDIR = $$QT.gui.plugins/platforms SOURCES = \ main.cpp \ diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 7479d2facb..c1aff35428 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,17 +1,15 @@ TEMPLATE = subdirs -SUBDIRS *= sqldrivers script bearer +SUBDIRS *= sqldrivers bearer unix:!symbian { contains(QT_CONFIG,iconv)|contains(QT_CONFIG,gnu-libiconv)|contains(QT_CONFIG,sun-libiconv):SUBDIRS *= codecs } else { SUBDIRS *= codecs } -!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines +!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats !embedded:!qpa:SUBDIRS *= graphicssystems embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible symbian:SUBDIRS += s60 -contains(QT_CONFIG, phonon): SUBDIRS *= phonon qpa:SUBDIRS += platforms -contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri index 4e1510299b..0cde7d2277 100644 --- a/src/plugins/s60/s60pluginbase.pri +++ b/src/plugins/s60/s60pluginbase.pri @@ -4,7 +4,7 @@ include(../qpluginbase.pri) CONFIG -= plugin -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/s60 +DESTDIR = $$QT.gui.plugins/s60 MMP_RULES += NOEXPORTLIBRARY diff --git a/src/plugins/sqldrivers/qsqldriverbase.pri b/src/plugins/sqldrivers/qsqldriverbase.pri index 2f6943ab9a..64f55fda78 100644 --- a/src/plugins/sqldrivers/qsqldriverbase.pri +++ b/src/plugins/sqldrivers/qsqldriverbase.pri @@ -1,6 +1,6 @@ include(../qpluginbase.pri) QT = core sql -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/sqldrivers +DESTDIR = $$QT.sql.plugins/sqldrivers target.path += $$[QT_INSTALL_PLUGINS]/sqldrivers INSTALLS += target diff --git a/src/qbase.pri b/src/qbase.pri index ce69757378..4ff17630c5 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -1,5 +1,10 @@ +load(qt_module) + +isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0) isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") -INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat + +MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) +INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib @@ -11,7 +16,10 @@ isEmpty(QT_MAJOR_VERSION) { #load up the headers info CONFIG += qt_install_headers -HEADERS_PRI = $$QT_BUILD_TREE/include/$$TARGET/headers.pri +#headers.pri is loaded from the last include path +LAST_MODULE_INCLUDE=$$MODULE_INCLUDES +for(include_path, MODULE_INCLUDES):LAST_MODULE_INCLUDE=$${include_path} +HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) #version overriding @@ -161,7 +169,7 @@ win32-g++* { contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS -contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT +contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION diff --git a/src/src.pro b/src/src.pro index 0908911e6c..491973c635 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,33 +4,18 @@ TEMPLATE = subdirs unset(SRC_SUBDIRS) win32:SRC_SUBDIRS += src_winmain symbian:SRC_SUBDIRS += src_s60main -SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib +SRC_SUBDIRS += src_corelib src_network src_sql src_testlib src_xml src_uitools nacl: SRC_SUBDIRS -= src_network src_testlib !symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus !contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui -!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro) -win32:SRC_SUBDIRS += src_activeqt contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg -contains(QT_CONFIG, xmlpatterns): SRC_SUBDIRS += src_xmlpatterns -contains(QT_CONFIG, phonon): SRC_SUBDIRS += src_phonon -contains(QT_CONFIG, multimedia): SRC_SUBDIRS += src_multimedia -contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg -contains(QT_CONFIG, script): SRC_SUBDIRS += src_script -contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_declarative -contains(QT_CONFIG, webkit) { - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro): SRC_SUBDIRS += src_javascriptcore - SRC_SUBDIRS += src_webkit -} -!contains(QT_CONFIG, no-gui):contains(QT_CONFIG, scripttools): SRC_SUBDIRS += src_scripttools SRC_SUBDIRS += src_plugins -contains(QT_CONFIG, declarative): SRC_SUBDIRS += src_imports -contains(QT_CONFIG, declarative):contains(QT_CONFIG, webkit): SRC_SUBDIRS += src_webkit_declarative -# s60installs need to be at the end, because projects.pro does an ordered build, +# s60installs need to be at the end, because qtbase.pro does an ordered build, # and s60installs depends on all the others. symbian:SRC_SUBDIRS += src_s60installs @@ -44,8 +29,8 @@ src_corelib.subdir = $$QT_SOURCE_TREE/src/corelib src_corelib.target = sub-corelib src_xml.subdir = $$QT_SOURCE_TREE/src/xml src_xml.target = sub-xml -src_xmlpatterns.subdir = $$QT_SOURCE_TREE/src/xmlpatterns -src_xmlpatterns.target = sub-xmlpatterns +src_uitools.subdir = $$QT_SOURCE_TREE/src/uitools +src_uitools.target = sub-uitools src_dbus.subdir = $$QT_SOURCE_TREE/src/dbus src_dbus.target = sub-dbus src_gui.subdir = $$QT_SOURCE_TREE/src/gui @@ -54,38 +39,14 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql src_sql.target = sub-sql src_network.subdir = $$QT_SOURCE_TREE/src/network src_network.target = sub-network -src_svg.subdir = $$QT_SOURCE_TREE/src/svg -src_svg.target = sub-svg -src_script.subdir = $$QT_SOURCE_TREE/src/script -src_script.target = sub-script -src_scripttools.subdir = $$QT_SOURCE_TREE/src/scripttools -src_scripttools.target = sub-scripttools src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl src_opengl.target = sub-opengl src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg src_openvg.target = sub-openvg -src_qt3support.subdir = $$QT_SOURCE_TREE/src/qt3support -src_qt3support.target = sub-qt3support -src_phonon.subdir = $$QT_SOURCE_TREE/src/phonon -src_phonon.target = sub-phonon -src_multimedia.subdir = $$QT_SOURCE_TREE/src/multimedia -src_multimedia.target = sub-multimedia -src_activeqt.subdir = $$QT_SOURCE_TREE/src/activeqt -src_activeqt.target = sub-activeqt src_plugins.subdir = $$QT_SOURCE_TREE/src/plugins src_plugins.target = sub-plugins -src_imports.subdir = $$QT_SOURCE_TREE/src/imports -src_imports.target = sub-imports src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib -src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore -src_javascriptcore.target = sub-javascriptcore -src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebCore -src_webkit.target = sub-webkit -src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative -src_declarative.target = sub-declarative -src_webkit_declarative.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative -src_webkit_declarative.target = sub-webkitdeclarative #CONFIG += ordered !wince*:!ordered:!symbian-abld:!symbian-sbsv2 { @@ -93,57 +54,23 @@ src_webkit_declarative.target = sub-webkitdeclarative src_gui.depends = src_corelib src_tools_uic embedded: src_gui.depends += src_network src_xml.depends = src_corelib - src_xmlpatterns.depends = src_corelib src_network + src_uitools.depends = src_corelib src_xml src_dbus.depends = src_corelib src_xml - src_svg.depends = src_corelib src_gui - src_script.depends = src_corelib - src_scripttools.depends = src_script src_gui src_network src_network.depends = src_corelib src_opengl.depends = src_gui src_openvg.depends = src_gui src_sql.depends = src_corelib src_testlib.depends = src_corelib - src_qt3support.depends = src_gui src_xml src_network src_sql src_tools_idc.depends = src_corelib # target defined in tools.pro src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro - src_phonon.depends = src_gui - src_multimedia.depends = src_gui - contains(QT_CONFIG, opengl):src_multimedia.depends += src_opengl - src_activeqt.depends = src_tools_idc src_gui - src_declarative.depends = src_gui src_script src_network - src_plugins.depends = src_gui src_sql src_svg - contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia - contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative + src_plugins.depends = src_gui src_sql src_xml src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS src_s60installs.depends -= src_s60installs - src_imports.depends = src_gui src_declarative - contains(QT_CONFIG, webkit) { - src_webkit.depends = src_gui src_sql src_network - contains(QT_CONFIG, xmlpatterns): src_webkit.depends += src_xmlpatterns - src_imports.depends += src_webkit - exists($$QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro) { - src_webkit.depends += src_javascriptcore - src_javascriptcore.depends = src_corelib - } - } - contains(QT_CONFIG, qt3support): src_plugins.depends += src_qt3support - contains(QT_CONFIG, dbus):{ - src_plugins.depends += src_dbus - src_phonon.depends += src_dbus - } contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { src_plugins.depends += src_opengl src_declarative.depends += src_opengl src_webkit.depends += src_opengl } - contains(QT_CONFIG, xmlpatterns) { - src_declarative.depends += src_xmlpatterns - src_webkit.depends += src_xmlpatterns - } - contains(QT_CONFIG, svg) { - src_declarative.depends += src_svg - } - contains(QT_CONFIG, webkit) : contains(QT_CONFIG, declarative): src_webkit_declarative.depends = src_declarative src_webkit } diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 4736d09cbe..ca42da6edf 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -3,7 +3,6 @@ TEMPLATE = subdirs TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_CONFIG, no-gui): TOOLS_SUBDIRS += src_tools_uic !cross_compile { - contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_tools_uic3 win32:!wince*: SRC_SUBDIRS += src_tools_idc } @@ -16,8 +15,6 @@ src_tools_rcc.subdir = $$QT_SOURCE_TREE/src/tools/rcc src_tools_rcc.target = sub-rcc src_tools_uic.subdir = $$QT_SOURCE_TREE/src/tools/uic src_tools_uic.target = sub-uic -src_tools_uic3.subdir = $$QT_SOURCE_TREE/src/tools/uic3 -src_tools_uic3.target = sub-uic3 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc src_tools_idc.target = sub-idc @@ -43,7 +40,7 @@ EXTRA_RELEASE_TARGETS = subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP) subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP) SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE)) - !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info { + !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc)):!separate_debug_info { #debug debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug) diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h new file mode 100644 index 0000000000..35b4f928ef --- /dev/null +++ b/src/tools/uic/qclass_lib_map.h @@ -0,0 +1,1437 @@ +QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h) +QT_CLASS_LIB(QAnimationDriver, QtCore, qabstractanimation.h) +QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h) +QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h) +QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h) +QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h) +QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h) +QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h) +QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h) +QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h) +QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h) +QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h) +QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h) +QT_CLASS_LIB(QFuture, QtCore, qfuture.h) +QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h) +QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h) +QT_CLASS_LIB(QFuture, QtCore, qfuture.h) +QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h) +QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h) +QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h) +QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h) +QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h) +QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h) +QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h) +QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h) +QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h) +QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h) +QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h) +QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h) +QT_CLASS_LIB(QtEndian, QtCore, qendian.h) +QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h) +QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) +QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) +QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) +QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) +QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h) +QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h) +QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h) +QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h) +QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h) +QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h) +QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h) +QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h) +QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h) +QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h) +QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h) +QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h) +QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h) +QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h) +QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h) +QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h) +QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h) +QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h) +QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) +QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h) +QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h) +QT_CLASS_LIB(QBool, QtCore, qglobal.h) +QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) +QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h) +QT_CLASS_LIB(QFlag, QtCore, qglobal.h) +QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h) +QT_CLASS_LIB(QFlags, QtCore, qglobal.h) +QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h) +QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h) +QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h) +QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h) +QT_CLASS_LIB(Qt, QtCore, qnamespace.h) +QT_CLASS_LIB(QInternal, QtCore, qnamespace.h) +QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h) +QT_CLASS_LIB(QtConfig, QtCore, qconfig.h) +QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h) +QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h) +QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h) +QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h) +QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h) +QT_CLASS_LIB(QtDebug, QtCore, qdebug.h) +QT_CLASS_LIB(QDebug, QtCore, qdebug.h) +QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h) +QT_CLASS_LIB(QDir, QtCore, qdir.h) +QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h) +QT_CLASS_LIB(QFile, QtCore, qfile.h) +QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h) +QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h) +QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h) +QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h) +QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h) +QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h) +QT_CLASS_LIB(Q_PID, QtCore, qprocess.h) +QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h) +QT_CLASS_LIB(QProcess, QtCore, qprocess.h) +QT_CLASS_LIB(QResource, QtCore, qresource.h) +QT_CLASS_LIB(QSettings, QtCore, qsettings.h) +QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h) +QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h) +QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h) +QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h) +QT_CLASS_LIB(QTS, QtCore, qtextstream.h) +QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h) +QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h) +QT_CLASS_LIB(QUrl, QtCore, qurl.h) +QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h) +QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h) +QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h) +QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h) +QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h) +QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h) +QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h) +QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h) +QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h) +QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h) +QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h) +QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h) +QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h) +QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h) +QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h) +QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h) +QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h) +QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h) +QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h) +QT_CLASS_LIB(QObjectList, QtCore, qobject.h) +QT_CLASS_LIB(QObjectData, QtCore, qobject.h) +QT_CLASS_LIB(QObject, QtCore, qobject.h) +QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h) +QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h) +QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h) +QT_CLASS_LIB(QPointer, QtCore, qpointer.h) +QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h) +QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h) +QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h) +QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h) +QT_CLASS_LIB(QTimer, QtCore, qtimer.h) +QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h) +QT_CLASS_LIB(QVariant, QtCore, qvariant.h) +QT_CLASS_LIB(QVariantList, QtCore, qvariant.h) +QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h) +QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h) +QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h) +QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h) +QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h) +QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h) +QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h) +QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h) +QT_CLASS_LIB(QUuid, QtCore, quuid.h) +QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h) +QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h) +QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h) +QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h) +QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h) +QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h) +QT_CLASS_LIB(QState, QtCore, qstate.h) +QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h) +QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h) +QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h) +QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h) +QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h) +QT_CLASS_LIB(QMutex, QtCore, qmutex.h) +QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h) +QT_CLASS_LIB(QMutexData, QtCore, qmutex.h) +QT_CLASS_LIB(QMutex, QtCore, qmutex.h) +QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h) +QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h) +QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h) +QT_CLASS_LIB(QThread, QtCore, qthread.h) +QT_CLASS_LIB(QThread, QtCore, qthread.h) +QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h) +QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h) +QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h) +QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h) +QT_CLASS_LIB(QtAlgorithms, QtCore, qalgorithms.h) +QT_CLASS_LIB(QBitArray, QtCore, qbitarray.h) +QT_CLASS_LIB(QBitRef, QtCore, qbitarray.h) +QT_CLASS_LIB(QByteArray, QtCore, qbytearray.h) +QT_CLASS_LIB(QByteRef, QtCore, qbytearray.h) +QT_CLASS_LIB(QByteArrayMatcher, QtCore, qbytearraymatcher.h) +QT_CLASS_LIB(QCache, QtCore, qcache.h) +QT_CLASS_LIB(QLatin1Char, QtCore, qchar.h) +QT_CLASS_LIB(QChar, QtCore, qchar.h) +QT_CLASS_LIB(QtContainerFwd, QtCore, qcontainerfwd.h) +QT_CLASS_LIB(QContiguousCacheData, QtCore, qcontiguouscache.h) +QT_CLASS_LIB(QContiguousCacheTypedData, QtCore, qcontiguouscache.h) +QT_CLASS_LIB(QContiguousCache, QtCore, qcontiguouscache.h) +QT_CLASS_LIB(QCryptographicHash, QtCore, qcryptographichash.h) +QT_CLASS_LIB(QDate, QtCore, qdatetime.h) +QT_CLASS_LIB(QTime, QtCore, qdatetime.h) +QT_CLASS_LIB(QDateTime, QtCore, qdatetime.h) +QT_CLASS_LIB(QEasingCurve, QtCore, qeasingcurve.h) +QT_CLASS_LIB(QElapsedTimer, QtCore, qelapsedtimer.h) +QT_CLASS_LIB(QHashData, QtCore, qhash.h) +QT_CLASS_LIB(QHashDummyValue, QtCore, qhash.h) +QT_CLASS_LIB(QHashDummyNode, QtCore, qhash.h) +QT_CLASS_LIB(QHashNode, QtCore, qhash.h) +QT_CLASS_LIB(QHash, QtCore, qhash.h) +QT_CLASS_LIB(QMultiHash, QtCore, qhash.h) +QT_CLASS_LIB(QHashIterator, QtCore, qhash.h) +QT_CLASS_LIB(QMutableHashIterator, QtCore, qhash.h) +QT_CLASS_LIB(QHashIterator, QtCore, qhash.h) +QT_CLASS_LIB(QMutableHashIterator, QtCore, qhash.h) +QT_CLASS_LIB(QLine, QtCore, qline.h) +QT_CLASS_LIB(QLineF, QtCore, qline.h) +QT_CLASS_LIB(QLinkedListData, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QLinkedListNode, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QLinkedList, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QLinkedListIterator, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QMutableLinkedListIterator, QtCore, qlinkedlist.h) +QT_CLASS_LIB(QListData, QtCore, qlist.h) +QT_CLASS_LIB(QList, QtCore, qlist.h) +QT_CLASS_LIB(QListIterator, QtCore, qlist.h) +QT_CLASS_LIB(QMutableListIterator, QtCore, qlist.h) +QT_CLASS_LIB(QListIterator, QtCore, qlist.h) +QT_CLASS_LIB(QMutableListIterator, QtCore, qlist.h) +QT_CLASS_LIB(QSystemLocale, QtCore, qlocale.h) +QT_CLASS_LIB(QLocale, QtCore, qlocale.h) +QT_CLASS_LIB(QMapData, QtCore, qmap.h) +QT_CLASS_LIB(QMapNode, QtCore, qmap.h) +QT_CLASS_LIB(QMapPayloadNode, QtCore, qmap.h) +QT_CLASS_LIB(QMap, QtCore, qmap.h) +QT_CLASS_LIB(QMultiMap, QtCore, qmap.h) +QT_CLASS_LIB(QMapIterator, QtCore, qmap.h) +QT_CLASS_LIB(QMutableMapIterator, QtCore, qmap.h) +QT_CLASS_LIB(QMapIterator, QtCore, qmap.h) +QT_CLASS_LIB(QMutableMapIterator, QtCore, qmap.h) +QT_CLASS_LIB(QMargins, QtCore, qmargins.h) +QT_CLASS_LIB(QPair, QtCore, qpair.h) +QT_CLASS_LIB(QPoint, QtCore, qpoint.h) +QT_CLASS_LIB(QPointF, QtCore, qpoint.h) +QT_CLASS_LIB(QQueue, QtCore, qqueue.h) +QT_CLASS_LIB(QRect, QtCore, qrect.h) +QT_CLASS_LIB(QRectF, QtCore, qrect.h) +QT_CLASS_LIB(QRegExp, QtCore, qregexp.h) +QT_CLASS_LIB(QScopedPointerDeleter, QtCore, qscopedpointer.h) +QT_CLASS_LIB(QScopedPointerArrayDeleter, QtCore, qscopedpointer.h) +QT_CLASS_LIB(QScopedPointerPodDeleter, QtCore, qscopedpointer.h) +QT_CLASS_LIB(QScopedPointer, QtCore, qscopedpointer.h) +QT_CLASS_LIB(QScopedArrayPointer, QtCore, qscopedpointer.h) +QT_CLASS_LIB(QSet, QtCore, qset.h) +QT_CLASS_LIB(QSetIterator, QtCore, qset.h) +QT_CLASS_LIB(QMutableSetIterator, QtCore, qset.h) +QT_CLASS_LIB(QMutableSetIterator, QtCore, qset.h) +QT_CLASS_LIB(QSharedData, QtCore, qshareddata.h) +QT_CLASS_LIB(QSharedDataPointer, QtCore, qshareddata.h) +QT_CLASS_LIB(QExplicitlySharedDataPointer, QtCore, qshareddata.h) +QT_CLASS_LIB(QSharedPointer, QtCore, qsharedpointer.h) +QT_CLASS_LIB(QWeakPointer, QtCore, qsharedpointer.h) +QT_CLASS_LIB(QSize, QtCore, qsize.h) +QT_CLASS_LIB(QSizeF, QtCore, qsize.h) +QT_CLASS_LIB(QStack, QtCore, qstack.h) +QT_CLASS_LIB(QStdWString, QtCore, qstring.h) +QT_CLASS_LIB(QString, QtCore, qstring.h) +QT_CLASS_LIB(QLatin1String, QtCore, qstring.h) +QT_CLASS_LIB(QCharRef, QtCore, qstring.h) +QT_CLASS_LIB(QConstString, QtCore, qstring.h) +QT_CLASS_LIB(QStringRef, QtCore, qstring.h) +QT_CLASS_LIB(QLatin1Literal, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QAbstractConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QStringBuilder, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QConcatenable, QtCore, qstringbuilder.h) +QT_CLASS_LIB(QStringListIterator, QtCore, qstringlist.h) +QT_CLASS_LIB(QMutableStringListIterator, QtCore, qstringlist.h) +QT_CLASS_LIB(QStringList, QtCore, qstringlist.h) +QT_CLASS_LIB(QStringMatcher, QtCore, qstringmatcher.h) +QT_CLASS_LIB(QTextBoundaryFinder, QtCore, qtextboundaryfinder.h) +QT_CLASS_LIB(QTimeLine, QtCore, qtimeline.h) +QT_CLASS_LIB(QVarLengthArray, QtCore, qvarlengtharray.h) +QT_CLASS_LIB(QVectorData, QtCore, qvector.h) +QT_CLASS_LIB(QVectorTypedData, QtCore, qvector.h) +QT_CLASS_LIB(QVector, QtCore, qvector.h) +QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h) +QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h) +QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h) +QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h) +QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h) +QT_CLASS_LIB(QDeclarativeItem, QtDeclarative, qdeclarativeitem.h) +QT_CLASS_LIB(QDeclarativeComponent, QtDeclarative, qdeclarativecomponent.h) +QT_CLASS_LIB(QDeclarativeContext, QtDeclarative, qdeclarativecontext.h) +QT_CLASS_LIB(QDeclarativeEngine, QtDeclarative, qdeclarativeengine.h) +QT_CLASS_LIB(QDeclarativeError, QtDeclarative, qdeclarativeerror.h) +QT_CLASS_LIB(QDeclarativeExpression, QtDeclarative, qdeclarativeexpression.h) +QT_CLASS_LIB(QDeclarativeExtensionInterface, QtDeclarative, qdeclarativeextensioninterface.h) +QT_CLASS_LIB(QDeclarativeExtensionPlugin, QtDeclarative, qdeclarativeextensionplugin.h) +QT_CLASS_LIB(QDeclarativeImageProvider, QtDeclarative, qdeclarativeimageprovider.h) +QT_CLASS_LIB(QDeclarativeInfo, QtDeclarative, qdeclarativeinfo.h) +QT_CLASS_LIB(QDeclarativeListProperty, QtDeclarative, qdeclarativelist.h) +QT_CLASS_LIB(QDeclarativeListReference, QtDeclarative, qdeclarativelist.h) +QT_CLASS_LIB(QDeclarativeNetworkAccessManagerFactory, QtDeclarative, qdeclarativenetworkaccessmanagerfactory.h) +QT_CLASS_LIB(QDeclarativeParserStatus, QtDeclarative, qdeclarativeparserstatus.h) +QT_CLASS_LIB(QDeclarativeAttachedPropertiesFunc, QtDeclarative, qdeclarativeprivate.h) +QT_CLASS_LIB(QDeclarativeTypeInfo, QtDeclarative, qdeclarativeprivate.h) +QT_CLASS_LIB(QDeclarativeProperty, QtDeclarative, qdeclarativeproperty.h) +QT_CLASS_LIB(QDeclarativeProperties, QtDeclarative, qdeclarativeproperty.h) +QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepropertyvalueinterceptor.h) +QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h) +QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h) +QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h) +QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h) +QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) +QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h) +QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h) +QT_CLASS_LIB(QMacCompatGLuint, QtOpenGL, qgl.h) +QT_CLASS_LIB(QMacCompatGLenum, QtOpenGL, qgl.h) +QT_CLASS_LIB(QGLFormat, QtOpenGL, qgl.h) +QT_CLASS_LIB(QGLContext, QtOpenGL, qgl.h) +QT_CLASS_LIB(QGLWidget, QtOpenGL, qgl.h) +QT_CLASS_LIB(QGLBuffer, QtOpenGL, qglbuffer.h) +QT_CLASS_LIB(QGLColormap, QtOpenGL, qglcolormap.h) +QT_CLASS_LIB(QGLFramebufferObject, QtOpenGL, qglframebufferobject.h) +QT_CLASS_LIB(QGLFramebufferObjectFormat, QtOpenGL, qglframebufferobject.h) +QT_CLASS_LIB(QGLFunctions, QtOpenGL, qglfunctions.h) +QT_CLASS_LIB(QGLFunctionsPrivate, QtOpenGL, qglfunctions.h) +QT_CLASS_LIB(QGLPixelBuffer, QtOpenGL, qglpixelbuffer.h) +QT_CLASS_LIB(QGLScreenSurfaceFunctions, QtOpenGL, qglscreen_qws.h) +QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h) +QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h) +QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h) +QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h) +QT_CLASS_LIB(QDomNode, QtXml, qdom.h) +QT_CLASS_LIB(QDomNodeList, QtXml, qdom.h) +QT_CLASS_LIB(QDomDocumentType, QtXml, qdom.h) +QT_CLASS_LIB(QDomDocument, QtXml, qdom.h) +QT_CLASS_LIB(QDomNamedNodeMap, QtXml, qdom.h) +QT_CLASS_LIB(QDomDocumentFragment, QtXml, qdom.h) +QT_CLASS_LIB(QDomCharacterData, QtXml, qdom.h) +QT_CLASS_LIB(QDomAttr, QtXml, qdom.h) +QT_CLASS_LIB(QDomElement, QtXml, qdom.h) +QT_CLASS_LIB(QDomText, QtXml, qdom.h) +QT_CLASS_LIB(QDomComment, QtXml, qdom.h) +QT_CLASS_LIB(QDomCDATASection, QtXml, qdom.h) +QT_CLASS_LIB(QDomNotation, QtXml, qdom.h) +QT_CLASS_LIB(QDomEntity, QtXml, qdom.h) +QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h) +QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h) +QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h) +QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h) +QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h) +QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h) +QT_CLASS_LIB(QXmlReader, QtXml, qxml.h) +QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h) +QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h) +QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h) +QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h) +QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h) +QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h) +QT_CLASS_LIB(QNetworkCacheMetaData, QtNetwork, qabstractnetworkcache.h) +QT_CLASS_LIB(QAbstractNetworkCache, QtNetwork, qabstractnetworkcache.h) +QT_CLASS_LIB(QFtp, QtNetwork, qftp.h) +QT_CLASS_LIB(QHttpHeader, QtNetwork, qhttp.h) +QT_CLASS_LIB(QHttpResponseHeader, QtNetwork, qhttp.h) +QT_CLASS_LIB(QHttpRequestHeader, QtNetwork, qhttp.h) +QT_CLASS_LIB(QHttp, QtNetwork, qhttp.h) +QT_CLASS_LIB(QNetworkAccessManager, QtNetwork, qnetworkaccessmanager.h) +QT_CLASS_LIB(QNetworkCookie, QtNetwork, qnetworkcookie.h) +QT_CLASS_LIB(QNetworkCookieJar, QtNetwork, qnetworkcookiejar.h) +QT_CLASS_LIB(QNetworkDiskCache, QtNetwork, qnetworkdiskcache.h) +QT_CLASS_LIB(QNetworkReply, QtNetwork, qnetworkreply.h) +QT_CLASS_LIB(QNetworkRequest, QtNetwork, qnetworkrequest.h) +QT_CLASS_LIB(QNetworkConfigurationManager, QtNetwork, qnetworkconfigmanager.h) +QT_CLASS_LIB(QNetworkConfiguration, QtNetwork, qnetworkconfiguration.h) +QT_CLASS_LIB(QNetworkSession, QtNetwork, qnetworksession.h) +QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h) +QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h) +QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h) +QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h) +QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h) +QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h) +QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h) +QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h) +QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h) +QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h) +QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h) +QT_CLASS_LIB(QAbstractSocket, QtNetwork, qabstractsocket.h) +QT_CLASS_LIB(QLocalServer, QtNetwork, qlocalserver.h) +QT_CLASS_LIB(QLocalSocket, QtNetwork, qlocalsocket.h) +QT_CLASS_LIB(QTcpServer, QtNetwork, qtcpserver.h) +QT_CLASS_LIB(QTcpSocket, QtNetwork, qtcpsocket.h) +QT_CLASS_LIB(QUdpSocket, QtNetwork, qudpsocket.h) +QT_CLASS_LIB(QSsl, QtNetwork, qssl.h) +QT_CLASS_LIB(QSslCertificate, QtNetwork, qsslcertificate.h) +QT_CLASS_LIB(QSslCipher, QtNetwork, qsslcipher.h) +QT_CLASS_LIB(QSslConfiguration, QtNetwork, qsslconfiguration.h) +QT_CLASS_LIB(QSslError, QtNetwork, qsslerror.h) +QT_CLASS_LIB(QSslKey, QtNetwork, qsslkey.h) +QT_CLASS_LIB(QSslSocket, QtNetwork, qsslsocket.h) +QT_CLASS_LIB(QHelpGlobal, QtHelp, qhelp_global.h) +QT_CLASS_LIB(QHelpContentItem, QtHelp, qhelpcontentwidget.h) +QT_CLASS_LIB(QHelpContentModel, QtHelp, qhelpcontentwidget.h) +QT_CLASS_LIB(QHelpContentWidget, QtHelp, qhelpcontentwidget.h) +QT_CLASS_LIB(QHelpEngine, QtHelp, qhelpengine.h) +QT_CLASS_LIB(QHelpEngineCore, QtHelp, qhelpenginecore.h) +QT_CLASS_LIB(QHelpIndexModel, QtHelp, qhelpindexwidget.h) +QT_CLASS_LIB(QHelpIndexWidget, QtHelp, qhelpindexwidget.h) +QT_CLASS_LIB(QHelpSearchQuery, QtHelp, qhelpsearchengine.h) +QT_CLASS_LIB(QHelpSearchEngine, QtHelp, qhelpsearchengine.h) +QT_CLASS_LIB(QHelpSearchQueryWidget, QtHelp, qhelpsearchquerywidget.h) +QT_CLASS_LIB(QHelpSearchResultWidget, QtHelp, qhelpsearchresultwidget.h) +QT_CLASS_LIB(QAbstractMessageHandler, QtXmlPatterns, qabstractmessagehandler.h) +QT_CLASS_LIB(QAbstractUriResolver, QtXmlPatterns, qabstracturiresolver.h) +QT_CLASS_LIB(QXmlNodeModelIndex, QtXmlPatterns, qabstractxmlnodemodel.h) +QT_CLASS_LIB(QAbstractXmlNodeModel, QtXmlPatterns, qabstractxmlnodemodel.h) +QT_CLASS_LIB(QXmlItem, QtXmlPatterns, qabstractxmlnodemodel.h) +QT_CLASS_LIB(QAbstractXmlReceiver, QtXmlPatterns, qabstractxmlreceiver.h) +QT_CLASS_LIB(QSimpleXmlNodeModel, QtXmlPatterns, qsimplexmlnodemodel.h) +QT_CLASS_LIB(QSourceLocation, QtXmlPatterns, qsourcelocation.h) +QT_CLASS_LIB(QXmlFormatter, QtXmlPatterns, qxmlformatter.h) +QT_CLASS_LIB(QXmlName, QtXmlPatterns, qxmlname.h) +QT_CLASS_LIB(QXmlNamePool, QtXmlPatterns, qxmlnamepool.h) +QT_CLASS_LIB(QXmlQuery, QtXmlPatterns, qxmlquery.h) +QT_CLASS_LIB(QXmlResultItems, QtXmlPatterns, qxmlresultitems.h) +QT_CLASS_LIB(QXmlSchema, QtXmlPatterns, qxmlschema.h) +QT_CLASS_LIB(QXmlSchemaValidator, QtXmlPatterns, qxmlschemavalidator.h) +QT_CLASS_LIB(QXmlSerializer, QtXmlPatterns, qxmlserializer.h) +QT_CLASS_LIB(QMeeGoFenceSync, QtMeeGoGraphicsSystemHelper, qmeegofencesync.h) +QT_CLASS_LIB(QMeeGoGraphicsSystemHelper, QtMeeGoGraphicsSystemHelper, qmeegographicssystemhelper.h) +QT_CLASS_LIB(QMeeGoLivePixmap, QtMeeGoGraphicsSystemHelper, qmeegolivepixmap.h) +QT_CLASS_LIB(QMeeGoOverlayWidget, QtMeeGoGraphicsSystemHelper, qmeegooverlaywidget.h) +QT_CLASS_LIB(QMeeGoRuntime, QtMeeGoGraphicsSystemHelper, qmeegoruntime.h) +QT_CLASS_LIB(QMeeGoSwitchEvent, QtMeeGoGraphicsSystemHelper, qmeegoswitchevent.h) +QT_CLASS_LIB(QAxBase, ActiveQt, qaxbase.h) +QT_CLASS_LIB(QAxObject, ActiveQt, qaxobject.h) +QT_CLASS_LIB(QAxScriptEngine, ActiveQt, qaxscript.h) +QT_CLASS_LIB(QAxScript, ActiveQt, qaxscript.h) +QT_CLASS_LIB(QAxScriptManager, ActiveQt, qaxscript.h) +QT_CLASS_LIB(QAxSelect, ActiveQt, qaxselect.h) +QT_CLASS_LIB(QAxWidget, ActiveQt, qaxwidget.h) +QT_CLASS_LIB(QAxAggregated, ActiveQt, qaxaggregated.h) +QT_CLASS_LIB(QAxBindable, ActiveQt, qaxbindable.h) +QT_CLASS_LIB(QAxFactory, ActiveQt, qaxfactory.h) +QT_CLASS_LIB(QAxClass, ActiveQt, qaxfactory.h) +QT_CLASS_LIB(QGraphicsWebView, QtWebKit, qgraphicswebview.h) +QT_CLASS_LIB(QWebDatabase, QtWebKit, qwebdatabase.h) +QT_CLASS_LIB(QWebElement, QtWebKit, qwebelement.h) +QT_CLASS_LIB(QWebElementCollection, QtWebKit, qwebelement.h) +QT_CLASS_LIB(QWebHitTestResult, QtWebKit, qwebframe.h) +QT_CLASS_LIB(QWebFrame, QtWebKit, qwebframe.h) +QT_CLASS_LIB(QWebHistoryItem, QtWebKit, qwebhistory.h) +QT_CLASS_LIB(QWebHistory, QtWebKit, qwebhistory.h) +QT_CLASS_LIB(QWebHistoryInterface, QtWebKit, qwebhistoryinterface.h) +QT_CLASS_LIB(QWebInspector, QtWebKit, qwebinspector.h) +QT_CLASS_LIB(QWebPage, QtWebKit, qwebpage.h) +QT_CLASS_LIB(QWebPluginFactory, QtWebKit, qwebpluginfactory.h) +QT_CLASS_LIB(QWebSecurityOrigin, QtWebKit, qwebsecurityorigin.h) +QT_CLASS_LIB(QWebSettings, QtWebKit, qwebsettings.h) +QT_CLASS_LIB(QWebView, QtWebKit, qwebview.h) +QT_CLASS_LIB(QAudio, QtMultimedia, qaudio.h) +QT_CLASS_LIB(QAudioDeviceInfo, QtMultimedia, qaudiodeviceinfo.h) +QT_CLASS_LIB(QAbstractAudioDeviceInfo, QtMultimedia, qaudioengine.h) +QT_CLASS_LIB(QAbstractAudioOutput, QtMultimedia, qaudioengine.h) +QT_CLASS_LIB(QAbstractAudioInput, QtMultimedia, qaudioengine.h) +QT_CLASS_LIB(QAudioEngineFactoryInterface, QtMultimedia, qaudioengineplugin.h) +QT_CLASS_LIB(QAudioEnginePlugin, QtMultimedia, qaudioengineplugin.h) +QT_CLASS_LIB(QAudioFormat, QtMultimedia, qaudioformat.h) +QT_CLASS_LIB(QAudioInput, QtMultimedia, qaudioinput.h) +QT_CLASS_LIB(QAudioOutput, QtMultimedia, qaudiooutput.h) +QT_CLASS_LIB(QAbstractVideoBuffer, QtMultimedia, qabstractvideobuffer.h) +QT_CLASS_LIB(QAbstractVideoSurface, QtMultimedia, qabstractvideosurface.h) +QT_CLASS_LIB(QVideoFrame, QtMultimedia, qvideoframe.h) +QT_CLASS_LIB(QVideoSurfaceFormat, QtMultimedia, qvideosurfaceformat.h) +QT_CLASS_LIB(QSignalSpy, QtTest, qsignalspy.h) +QT_CLASS_LIB(QTest, QtTest, qtest.h) +QT_CLASS_LIB(QtTestGui, QtTest, qtest_gui.h) +QT_CLASS_LIB(QTestAccessibilityEvent, QtTest, qtestaccessible.h) +QT_CLASS_LIB(QTestAccessibility, QtTest, qtestaccessible.h) +QT_CLASS_LIB(QTestBasicStreamer, QtTest, qtestbasicstreamer.h) +QT_CLASS_LIB(QTestCoreElement, QtTest, qtestcoreelement.h) +QT_CLASS_LIB(QTestCoreList, QtTest, qtestcorelist.h) +QT_CLASS_LIB(QTestData, QtTest, qtestdata.h) +QT_CLASS_LIB(QTestElement, QtTest, qtestelement.h) +QT_CLASS_LIB(QTestElementAttribute, QtTest, qtestelementattribute.h) +QT_CLASS_LIB(QTestEvent, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestKeyEvent, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestKeyClicksEvent, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestMouseEvent, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestDelayEvent, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestEventList, QtTest, qtestevent.h) +QT_CLASS_LIB(QTestEventLoop, QtTest, qtesteventloop.h) +QT_CLASS_LIB(QTestFileLogger, QtTest, qtestfilelogger.h) +QT_CLASS_LIB(QTestLightXmlStreamer, QtTest, qtestlightxmlstreamer.h) +QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) +QT_CLASS_LIB(QEventSizeOfChecker, QtTest, qtestspontaneevent.h) +QT_CLASS_LIB(QSpontaneKeyEvent, QtTest, qtestspontaneevent.h) +QT_CLASS_LIB(QTestXmlStreamer, QtTest, qtestxmlstreamer.h) +QT_CLASS_LIB(QTestXunitStreamer, QtTest, qtestxunitstreamer.h) +QT_CLASS_LIB(QDBusAbstractAdaptor, QtDBus, qdbusabstractadaptor.h) +QT_CLASS_LIB(QDBusAbstractInterfaceBase, QtDBus, qdbusabstractinterface.h) +QT_CLASS_LIB(QDBusAbstractInterface, QtDBus, qdbusabstractinterface.h) +QT_CLASS_LIB(QDBusArgument, QtDBus, qdbusargument.h) +QT_CLASS_LIB(QDBusConnection, QtDBus, qdbusconnection.h) +QT_CLASS_LIB(QDBusConnectionInterface, QtDBus, qdbusconnectioninterface.h) +QT_CLASS_LIB(QDBusContext, QtDBus, qdbuscontext.h) +QT_CLASS_LIB(QDBusError, QtDBus, qdbuserror.h) +QT_CLASS_LIB(QDBusObjectPath, QtDBus, qdbusextratypes.h) +QT_CLASS_LIB(QDBusSignature, QtDBus, qdbusextratypes.h) +QT_CLASS_LIB(QDBusVariant, QtDBus, qdbusextratypes.h) +QT_CLASS_LIB(QDBusInterface, QtDBus, qdbusinterface.h) +QT_CLASS_LIB(QDBusMessage, QtDBus, qdbusmessage.h) +QT_CLASS_LIB(QDBusMetaType, QtDBus, qdbusmetatype.h) +QT_CLASS_LIB(QDBusPendingCall, QtDBus, qdbuspendingcall.h) +QT_CLASS_LIB(QDBusPendingCallWatcher, QtDBus, qdbuspendingcall.h) +QT_CLASS_LIB(QDBusPendingReplyData, QtDBus, qdbuspendingreply.h) +QT_CLASS_LIB(QDBusPendingReply, QtDBus, qdbuspendingreply.h) +QT_CLASS_LIB(QDBusReply, QtDBus, qdbusreply.h) +QT_CLASS_LIB(QDBusReply, QtDBus, qdbusreply.h) +QT_CLASS_LIB(QDBusServer, QtDBus, qdbusserver.h) +QT_CLASS_LIB(QDBusServiceWatcher, QtDBus, qdbusservicewatcher.h) +QT_CLASS_LIB(QScriptable, QtScript, qscriptable.h) +QT_CLASS_LIB(QScriptClass, QtScript, qscriptclass.h) +QT_CLASS_LIB(QScriptClassPropertyIterator, QtScript, qscriptclasspropertyiterator.h) +QT_CLASS_LIB(QScriptContext, QtScript, qscriptcontext.h) +QT_CLASS_LIB(QScriptContextInfo, QtScript, qscriptcontextinfo.h) +QT_CLASS_LIB(QScriptContextInfoList, QtScript, qscriptcontextinfo.h) +QT_CLASS_LIB(QScriptSyntaxCheckResult, QtScript, qscriptengine.h) +QT_CLASS_LIB(QScriptEngine, QtScript, qscriptengine.h) +QT_CLASS_LIB(QScriptEngineAgent, QtScript, qscriptengineagent.h) +QT_CLASS_LIB(QScriptExtensionInterface, QtScript, qscriptextensioninterface.h) +QT_CLASS_LIB(QScriptExtensionPlugin, QtScript, qscriptextensionplugin.h) +QT_CLASS_LIB(QScriptProgram, QtScript, qscriptprogram.h) +QT_CLASS_LIB(QScriptString, QtScript, qscriptstring.h) +QT_CLASS_LIB(QScriptValueList, QtScript, qscriptvalue.h) +QT_CLASS_LIB(QScriptValue, QtScript, qscriptvalue.h) +QT_CLASS_LIB(QScriptValueIterator, QtScript, qscriptvalueiterator.h) +QT_CLASS_LIB(QSqlDriverCreatorBase, QtSql, qsqldatabase.h) +QT_CLASS_LIB(QSqlDriverCreator, QtSql, qsqldatabase.h) +QT_CLASS_LIB(QSqlDatabase, QtSql, qsqldatabase.h) +QT_CLASS_LIB(QSqlDriver, QtSql, qsqldriver.h) +QT_CLASS_LIB(QSqlDriverFactoryInterface, QtSql, qsqldriverplugin.h) +QT_CLASS_LIB(QSqlDriverPlugin, QtSql, qsqldriverplugin.h) +QT_CLASS_LIB(QSqlError, QtSql, qsqlerror.h) +QT_CLASS_LIB(QSqlField, QtSql, qsqlfield.h) +QT_CLASS_LIB(QSqlIndex, QtSql, qsqlindex.h) +QT_CLASS_LIB(QSqlQuery, QtSql, qsqlquery.h) +QT_CLASS_LIB(QSqlRecord, QtSql, qsqlrecord.h) +QT_CLASS_LIB(QSqlResult, QtSql, qsqlresult.h) +QT_CLASS_LIB(QSqlQueryModel, QtSql, qsqlquerymodel.h) +QT_CLASS_LIB(QSqlRelationalDelegate, QtSql, qsqlrelationaldelegate.h) +QT_CLASS_LIB(QSqlRelation, QtSql, qsqlrelationaltablemodel.h) +QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h) +QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h) +QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h) +QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h) +QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h) +QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h) +QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h) +QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h) +QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h) +QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h) +QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h) +QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h) +QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h) +QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h) +QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h) +QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h) +QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h) +QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h) +QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h) +QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h) +QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h) +QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h) +QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h) +QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h) +QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h) +QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h) +QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h) +QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h) +QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h) +QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h) +QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h) +QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h) +QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h) +QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h) +QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h) +QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h) +QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h) +QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h) +QT_CLASS_LIB(QDialog, QtGui, qdialog.h) +QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h) +QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h) +QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h) +QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h) +QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h) +QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h) +QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h) +QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h) +QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h) +QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h) +QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h) +QT_CLASS_LIB(QWizard, QtGui, qwizard.h) +QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h) +QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h) +QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h) +QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h) +QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h) +QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h) +QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h) +QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h) +QT_CLASS_LIB(QDecoration, QtGui, qdecoration_qws.h) +QT_CLASS_LIB(QDecorationDefault, QtGui, qdecorationdefault_qws.h) +QT_CLASS_LIB(QDecorationFactory, QtGui, qdecorationfactory_qws.h) +QT_CLASS_LIB(QDecorationFactoryInterface, QtGui, qdecorationplugin_qws.h) +QT_CLASS_LIB(QDecorationPlugin, QtGui, qdecorationplugin_qws.h) +QT_CLASS_LIB(QDecorationStyled, QtGui, qdecorationstyled_qws.h) +QT_CLASS_LIB(QDecorationWindows, QtGui, qdecorationwindows_qws.h) +QT_CLASS_LIB(QDirectPainter, QtGui, qdirectpainter_qws.h) +QT_CLASS_LIB(QWSKeyboardHandler, QtGui, qkbd_qws.h) +QT_CLASS_LIB(QKbdDriverFactory, QtGui, qkbddriverfactory_qws.h) +QT_CLASS_LIB(QWSKeyboardHandlerFactoryInterface, QtGui, qkbddriverplugin_qws.h) +QT_CLASS_LIB(QKbdDriverPlugin, QtGui, qkbddriverplugin_qws.h) +QT_CLASS_LIB(QWSLinuxInputKeyboardHandler, QtGui, qkbdlinuxinput_qws.h) +QT_CLASS_LIB(QWSQnxKeyboardHandler, QtGui, qkbdqnx_qws.h) +QT_CLASS_LIB(QWSTtyKeyboardHandler, QtGui, qkbdtty_qws.h) +QT_CLASS_LIB(QWSUmKeyboardHandler, QtGui, qkbdum_qws.h) +QT_CLASS_LIB(QVFbKeyboardHandler, QtGui, qkbdvfb_qws.h) +QT_CLASS_LIB(QWSPointerCalibrationData, QtGui, qmouse_qws.h) +QT_CLASS_LIB(QWSMouseHandler, QtGui, qmouse_qws.h) +QT_CLASS_LIB(QWSCalibratedMouseHandler, QtGui, qmouse_qws.h) +QT_CLASS_LIB(QMouseDriverFactory, QtGui, qmousedriverfactory_qws.h) +QT_CLASS_LIB(QWSMouseHandlerFactoryInterface, QtGui, qmousedriverplugin_qws.h) +QT_CLASS_LIB(QMouseDriverPlugin, QtGui, qmousedriverplugin_qws.h) +QT_CLASS_LIB(QWSLinuxInputMouseHandler, QtGui, qmouselinuxinput_qws.h) +QT_CLASS_LIB(QWSLinuxTPMouseHandler, QtGui, qmouselinuxtp_qws.h) +QT_CLASS_LIB(QWSPcMouseHandler, QtGui, qmousepc_qws.h) +QT_CLASS_LIB(QQnxMouseHandler, QtGui, qmouseqnx_qws.h) +QT_CLASS_LIB(QWSTslibMouseHandler, QtGui, qmousetslib_qws.h) +QT_CLASS_LIB(QVFbMouseHandler, QtGui, qmousevfb_qws.h) +QT_CLASS_LIB(QScreenCursor, QtGui, qscreen_qws.h) +QT_CLASS_LIB(QPoolEntry, QtGui, qscreen_qws.h) +QT_CLASS_LIB(QScreen, QtGui, qscreen_qws.h) +QT_CLASS_LIB(QScreenDriverFactory, QtGui, qscreendriverfactory_qws.h) +QT_CLASS_LIB(QScreenDriverFactoryInterface, QtGui, qscreendriverplugin_qws.h) +QT_CLASS_LIB(QScreenDriverPlugin, QtGui, qscreendriverplugin_qws.h) +QT_CLASS_LIB(QLinuxFb_Shared, QtGui, qscreenlinuxfb_qws.h) +QT_CLASS_LIB(QLinuxFbScreen, QtGui, qscreenlinuxfb_qws.h) +QT_CLASS_LIB(QProxyScreenCursor, QtGui, qscreenproxy_qws.h) +QT_CLASS_LIB(QProxyScreen, QtGui, qscreenproxy_qws.h) +QT_CLASS_LIB(QQnxScreen, QtGui, qscreenqnx_qws.h) +QT_CLASS_LIB(QTransformedScreen, QtGui, qscreentransformed_qws.h) +QT_CLASS_LIB(QVFbScreen, QtGui, qscreenvfb_qws.h) +QT_CLASS_LIB(QWSSoundServer, QtGui, qsoundqss_qws.h) +QT_CLASS_LIB(QWSSoundClient, QtGui, qsoundqss_qws.h) +QT_CLASS_LIB(QWSSoundServerSocket, QtGui, qsoundqss_qws.h) +QT_CLASS_LIB(QTransportAuth, QtGui, qtransportauth_qws.h) +QT_CLASS_LIB(QAuthDevice, QtGui, qtransportauth_qws.h) +QT_CLASS_LIB(QVFbHeader, QtGui, qvfbhdr.h) +QT_CLASS_LIB(QVFbKeyData, QtGui, qvfbhdr.h) +QT_CLASS_LIB(QWSInternalWindowInfo, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSScreenSaver, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSWindow, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSSoundServer, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSServer, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSInputMethod, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSCursorMap, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSClient, QtGui, qwindowsystem_qws.h) +QT_CLASS_LIB(QWSCursor, QtGui, qwscursor_qws.h) +QT_CLASS_LIB(QWSWindowInfo, QtGui, qwsdisplay_qws.h) +QT_CLASS_LIB(QWSDisplay, QtGui, qwsdisplay_qws.h) +QT_CLASS_LIB(QWSEmbedWidget, QtGui, qwsembedwidget.h) +QT_CLASS_LIB(QWSEvent, QtGui, qwsevent_qws.h) +QT_CLASS_LIB(QWSManager, QtGui, qwsmanager_qws.h) +QT_CLASS_LIB(QWSPropertyManager, QtGui, qwsproperty_qws.h) +QT_CLASS_LIB(QWSProtocolItem, QtGui, qwsprotocolitem_qws.h) +QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h) +QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h) +QT_CLASS_LIB(QGraphicsAnchor, QtGui, qgraphicsanchorlayout.h) +QT_CLASS_LIB(QGraphicsAnchorLayout, QtGui, qgraphicsanchorlayout.h) +QT_CLASS_LIB(QGraphicsGridLayout, QtGui, qgraphicsgridlayout.h) +QT_CLASS_LIB(QGraphicsItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsObject, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QAbstractGraphicsShapeItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsPathItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsRectItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsEllipseItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsPolygonItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsLineItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsPixmapItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsTextItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsSimpleTextItem, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsItemGroup, QtGui, qgraphicsitem.h) +QT_CLASS_LIB(QGraphicsItemAnimation, QtGui, qgraphicsitemanimation.h) +QT_CLASS_LIB(QGraphicsLayout, QtGui, qgraphicslayout.h) +QT_CLASS_LIB(QGraphicsLayoutItem, QtGui, qgraphicslayoutitem.h) +QT_CLASS_LIB(QGraphicsLinearLayout, QtGui, qgraphicslinearlayout.h) +QT_CLASS_LIB(QGraphicsProxyWidget, QtGui, qgraphicsproxywidget.h) +QT_CLASS_LIB(QGraphicsScene, QtGui, qgraphicsscene.h) +QT_CLASS_LIB(QGraphicsSceneEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneMouseEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneWheelEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneContextMenuEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneHoverEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneHelpEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneDragDropEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneResizeEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsSceneMoveEvent, QtGui, qgraphicssceneevent.h) +QT_CLASS_LIB(QGraphicsTransform, QtGui, qgraphicstransform.h) +QT_CLASS_LIB(QGraphicsScale, QtGui, qgraphicstransform.h) +QT_CLASS_LIB(QGraphicsRotation, QtGui, qgraphicstransform.h) +QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h) +QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h) +QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h) +QT_CLASS_LIB(QIcon, QtGui, qicon.h) +QT_CLASS_LIB(QIconSet, QtGui, qicon.h) +QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h) +QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h) +QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h) +QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h) +QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h) +QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h) +QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h) +QT_CLASS_LIB(QImage, QtGui, qimage.h) +QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h) +QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h) +QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h) +QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h) +QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h) +QT_CLASS_LIB(QMovie, QtGui, qmovie.h) +QT_CLASS_LIB(QPicture, QtGui, qpicture.h) +QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h) +QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h) +QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h) +QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h) +QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h) +QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h) +QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h) +QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h) +QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h) +QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h) +QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h) +QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h) +QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h) +QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h) +QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h) +QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h) +QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h) +QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h) +QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h) +QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h) +QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h) +QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h) +QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h) +QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h) +QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h) +QT_CLASS_LIB(QListView, QtGui, qlistview.h) +QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h) +QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h) +QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h) +QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h) +QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h) +QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h) +QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h) +QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h) +QT_CLASS_LIB(QTableView, QtGui, qtableview.h) +QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h) +QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h) +QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h) +QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h) +QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h) +QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h) +QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h) +QT_CLASS_LIB(QAction, QtGui, qaction.h) +QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h) +QT_CLASS_LIB(QApplication, QtGui, qapplication.h) +QT_CLASS_LIB(QBoxLayout, QtGui, qboxlayout.h) +QT_CLASS_LIB(QHBoxLayout, QtGui, qboxlayout.h) +QT_CLASS_LIB(QVBoxLayout, QtGui, qboxlayout.h) +QT_CLASS_LIB(QClipboard, QtGui, qclipboard.h) +QT_CLASS_LIB(QCursor, QtGui, qcursor.h) +QT_CLASS_LIB(QCursor, QtGui, qcursor.h) +QT_CLASS_LIB(QCursorShape, QtGui, qcursor.h) +QT_CLASS_LIB(QDesktopWidget, QtGui, qdesktopwidget.h) +QT_CLASS_LIB(QDrag, QtGui, qdrag.h) +QT_CLASS_LIB(QtEvents, QtGui, qevent.h) +QT_CLASS_LIB(QInputEvent, QtGui, qevent.h) +QT_CLASS_LIB(QMouseEvent, QtGui, qevent.h) +QT_CLASS_LIB(QHoverEvent, QtGui, qevent.h) +QT_CLASS_LIB(QWheelEvent, QtGui, qevent.h) +QT_CLASS_LIB(QTabletEvent, QtGui, qevent.h) +QT_CLASS_LIB(QKeyEvent, QtGui, qevent.h) +QT_CLASS_LIB(QFocusEvent, QtGui, qevent.h) +QT_CLASS_LIB(QPaintEvent, QtGui, qevent.h) +QT_CLASS_LIB(QUpdateLaterEvent, QtGui, qevent.h) +QT_CLASS_LIB(QMoveEvent, QtGui, qevent.h) +QT_CLASS_LIB(QResizeEvent, QtGui, qevent.h) +QT_CLASS_LIB(QCloseEvent, QtGui, qevent.h) +QT_CLASS_LIB(QIconDragEvent, QtGui, qevent.h) +QT_CLASS_LIB(QShowEvent, QtGui, qevent.h) +QT_CLASS_LIB(QHideEvent, QtGui, qevent.h) +QT_CLASS_LIB(QContextMenuEvent, QtGui, qevent.h) +QT_CLASS_LIB(QInputMethodEvent, QtGui, qevent.h) +QT_CLASS_LIB(QDropEvent, QtGui, qevent.h) +QT_CLASS_LIB(QDragMoveEvent, QtGui, qevent.h) +QT_CLASS_LIB(QDragEnterEvent, QtGui, qevent.h) +QT_CLASS_LIB(QDragResponseEvent, QtGui, qevent.h) +QT_CLASS_LIB(QDragLeaveEvent, QtGui, qevent.h) +QT_CLASS_LIB(QHelpEvent, QtGui, qevent.h) +QT_CLASS_LIB(QStatusTipEvent, QtGui, qevent.h) +QT_CLASS_LIB(QWhatsThisClickedEvent, QtGui, qevent.h) +QT_CLASS_LIB(QActionEvent, QtGui, qevent.h) +QT_CLASS_LIB(QFileOpenEvent, QtGui, qevent.h) +QT_CLASS_LIB(QToolBarChangeEvent, QtGui, qevent.h) +QT_CLASS_LIB(QShortcutEvent, QtGui, qevent.h) +QT_CLASS_LIB(QClipboardEvent, QtGui, qevent.h) +QT_CLASS_LIB(QWindowStateChangeEvent, QtGui, qevent.h) +QT_CLASS_LIB(QMenubarUpdatedEvent, QtGui, qevent.h) +QT_CLASS_LIB(QTouchEvent, QtGui, qevent.h) +QT_CLASS_LIB(QGestureEvent, QtGui, qevent.h) +QT_CLASS_LIB(QScrollPrepareEvent, QtGui, qevent.h) +QT_CLASS_LIB(QScrollEvent, QtGui, qevent.h) +QT_CLASS_LIB(QFormLayout, QtGui, qformlayout.h) +QT_CLASS_LIB(QGenericPluginFactoryInterface, QtGui, qgenericplugin_qpa.h) +QT_CLASS_LIB(QGenericPlugin, QtGui, qgenericplugin_qpa.h) +QT_CLASS_LIB(QGenericPluginFactory, QtGui, qgenericpluginfactory_qpa.h) +QT_CLASS_LIB(QGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QPanGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QPinchGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QSwipeGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QTapGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QTapAndHoldGesture, QtGui, qgesture.h) +QT_CLASS_LIB(QGestureRecognizer, QtGui, qgesturerecognizer.h) +QT_CLASS_LIB(QGridLayout, QtGui, qgridlayout.h) +QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h) +QT_CLASS_LIB(QKeySequence, QtGui, qkeysequence.h) +QT_CLASS_LIB(QLayoutIterator, QtGui, qlayout.h) +QT_CLASS_LIB(QLayout, QtGui, qlayout.h) +QT_CLASS_LIB(QLayoutItem, QtGui, qlayoutitem.h) +QT_CLASS_LIB(QSpacerItem, QtGui, qlayoutitem.h) +QT_CLASS_LIB(QWidgetItem, QtGui, qlayoutitem.h) +QT_CLASS_LIB(QWidgetItemV2, QtGui, qlayoutitem.h) +QT_CLASS_LIB(QMimeSource, QtGui, qmime.h) +QT_CLASS_LIB(QWindowsMime, QtGui, qmime.h) +QT_CLASS_LIB(QMacMime, QtGui, qmime.h) +QT_CLASS_LIB(QMacPasteboardMime, QtGui, qmime.h) +QT_CLASS_LIB(QPalette, QtGui, qpalette.h) +QT_CLASS_LIB(QColorGroup, QtGui, qpalette.h) +QT_CLASS_LIB(QPlatformCursorImage, QtGui, qplatformcursor_qpa.h) +QT_CLASS_LIB(QPlatformCursorPrivate, QtGui, qplatformcursor_qpa.h) +QT_CLASS_LIB(QPlatformCursor, QtGui, qplatformcursor_qpa.h) +QT_CLASS_LIB(QPlatformEventLoopIntegration, QtGui, qplatformeventloopintegration_qpa.h) +QT_CLASS_LIB(QPlatformGLContext, QtGui, qplatformglcontext_qpa.h) +QT_CLASS_LIB(QPlatformIntegration, QtGui, qplatformintegration_qpa.h) +QT_CLASS_LIB(QPlatformIntegrationFactoryInterface, QtGui, qplatformintegrationplugin_qpa.h) +QT_CLASS_LIB(QPlatformIntegrationPlugin, QtGui, qplatformintegrationplugin_qpa.h) +QT_CLASS_LIB(QPlatformScreen, QtGui, qplatformscreen_qpa.h) +QT_CLASS_LIB(QPlatformWindow, QtGui, qplatformwindow_qpa.h) +QT_CLASS_LIB(QPlatformWindowFormat, QtGui, qplatformwindowformat_qpa.h) +QT_CLASS_LIB(QSessionManager, QtGui, qsessionmanager.h) +QT_CLASS_LIB(QShortcut, QtGui, qshortcut.h) +QT_CLASS_LIB(QSizePolicy, QtGui, qsizepolicy.h) +QT_CLASS_LIB(QSound, QtGui, qsound.h) +QT_CLASS_LIB(QStackedLayout, QtGui, qstackedlayout.h) +QT_CLASS_LIB(QToolTip, QtGui, qtooltip.h) +QT_CLASS_LIB(QWhatsThis, QtGui, qwhatsthis.h) +QT_CLASS_LIB(QWidgetData, QtGui, qwidget.h) +QT_CLASS_LIB(QWidget, QtGui, qwidget.h) +QT_CLASS_LIB(QWidgetAction, QtGui, qwidgetaction.h) +QT_CLASS_LIB(QWidgetList, QtGui, qwindowdefs.h) +QT_CLASS_LIB(QWidgetMapper, QtGui, qwindowdefs.h) +QT_CLASS_LIB(QWidgetSet, QtGui, qwindowdefs.h) +QT_CLASS_LIB(QWindowSystemInterface, QtGui, qwindowsysteminterface_qpa.h) +QT_CLASS_LIB(QX11EmbedWidget, QtGui, qx11embed_x11.h) +QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h) +QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h) +QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h) +QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h) +QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h) +QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h) +QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h) +QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h) +QT_CLASS_LIB(QBrush, QtGui, qbrush.h) +QT_CLASS_LIB(QBrushData, QtGui, qbrush.h) +QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h) +QT_CLASS_LIB(QGradientStops, QtGui, qbrush.h) +QT_CLASS_LIB(QGradient, QtGui, qbrush.h) +QT_CLASS_LIB(QLinearGradient, QtGui, qbrush.h) +QT_CLASS_LIB(QRadialGradient, QtGui, qbrush.h) +QT_CLASS_LIB(QConicalGradient, QtGui, qbrush.h) +QT_CLASS_LIB(QColor, QtGui, qcolor.h) +QT_CLASS_LIB(QColormap, QtGui, qcolormap.h) +QT_CLASS_LIB(QTileRules, QtGui, qdrawutil.h) +QT_CLASS_LIB(QMatrix, QtGui, qmatrix.h) +QT_CLASS_LIB(QPaintDevice, QtGui, qpaintdevice.h) +QT_CLASS_LIB(QTextItem, QtGui, qpaintengine.h) +QT_CLASS_LIB(QPaintEngine, QtGui, qpaintengine.h) +QT_CLASS_LIB(QPaintEngineState, QtGui, qpaintengine.h) +QT_CLASS_LIB(QPainter, QtGui, qpainter.h) +QT_CLASS_LIB(QPainterPath, QtGui, qpainterpath.h) +QT_CLASS_LIB(QPainterPathPrivate, QtGui, qpainterpath.h) +QT_CLASS_LIB(QPainterPathStroker, QtGui, qpainterpath.h) +QT_CLASS_LIB(QPen, QtGui, qpen.h) +QT_CLASS_LIB(QPolygon, QtGui, qpolygon.h) +QT_CLASS_LIB(QPolygonF, QtGui, qpolygon.h) +QT_CLASS_LIB(QPrintEngine, QtGui, qprintengine.h) +QT_CLASS_LIB(QPrinter, QtGui, qprinter.h) +QT_CLASS_LIB(QPrinterInfo, QtGui, qprinterinfo.h) +QT_CLASS_LIB(QRegion, QtGui, qregion.h) +QT_CLASS_LIB(QRgb, QtGui, qrgb.h) +QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h) +QT_CLASS_LIB(QTransform, QtGui, qtransform.h) +QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h) +QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h) +QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h) +QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h) +QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60StubAknAppUiBase, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60StubMEikStatusPaneObserver, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60StubMAknTouchPaneObserver, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60StubAknAppUi, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60MainAppUiBase, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h) +QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h) +QT_CLASS_LIB(QS60MainDocumentBase, QtGui, qs60maindocument.h) +QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h) +QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h) +QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h) +QT_CLASS_LIB(QCDEStyle, QtGui, qcdestyle.h) +QT_CLASS_LIB(QCleanlooksStyle, QtGui, qcleanlooksstyle.h) +QT_CLASS_LIB(QCommonStyle, QtGui, qcommonstyle.h) +QT_CLASS_LIB(QGtkStyle, QtGui, qgtkstyle.h) +QT_CLASS_LIB(QMacStyle, QtGui, qmacstyle_mac.h) +QT_CLASS_LIB(QMotifStyle, QtGui, qmotifstyle.h) +QT_CLASS_LIB(QPlastiqueStyle, QtGui, qplastiquestyle.h) +QT_CLASS_LIB(QProxyStyle, QtGui, qproxystyle.h) +QT_CLASS_LIB(QS60Style, QtGui, qs60style.h) +QT_CLASS_LIB(QStyle, QtGui, qstyle.h) +QT_CLASS_LIB(QStyleFactory, QtGui, qstylefactory.h) +QT_CLASS_LIB(QStyleOption, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionFocusRect, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionFrame, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionFrameV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionFrameV3, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabWidgetFrame, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabWidgetFrameV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabBarBase, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabBarBaseV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionHeader, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionButton, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTab, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTabV3, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionToolBar, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionProgressBar, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionProgressBarV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionMenuItem, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionQ3ListViewItem, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionQ3DockWindow, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionDockWidget, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionDockWidgetV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionViewItem, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionViewItemV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionViewItemV3, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionViewItemV4, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionToolBox, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionToolBoxV2, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionRubberBand, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionComplex, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionSlider, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionSpinBox, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionQ3ListView, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionToolButton, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionComboBox, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionTitleBar, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionGroupBox, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionSizeGrip, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleOptionGraphicsItem, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleHintReturn, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleHintReturnMask, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleHintReturnVariant, QtGui, qstyleoption.h) +QT_CLASS_LIB(QStyleFactoryInterface, QtGui, qstyleplugin.h) +QT_CLASS_LIB(QStylePlugin, QtGui, qstyleplugin.h) +QT_CLASS_LIB(QWindowsCEStyle, QtGui, qwindowscestyle.h) +QT_CLASS_LIB(QWindowsMobileStyle, QtGui, qwindowsmobilestyle.h) +QT_CLASS_LIB(QWindowsStyle, QtGui, qwindowsstyle.h) +QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h) +QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h) +QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h) +QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h) +QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h) +QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h) +QT_CLASS_LIB(QAbstractFontEngine, QtGui, qabstractfontengine_qws.h) +QT_CLASS_LIB(QAbstractTextDocumentLayout, QtGui, qabstracttextdocumentlayout.h) +QT_CLASS_LIB(QTextObjectInterface, QtGui, qabstracttextdocumentlayout.h) +QT_CLASS_LIB(QFont, QtGui, qfont.h) +QT_CLASS_LIB(QFontDatabase, QtGui, qfontdatabase.h) +QT_CLASS_LIB(QFontInfo, QtGui, qfontinfo.h) +QT_CLASS_LIB(QFontMetrics, QtGui, qfontmetrics.h) +QT_CLASS_LIB(QFontMetricsF, QtGui, qfontmetrics.h) +QT_CLASS_LIB(QGlyphs, QtGui, qglyphs.h) +QT_CLASS_LIB(QSupportedWritingSystems, QtGui, qplatformfontdatabase_qpa.h) +QT_CLASS_LIB(QPlatformFontDatabase, QtGui, qplatformfontdatabase_qpa.h) +QT_CLASS_LIB(QStaticText, QtGui, qstatictext.h) +QT_CLASS_LIB(QSyntaxHighlighter, QtGui, qsyntaxhighlighter.h) +QT_CLASS_LIB(QTextCursor, QtGui, qtextcursor.h) +QT_CLASS_LIB(QAbstractUndoItem, QtGui, qtextdocument.h) +QT_CLASS_LIB(QTextDocument, QtGui, qtextdocument.h) +QT_CLASS_LIB(QTextDocumentFragment, QtGui, qtextdocumentfragment.h) +QT_CLASS_LIB(QTextDocumentWriter, QtGui, qtextdocumentwriter.h) +QT_CLASS_LIB(QTextLength, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextCharFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextBlockFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextListFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextImageFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextFrameFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextTableFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextTableCellFormat, QtGui, qtextformat.h) +QT_CLASS_LIB(QTextInlineObject, QtGui, qtextlayout.h) +QT_CLASS_LIB(QTextLayout, QtGui, qtextlayout.h) +QT_CLASS_LIB(QTextLine, QtGui, qtextlayout.h) +QT_CLASS_LIB(QTextList, QtGui, qtextlist.h) +QT_CLASS_LIB(QTextObject, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextBlockGroup, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextFrameLayoutData, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextFrame, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextBlockUserData, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextBlock, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextFragment, QtGui, qtextobject.h) +QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h) +QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h) +QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h) +QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h) +QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h) +QT_CLASS_LIB(QScroller, QtGui, qscroller.h) +QT_CLASS_LIB(QScrollerProperties, QtGui, qscrollerproperties.h) +QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h) +QT_CLASS_LIB(QUndoGroup, QtGui, qundogroup.h) +QT_CLASS_LIB(QUndoCommand, QtGui, qundostack.h) +QT_CLASS_LIB(QUndoStack, QtGui, qundostack.h) +QT_CLASS_LIB(QUndoView, QtGui, qundoview.h) +QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h) +QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h) +QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h) +QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h) +QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h) +QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h) +QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h) +QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h) +QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h) +QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h) +QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h) +QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h) +QT_CLASS_LIB(QDial, QtGui, qdial.h) +QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h) +QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h) +QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h) +QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h) +QT_CLASS_LIB(QFrame, QtGui, qframe.h) +QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h) +QT_CLASS_LIB(QLabel, QtGui, qlabel.h) +QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h) +QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h) +QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h) +QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h) +QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h) +QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h) +QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h) +QT_CLASS_LIB(QMenu, QtGui, qmenu.h) +QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h) +QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h) +QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h) +QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h) +QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h) +QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h) +QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h) +QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h) +QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h) +QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h) +QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h) +QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h) +QT_CLASS_LIB(QSlider, QtGui, qslider.h) +QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h) +QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h) +QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h) +QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h) +QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h) +QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h) +QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h) +QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h) +QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h) +QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h) +QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h) +QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h) +QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h) +QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h) +QT_CLASS_LIB(QValidator, QtGui, qvalidator.h) +QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h) +QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h) +QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h) +QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h) +QT_CLASS_LIB(QScriptEngineDebugger, QtScriptTools, qscriptenginedebugger.h) +QT_CLASS_LIB(QUiLoader, QtUiTools, quiloader.h) +QT_CLASS_LIB(QDesignerComponents, QtDesigner, qdesigner_components.h) +QT_CLASS_LIB(QExtensionFactory, QtDesigner, default_extensionfactory.h) +QT_CLASS_LIB(QAbstractExtensionFactory, QtDesigner, extension.h) +QT_CLASS_LIB(QAbstractExtensionManager, QtDesigner, extension.h) +QT_CLASS_LIB(QExtensionManager, QtDesigner, qextensionmanager.h) +QT_CLASS_LIB(QDesignerActionEditorInterface, QtDesigner, abstractactioneditor.h) +QT_CLASS_LIB(QDesignerBrushManagerInterface, QtDesigner, abstractbrushmanager.h) +QT_CLASS_LIB(QDesignerDnDItemInterface, QtDesigner, abstractdnditem.h) +QT_CLASS_LIB(QDesignerFormEditorInterface, QtDesigner, abstractformeditor.h) +QT_CLASS_LIB(QDesignerFormEditorPluginInterface, QtDesigner, abstractformeditorplugin.h) +QT_CLASS_LIB(QDesignerFormWindowInterface, QtDesigner, abstractformwindow.h) +QT_CLASS_LIB(QDesignerFormWindowCursorInterface, QtDesigner, abstractformwindowcursor.h) +QT_CLASS_LIB(QDesignerFormWindowManagerInterface, QtDesigner, abstractformwindowmanager.h) +QT_CLASS_LIB(QDesignerFormWindowToolInterface, QtDesigner, abstractformwindowtool.h) +QT_CLASS_LIB(QDesignerIconCacheInterface, QtDesigner, abstracticoncache.h) +QT_CLASS_LIB(QDesignerIntegrationInterface, QtDesigner, abstractintegration.h) +QT_CLASS_LIB(QDesignerLanguageExtension, QtDesigner, abstractlanguage.h) +QT_CLASS_LIB(QDesignerMetaDataBaseItemInterface, QtDesigner, abstractmetadatabase.h) +QT_CLASS_LIB(QDesignerMetaDataBaseInterface, QtDesigner, abstractmetadatabase.h) +QT_CLASS_LIB(QDesignerObjectInspectorInterface, QtDesigner, abstractobjectinspector.h) +QT_CLASS_LIB(QDesignerPromotionInterface, QtDesigner, abstractpromotioninterface.h) +QT_CLASS_LIB(QDesignerPropertyEditorInterface, QtDesigner, abstractpropertyeditor.h) +QT_CLASS_LIB(QDesignerResourceBrowserInterface, QtDesigner, abstractresourcebrowser.h) +QT_CLASS_LIB(QDesignerWidgetBoxInterface, QtDesigner, abstractwidgetbox.h) +QT_CLASS_LIB(QDesignerWidgetDataBaseItemInterface, QtDesigner, abstractwidgetdatabase.h) +QT_CLASS_LIB(QDesignerWidgetDataBaseInterface, QtDesigner, abstractwidgetdatabase.h) +QT_CLASS_LIB(QDesignerWidgetFactoryInterface, QtDesigner, abstractwidgetfactory.h) +QT_CLASS_LIB(QDesignerDynamicPropertySheetExtension, QtDesigner, dynamicpropertysheet.h) +QT_CLASS_LIB(QDesignerExtraInfoExtension, QtDesigner, extrainfo.h) +QT_CLASS_LIB(QDesignerLayoutDecorationExtension, QtDesigner, layoutdecoration.h) +QT_CLASS_LIB(QDesignerMemberSheetExtension, QtDesigner, membersheet.h) +QT_CLASS_LIB(QDesignerPropertySheetExtension, QtDesigner, propertysheet.h) +QT_CLASS_LIB(QDesignerTaskMenuExtension, QtDesigner, taskmenu.h) +QT_CLASS_LIB(QAbstractFormBuilder, QtDesigner, abstractformbuilder.h) +QT_CLASS_LIB(QDesignerContainerExtension, QtDesigner, container.h) +QT_CLASS_LIB(QDesignerCustomWidgetInterface, QtDesigner, customwidget.h) +QT_CLASS_LIB(QDesignerCustomWidgetCollectionInterface, QtDesigner, customwidget.h) +QT_CLASS_LIB(QFormBuilder, QtDesigner, formbuilder.h) +QT_CLASS_LIB(QDesignerExportWidget, QtDesigner, qdesignerexportwidget.h) +QT_CLASS_LIB(Phonon::AbstractAudioOutput, phonon, abstractaudiooutput.h) +QT_CLASS_LIB(Phonon::AbstractMediaStream, phonon, abstractmediastream.h) +QT_CLASS_LIB(Phonon::AbstractVideoOutput, phonon, abstractvideooutput.h) +QT_CLASS_LIB(Phonon::AddonInterface, phonon, addoninterface.h) +QT_CLASS_LIB(Phonon::AudioDataOutput, phonon, audiodataoutput.h) +QT_CLASS_LIB(Phonon::AudioDataOutputInterface, phonon, audiodataoutputinterface.h) +QT_CLASS_LIB(Phonon::AudioOutput, phonon, audiooutput.h) +QT_CLASS_LIB(Phonon::AudioOutputInterface40, phonon, audiooutputinterface.h) +QT_CLASS_LIB(Phonon::AudioOutputInterface42, phonon, audiooutputinterface.h) +QT_CLASS_LIB(Phonon::AudioOutputInterface, phonon, audiooutputinterface.h) +QT_CLASS_LIB(Phonon::AudioOutputInterface, phonon, audiooutputinterface.h) +QT_CLASS_LIB(Phonon::BackendCapabilities, phonon, backendcapabilities.h) +QT_CLASS_LIB(Phonon::BackendInterface, phonon, backendinterface.h) +QT_CLASS_LIB(Phonon::Effect, phonon, effect.h) +QT_CLASS_LIB(Phonon::EffectInterface, phonon, effectinterface.h) +QT_CLASS_LIB(Phonon::EffectParameter, phonon, effectparameter.h) +QT_CLASS_LIB(Phonon::EffectWidget, phonon, effectwidget.h) +QT_CLASS_LIB(Phonon::GlobalConfig, phonon, globalconfig.h) +QT_CLASS_LIB(Phonon::MediaController, phonon, mediacontroller.h) +QT_CLASS_LIB(Phonon::MediaNode, phonon, medianode.h) +QT_CLASS_LIB(Phonon::MediaObject, phonon, mediaobject.h) +QT_CLASS_LIB(Phonon::MediaObjectInterface, phonon, mediaobjectinterface.h) +QT_CLASS_LIB(Phonon::MediaSource, phonon, mediasource.h) +QT_CLASS_LIB(Phonon::ObjectDescriptionData, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::ObjectDescription, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::AudioOutputDevice, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::AudioCaptureDevice, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::EffectDescription, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::AudioChannelDescription, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::SubtitleDescription, phonon, objectdescription.h) +QT_CLASS_LIB(Phonon::ObjectDescriptionModelData, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::ObjectDescriptionModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::AudioOutputDeviceModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::AudioCaptureDeviceModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::EffectDescriptionModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::AudioChannelDescriptionModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::SubtitleDescriptionModel, phonon, objectdescriptionmodel.h) +QT_CLASS_LIB(Phonon::Path, phonon, path.h) +QT_CLASS_LIB(Phonon::Global, phonon, phononnamespace.h) +QT_CLASS_LIB(Phonon::PlatformPlugin, phonon, platformplugin.h) +QT_CLASS_LIB(Phonon::PulseSupport, phonon, pulsesupport.h) +QT_CLASS_LIB(Phonon::SeekSlider, phonon, seekslider.h) +QT_CLASS_LIB(Phonon::StreamInterface, phonon, streaminterface.h) +QT_CLASS_LIB(Phonon::VideoPlayer, phonon, videoplayer.h) +QT_CLASS_LIB(Phonon::VideoWidget, phonon, videowidget.h) +QT_CLASS_LIB(Phonon::VideoWidgetInterface, phonon, videowidgetinterface.h) +QT_CLASS_LIB(Phonon::VideoWidgetInterface44, phonon, videowidgetinterface.h) +QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h) +QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h) +QT_CLASS_LIB(Phonon::VolumeFaderEffect, phonon, volumefadereffect.h) +QT_CLASS_LIB(Phonon::VolumeFaderInterface, phonon, volumefaderinterface.h) +QT_CLASS_LIB(Phonon::VolumeSlider, phonon, volumeslider.h) +QT_CLASS_LIB(QGraphicsSvgItem, QtSvg, qgraphicssvgitem.h) +QT_CLASS_LIB(QSvgGenerator, QtSvg, qsvggenerator.h) +QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h) +QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h) +QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h) +QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h) +QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h) +QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h) +QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h) +QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h) +QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h) +QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h) +QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h) +QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h) +QT_CLASS_LIB(Q3IconView, Qt3Support, q3iconview.h) +QT_CLASS_LIB(Q3ListBox, Qt3Support, q3listbox.h) +QT_CLASS_LIB(Q3ListBoxItem, Qt3Support, q3listbox.h) +QT_CLASS_LIB(Q3ListBoxText, Qt3Support, q3listbox.h) +QT_CLASS_LIB(Q3ListBoxPixmap, Qt3Support, q3listbox.h) +QT_CLASS_LIB(Q3ListViewItem, Qt3Support, q3listview.h) +QT_CLASS_LIB(Q3ListView, Qt3Support, q3listview.h) +QT_CLASS_LIB(Q3CheckListItem, Qt3Support, q3listview.h) +QT_CLASS_LIB(Q3ListViewItemIterator, Qt3Support, q3listview.h) +QT_CLASS_LIB(Q3TableSelection, Qt3Support, q3table.h) +QT_CLASS_LIB(Q3TableItem, Qt3Support, q3table.h) +QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h) +QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h) +QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h) +QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h) +QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h) +QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h) +QT_CLASS_LIB(Q3HttpHeader, Qt3Support, q3http.h) +QT_CLASS_LIB(Q3HttpResponseHeader, Qt3Support, q3http.h) +QT_CLASS_LIB(Q3HttpRequestHeader, Qt3Support, q3http.h) +QT_CLASS_LIB(Q3Http, Qt3Support, q3http.h) +QT_CLASS_LIB(Q3LocalFs, Qt3Support, q3localfs.h) +QT_CLASS_LIB(Q3NetworkProtocolFactoryBase, Qt3Support, q3networkprotocol.h) +QT_CLASS_LIB(Q3NetworkProtocolFactory, Qt3Support, q3networkprotocol.h) +QT_CLASS_LIB(Q3NetworkProtocolDict, Qt3Support, q3networkprotocol.h) +QT_CLASS_LIB(Q3NetworkProtocol, Qt3Support, q3networkprotocol.h) +QT_CLASS_LIB(Q3NetworkOperation, Qt3Support, q3networkprotocol.h) +QT_CLASS_LIB(Q3ServerSocket, Qt3Support, q3serversocket.h) +QT_CLASS_LIB(Q3Socket, Qt3Support, q3socket.h) +QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h) +QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h) +QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h) +QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h) +QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h) +QT_CLASS_LIB(Q3HBoxLayout, Qt3Support, q3boxlayout.h) +QT_CLASS_LIB(Q3VBoxLayout, Qt3Support, q3boxlayout.h) +QT_CLASS_LIB(Q3DragObject, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3StoredDrag, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3TextDrag, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3ImageDrag, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3UriDrag, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3ColorDrag, Qt3Support, q3dragobject.h) +QT_CLASS_LIB(Q3DropSite, Qt3Support, q3dropsite.h) +QT_CLASS_LIB(Q3GridLayout, Qt3Support, q3gridlayout.h) +QT_CLASS_LIB(Q3MimeSourceFactory, Qt3Support, q3mimefactory.h) +QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h) +QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h) +QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h) +QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h) +QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h) +QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h) +QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h) +QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h) +QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h) +QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h) +QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h) +QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h) +QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h) +QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h) +QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h) +QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h) +QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h) +QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h) +QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h) +QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h) +QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h) +QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h) +QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h) +QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h) +QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h) +QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h) +QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h) +QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h) +QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h) +QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h) +QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h) +QT_CLASS_LIB(Q3AsciiDict, Qt3Support, q3asciidict.h) +QT_CLASS_LIB(Q3AsciiDictIterator, Qt3Support, q3asciidict.h) +QT_CLASS_LIB(Q3Cache, Qt3Support, q3cache.h) +QT_CLASS_LIB(Q3CacheIterator, Qt3Support, q3cache.h) +QT_CLASS_LIB(Q3CleanupHandler, Qt3Support, q3cleanuphandler.h) +QT_CLASS_LIB(Q3SingleCleanupHandler, Qt3Support, q3cleanuphandler.h) +QT_CLASS_LIB(Q3CString, Qt3Support, q3cstring.h) +QT_CLASS_LIB(Q3DeepCopy, Qt3Support, q3deepcopy.h) +QT_CLASS_LIB(Q3Dict, Qt3Support, q3dict.h) +QT_CLASS_LIB(Q3DictIterator, Qt3Support, q3dict.h) +QT_CLASS_LIB(Q3GArray, Qt3Support, q3garray.h) +QT_CLASS_LIB(Q3GCache, Qt3Support, q3gcache.h) +QT_CLASS_LIB(Q3GCacheIterator, Qt3Support, q3gcache.h) +QT_CLASS_LIB(Q3BaseBucket, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3StringBucket, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3AsciiBucket, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3IntBucket, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3PtrBucket, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3GDict, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3GDictIterator, Qt3Support, q3gdict.h) +QT_CLASS_LIB(Q3LNode, Qt3Support, q3glist.h) +QT_CLASS_LIB(Q3GList, Qt3Support, q3glist.h) +QT_CLASS_LIB(Q3GListIterator, Qt3Support, q3glist.h) +QT_CLASS_LIB(Q3GListStdIterator, Qt3Support, q3glist.h) +QT_CLASS_LIB(Q3GVector, Qt3Support, q3gvector.h) +QT_CLASS_LIB(Q3IntCache, Qt3Support, q3intcache.h) +QT_CLASS_LIB(Q3IntCacheIterator, Qt3Support, q3intcache.h) +QT_CLASS_LIB(Q3IntDict, Qt3Support, q3intdict.h) +QT_CLASS_LIB(Q3IntDictIterator, Qt3Support, q3intdict.h) +QT_CLASS_LIB(Q3MemArray, Qt3Support, q3memarray.h) +QT_CLASS_LIB(Q3ObjectDictionary, Qt3Support, q3objectdict.h) +QT_CLASS_LIB(Q3PtrCollection, Qt3Support, q3ptrcollection.h) +QT_CLASS_LIB(Q3PtrDict, Qt3Support, q3ptrdict.h) +QT_CLASS_LIB(Q3PtrDictIterator, Qt3Support, q3ptrdict.h) +QT_CLASS_LIB(Q3PtrListStdIterator, Qt3Support, q3ptrlist.h) +QT_CLASS_LIB(Q3PtrList, Qt3Support, q3ptrlist.h) +QT_CLASS_LIB(Q3PtrListIterator, Qt3Support, q3ptrlist.h) +QT_CLASS_LIB(Q3PtrQueue, Qt3Support, q3ptrqueue.h) +QT_CLASS_LIB(Q3PtrStack, Qt3Support, q3ptrstack.h) +QT_CLASS_LIB(Q3PtrVector, Qt3Support, q3ptrvector.h) +QT_CLASS_LIB(Q3Semaphore, Qt3Support, q3semaphore.h) +QT_CLASS_LIB(Q3Shared, Qt3Support, q3shared.h) +QT_CLASS_LIB(Q3Signal, Qt3Support, q3signal.h) +QT_CLASS_LIB(Q3SortedList, Qt3Support, q3sortedlist.h) +QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h) +QT_CLASS_LIB(Q3StrListIterator, Qt3Support, q3strlist.h) +QT_CLASS_LIB(Q3StrList, Qt3Support, q3strlist.h) +QT_CLASS_LIB(Q3StrIList, Qt3Support, q3strlist.h) +QT_CLASS_LIB(Q3StrVec, Qt3Support, q3strvec.h) +QT_CLASS_LIB(Q3StrIVec, Qt3Support, q3strvec.h) +QT_CLASS_LIB(Q3ValueListIterator, Qt3Support, q3valuelist.h) +QT_CLASS_LIB(Q3ValueListConstIterator, Qt3Support, q3valuelist.h) +QT_CLASS_LIB(Q3ValueList, Qt3Support, q3valuelist.h) +QT_CLASS_LIB(Q3ValueStack, Qt3Support, q3valuestack.h) +QT_CLASS_LIB(Q3ValueVector, Qt3Support, q3valuevector.h) +QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h) +QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h) +QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h) +QT_CLASS_LIB(Q3ButtonGroup, Qt3Support, q3buttongroup.h) +QT_CLASS_LIB(Q3VButtonGroup, Qt3Support, q3buttongroup.h) +QT_CLASS_LIB(Q3HButtonGroup, Qt3Support, q3buttongroup.h) +QT_CLASS_LIB(Q3ComboBox, Qt3Support, q3combobox.h) +QT_CLASS_LIB(Q3DateTimeEditBase, Qt3Support, q3datetimeedit.h) +QT_CLASS_LIB(Q3DateEdit, Qt3Support, q3datetimeedit.h) +QT_CLASS_LIB(Q3TimeEdit, Qt3Support, q3datetimeedit.h) +QT_CLASS_LIB(Q3DateTimeEdit, Qt3Support, q3datetimeedit.h) +QT_CLASS_LIB(Q3DockAreaLayout, Qt3Support, q3dockarea.h) +QT_CLASS_LIB(Q3DockArea, Qt3Support, q3dockarea.h) +QT_CLASS_LIB(Q3DockWindow, Qt3Support, q3dockwindow.h) +QT_CLASS_LIB(Q3Frame, Qt3Support, q3frame.h) +QT_CLASS_LIB(Q3Grid, Qt3Support, q3grid.h) +QT_CLASS_LIB(Q3GridView, Qt3Support, q3gridview.h) +QT_CLASS_LIB(Q3GroupBox, Qt3Support, q3groupbox.h) +QT_CLASS_LIB(Q3HBox, Qt3Support, q3hbox.h) +QT_CLASS_LIB(Q3Header, Qt3Support, q3header.h) +QT_CLASS_LIB(Q3HGroupBox, Qt3Support, q3hgroupbox.h) +QT_CLASS_LIB(Q3MainWindow, Qt3Support, q3mainwindow.h) +QT_CLASS_LIB(Q3PopupMenu, Qt3Support, q3popupmenu.h) +QT_CLASS_LIB(Q3ProgressBar, Qt3Support, q3progressbar.h) +QT_CLASS_LIB(Q3RangeControl, Qt3Support, q3rangecontrol.h) +QT_CLASS_LIB(Q3SpinWidget, Qt3Support, q3rangecontrol.h) +QT_CLASS_LIB(Q3ScrollView, Qt3Support, q3scrollview.h) +QT_CLASS_LIB(Q3ToolBar, Qt3Support, q3toolbar.h) +QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.h) +QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h) +QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h) +QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h) diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro index 9b63d42c2b..591925ca90 100644 --- a/src/tools/uic/uic.pro +++ b/src/tools/uic/uic.pro @@ -6,7 +6,7 @@ DEFINES += QT_UIC INCLUDEPATH += . DEPENDPATH += . -!contains(QT_CONFIG, qt3support):DEFINES += QT_NO_QT3_SUPPORT +!contains(QT_CONFIG, gui-qt3support):DEFINES += QT_NO_QT3_SUPPORT include(uic.pri) include(cpp/cpp.pri) diff --git a/src/uitools/uitools.pro b/src/uitools/uitools.pro index be46afcfcf..32c4501375 100644 --- a/src/uitools/uitools.pro +++ b/src/uitools/uitools.pro @@ -1,9 +1,10 @@ +MODULE = uitools +QPRO_PWD = $$PWD TEMPLATE = lib -TARGET = QtUiTools -QT += xml +TARGET = $$qtLibraryTarget(QtUiTools) +QT = core xml CONFIG += qt staticlib -DESTDIR = ../../../../lib -DLLDESTDIR = ../../../../bin +DESTDIR = $$QMAKE_LIBDIR_QT symbian { TARGET.UID3 = 0x2001E628 @@ -18,11 +19,11 @@ isEmpty(QT_MAJOR_VERSION) { } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } -include(../../../../src/qt_targets.pri) +include(../qt_targets.pri) QMAKE_TARGET_PRODUCT = UiLoader QMAKE_TARGET_DESCRIPTION = QUiLoader -include(../lib/uilib/uilib.pri) +include(../../tools/uilib/uilib.pri) HEADERS += quiloader.h SOURCES += quiloader.cpp @@ -43,5 +44,3 @@ unix|win32-g++* { QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_REQUIRES += QtXml } - -TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end diff --git a/sync.profile b/sync.profile new file mode 100644 index 0000000000..9631d2291f --- /dev/null +++ b/sync.profile @@ -0,0 +1,60 @@ +%modules = ( # path to module name map + "QtGui" => "$basedir/src/gui", + "QtOpenGL" => "$basedir/src/opengl", + "QtOpenVG" => "$basedir/src/openvg", + "QtCore" => "$basedir/src/corelib", + "QtXml" => "$basedir/src/xml", + "QtSql" => "$basedir/src/sql", + "QtNetwork" => "$basedir/src/network", + "QtTest" => "$basedir/src/testlib", + "QtDBus" => "$basedir/src/dbus", + "QtUiTools" => "$basedir/src/uitools", + "QtDesigner" => "$basedir/tools/uilib", +); +%moduleheaders = ( # restrict the module headers to those found in relative path +); +%classnames = ( + "qglobal.h" => "QtGlobal", + "qendian.h" => "QtEndian", + "qconfig.h" => "QtConfig", + "qplugin.h" => "QtPlugin", + "qalgorithms.h" => "QtAlgorithms", + "qcontainerfwd.h" => "QtContainerFwd", + "qdebug.h" => "QtDebug", + "qevent.h" => "QtEvents", + "qnamespace.h" => "Qt", + "qssl.h" => "QSsl", + "qtest.h" => "QTest", + "qtconcurrentmap.h" => "QtConcurrentMap", + "qtconcurrentfilter.h" => "QtConcurrentFilter", + "qtconcurrentrun.h" => "QtConcurrentRun", +); +%mastercontent = ( + "core" => "#include <QtCore/QtCore>\n", + "gui" => "#include <QtGui/QtGui>\n", + "network" => "#include <QtNetwork/QtNetwork>\n", + "opengl" => "#include <QtOpenGL/QtOpenGL>\n", + "openvg" => "#include <QtOpenVG/QtOpenVG>\n", + "xml" => "#include <QtXml/QtXml>\n", + "uitools" => "#include <QtUiTools/QtUiTools>\n", + "designer" => "#include <QtDesigner/QtDesigner>\n", +); +%modulepris = ( + "QtCore" => "$basedir/src/modules/qt_core.pri", + "QtDBus" => "$basedir/src/modules/qt_dbus.pri", + "QtGui" => "$basedir/src/modules/qt_gui.pri", + "QtNetwork" => "$basedir/src/modules/qt_network.pri", + "QtOpenGL" => "$basedir/src/modules/qt_opengl.pri", + "QtOpenVG" => "$basedir/src/modules/qt_openvg.pri", + "QtSql" => "$basedir/src/modules/qt_sql.pri", + "QtTest" => "$basedir/src/modules/qt_testlib.pri", + "QtXml" => "$basedir/src/modules/qt_xml.pri", + "QtUiTools" => "$basedir/src/modules/qt_uitools.pri", + "QtDesigner" => "$basedir/src/modules/qt_uilib.pri", +); + +@ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" ); +@ignore_for_include_check = ( "qatomic.h" ); +@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" ); +@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" ); +@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" ); diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c67724958e..02e8b5bebb 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -9,15 +9,5 @@ SUBDIRS += \ other.pro !cross_compile: SUBDIRS += host.pro -contains(QT_CONFIG, qt3support):!wince*: SUBDIRS += qt3support.pro contains(QT_CONFIG, opengl): SUBDIRS += opengl.pro -contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns.pro unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro -contains(QT_CONFIG, script): SUBDIRS += script.pro -contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro -contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro -contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro -contains(QT_CONFIG, svg): SUBDIRS += svg.pro -contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro -!symbian SUBDIRS += help.pro - diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt new file mode 100644 index 0000000000..9b8d11c579 --- /dev/null +++ b/tests/auto/compilerwarnings/data/test_cpp.txt @@ -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> +#endif + +#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 **) +{ + return 0; +} +#endif diff --git a/tests/auto/guiapplauncher/README.txt b/tests/auto/guiapplauncher/README.txt new file mode 100644 index 0000000000..d6ea4ef014 --- /dev/null +++ b/tests/auto/guiapplauncher/README.txt @@ -0,0 +1,2 @@ +The guiapplauncher from the qtqa repository uses the data in this +directory to do its testing for this module. diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt new file mode 100644 index 0000000000..2835f09477 --- /dev/null +++ b/tests/auto/guiapplauncher/demos.txt @@ -0,0 +1,14 @@ +"Affine Demo", "demos/affine", "affine", 0, -1 +"Books Demo", "demos/books", "books", 0, -1 +"Chip Demo", "demos/chip", "chip", 0, -1 +"Composition Demo", "demos/composition", "composition", 0, -1 +"Deform Demo", "demos/deform", "deform", 0, -1 +"Embeddeddialogs Demo", "demos/embeddeddialogs", "embeddeddialogs", 0, -1 +"Gradients Demo", "demos/gradients", "gradients", 0, -1 +"Interview Demo", "demos/interview", "interview", 0, -1 +"Mainwindow Demo", "demos/mainwindow", "mainwindow", 0, -1 +"PathStroke Demo", "demos/pathstroke", "pathstroke", 0, -1 +"Spreadsheet Demo", "demos/spreadsheet", "spreadsheet", 0, -1 +"Sub-Attac Demo", "demos/sub-attaq", "sub-attaq", 0, -1 +"TextEdit Demo", "demos/textedit", "textedit", 0, -1 +"Undo Demo", "demos/undo", "undo", 0, -1 diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt new file mode 100644 index 0000000000..fea7e543f0 --- /dev/null +++ b/tests/auto/guiapplauncher/examples.txt @@ -0,0 +1,99 @@ +"animation/animatedtiles Example", "examples/animation/animatedtiles", "animatedtiles", 0, -1 +"animation/appchooser Example", "examples/animation/appchooser", "appchooser", 10, -1 +"animation/easing Example", "examples/animation/easing", "easing", 10, -1 +"animation/moveblocks Example", "examples/animation/moveblocks", "moveblocks", 10, -1 +"animation/states Example", "examples/animation/states", "states", 10, -1 +"animation/stickman Example", "examples/animation/stickman", "stickman", 10, -1 +"designer/calculatorbuilder Example", "examples/designer/calculatorbuilder", "calculatorbuilder", 10, -1 +"dialogs/standarddialogs Example", "examples/dialogs/standarddialogs", "standarddialogs", 10, -1 +"draganddrop/dropsite Example", "examples/draganddrop/dropsite", "dropsite", 10, -1 +"draganddrop/fridgemagnets Example", "examples/draganddrop/fridgemagnets", "fridgemagnets", 10, -1 +"draganddrop/puzzle Example", "examples/draganddrop/puzzle", "puzzle", 10, -1 +"effects/blurpicker Example", "examples/effects/blurpicker", "blurpicker", 10, -1 +"effects/customshader Example", "examples/effects/customshader", "customshader", 10, -1 +"effects/fademessage Example", "examples/effects/fademessage", "fademessage", 10, -1 +"effects/lighting Example", "examples/effects/lighting", "lighting", 10, -1 +"graphicsview/anchorlayout Example", "examples/graphicsview/anchorlayout", "anchorlayout", 10, -1 +"graphicsview/basicgraphicslayouts Example", "examples/graphicsview/basicgraphicslayouts", "basicgraphicslayouts", 0, -1 +"graphicsview/collidingmice Example", "examples/graphicsview/collidingmice", "collidingmice", 10, -1 +"graphicsview/diagramscene Example", "examples/graphicsview/diagramscene", "diagramscene", 10, -1 +"graphicsview/dragdroprobot Example", "examples/graphicsview/dragdroprobot", "dragdroprobot", 10, -1 +"graphicsview/elasticnodes Example", "examples/graphicsview/elasticnodes", "elasticnodes", 10, -1 +"graphicsview/flowlayout Example", "examples/graphicsview/flowlayout", "flowlayout", 10, -1 +"graphicsview/padnavigator Example", "examples/graphicsview/padnavigator", "padnavigator", 0, -1 +"graphicsview/portedasteroids Example", "examples/graphicsview/portedasteroids", "portedasteroids", 10, -1 +"graphicsview/portedcanvas Example", "examples/graphicsview/portedcanvas", "portedcanvas", 10, -1 +"graphicsview/weatheranchorlayout Example", "examples/graphicsview/weatheranchorlayout", "weatheranchorlayout", 10, -1 +"itemviews/addressbook Example", "examples/itemviews/addressbook", "addressbook", 0, -1 +"itemviews/basicsortfiltermodel Example", "examples/itemviews/basicsortfiltermodel", "basicsortfiltermodel", 10, -1 +"itemviews/chart Example", "examples/itemviews/chart", "chart", 0, -1 +"itemviews/coloreditorfactory Example", "examples/itemviews/coloreditorfactory", "coloreditorfactory", 10, -1 +"itemviews/combowidgetmapper Example", "examples/itemviews/combowidgetmapper", "combowidgetmapper", 6, -1 +"itemviews/customsortfiltermodel Example", "examples/itemviews/customsortfiltermodel", "customsortfiltermodel", 6, -1 +"itemviews/dirview Example", "examples/itemviews/dirview", "dirview", 0, -1 +"itemviews/editabletreemodel Example", "examples/itemviews/editabletreemodel", "editabletreemodel", 0, -1 +"itemviews/fetchmore Example", "examples/itemviews/fetchmore", "fetchmore", 10, -1 +"itemviews/frozencolumn Example", "examples/itemviews/frozencolumn", "frozencolumn", 10, -1 +"itemviews/pixelator Example", "examples/itemviews/pixelator", "pixelator", 10, -1 +"itemviews/puzzle Example", "examples/itemviews/puzzle", "puzzle", 10, -1 +"itemviews/simpledommodel Example", "examples/itemviews/simpledommodel", "simpledommodel", 10, -1 +"itemviews/simpletreemodel Example", "examples/itemviews/simpletreemodel", "simpletreemodel", 10, -1 +"itemviews/simplewidgetmapper Example", "examples/itemviews/simplewidgetmapper", "simplewidgetmapper", 10, -1 +"itemviews/spinboxdelegate Example", "examples/itemviews/spinboxdelegate", "spinboxdelegate", 0, -1 +"itemviews/stardelegate Example", "examples/itemviews/stardelegate", "stardelegate", 10, -1 +"layouts/basiclayouts Example", "examples/layouts/basiclayouts", "basiclayouts", 0, -1 +"layouts/borderlayout Example", "examples/layouts/borderlayout", "borderlayout", 10, -1 +"layouts/dynamiclayouts Example", "examples/layouts/dynamiclayouts", "dynamiclayouts", 10, -1 +"layouts/flowlayout Example", "examples/layouts/flowlayout", "flowlayout", 10, -1 +"mainwindows/application Example", "examples/mainwindows/application", "application", 6, -1 +"mainwindows/dockwidgets Example", "examples/mainwindows/dockwidgets", "dockwidgets", 0, -1 +"mainwindows/mdi Example", "examples/mainwindows/mdi", "mdi", 0, -1 +"mainwindows/menus Example", "examples/mainwindows/menus", "menus", 10, -1 +"mainwindows/recentfiles Example", "examples/mainwindows/recentfiles", "recentfiles", 10, -1 +"mainwindows/sdi Example", "examples/mainwindows/sdi", "sdi", 10, -1 +"touch/dials Example", "examples/touch/dials", "dials", 10, -1 +"touch/fingerpaint Example", "examples/touch/fingerpaint", "fingerpaint", 10, -1 +"touch/knobs Example", "examples/touch/knobs", "knobs", 10, -1 +"touch/pinchzoom Example", "examples/touch/pinchzoom", "pinchzoom", 10, -1 +"opengl/2dpainting Example", "examples/opengl/2dpainting", "2dpainting", 10, -1 +"opengl/grabber Example", "examples/opengl/grabber", "grabber", 10, -1 +"opengl/hellogl Example", "examples/opengl/hellogl", "hellogl", 10, -1 +"opengl/overpainting Example", "examples/opengl/overpainting", "overpainting", 10, -1 +"opengl/samplebuffers Example", "examples/opengl/samplebuffers", "samplebuffers", 10, -1 +"opengl/textures Example", "examples/opengl/textures", "textures", 10, -1 +"painting/basicdrawing Example", "examples/painting/basicdrawing", "basicdrawing", 10, -1 +"painting/concentriccircles Example", "examples/painting/concentriccircles", "concentriccircles", 0, -1 +"painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1 +"painting/imagecomposition Example", "examples/painting/imagecomposition", "imagecomposition", 10, -1 +"painting/painterpaths Example", "examples/painting/painterpaths", "painterpaths", 10, -1 +"painting/transformations Example", "examples/painting/transformations", "transformations", 0, -1 +"qtconcurrent/imagescaling Example", "examples/qtconcurrent/imagescaling", "imagescaling", 10, -1 +"richtext/calendar Example", "examples/richtext/calendar", "calendar", 0, -1 +"richtext/orderform Example", "examples/richtext/orderform", "orderform", 10, -1 +"richtext/syntaxhighlighter Example", "examples/richtext/syntaxhighlighter", "syntaxhighlighter", 0, -1 +"richtext/textobject Example", "examples/richtext/textobject", "textobject", 10, -1 +"statemachine/eventtransitions Example", "examples/statemachine/eventtransitions", "eventtransitions", 10, -1 +"statemachine/rogue Example", "examples/statemachine/rogue", "rogue", 10, -1 +"statemachine/trafficlight Example", "examples/statemachine/trafficlight", "trafficlight", 0, -1 +"statemachine/twowaybutton Example", "examples/statemachine/twowaybutton", "twowaybutton", 10, -1 +"tutorials/addressbook/part7 Example", "examples/tutorials/addressbook/part7", "part7", 0, -1 +"widgets/analogclock Example", "examples/widgets/analogclock", "analogclock", 6, -1 +"widgets/calculator Example", "examples/widgets/calculator", "calculator", 6, -1 +"widgets/calendarwidget Example", "examples/widgets/calendarwidget", "calendarwidget", 10, -1 +"widgets/charactermap Example", "examples/widgets/charactermap", "charactermap", 10, -1 +"widgets/codeeditor Example", "examples/widgets/codeeditor", "codeeditor", 0, -1 +"widgets/digitalclock Example", "examples/widgets/digitalclock", "digitalclock", 10, -1 +"widgets/groupbox Example", "examples/widgets/groupbox", "groupbox", 10, -1 +"widgets/icons Example", "examples/widgets/icons", "icons", 10, -1 +"widgets/imageviewer Example", "examples/widgets/imageviewer", "imageviewer", 10, -1 +"widgets/lineedits Example", "examples/widgets/lineedits", "lineedits", 10, -1 +"widgets/scribble Example", "examples/widgets/scribble", "scribble", 10, -1 +"widgets/sliders Example", "examples/widgets/sliders", "sliders", 10, -1 +"widgets/spinboxes Example", "examples/widgets/spinboxes", "spinboxes", 10, -1 +"widgets/styles Example", "examples/widgets/styles", "styles", 0, -1 +"widgets/stylesheet Example", "examples/widgets/stylesheet", "stylesheet", 0, -1 +"widgets/tablet Example", "examples/widgets/tablet", "tablet", 10, -1 +"widgets/tetrix Example", "examples/widgets/tetrix", "tetrix", 0, -1 +"widgets/tooltips Example", "examples/widgets/tooltips", "tooltips", 10, -1 +"widgets/validators Example", "examples/widgets/validators", "validators", 10, -1 +"widgets/wiggly Example", "examples/widgets/wiggly", "wiggly", 10, -1 diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro new file mode 100644 index 0000000000..d9b6ae3e2a --- /dev/null +++ b/tests/auto/headersclean/headersclean.pro @@ -0,0 +1,7 @@ +load(qttest_p4) +SOURCES += tst_headersclean.cpp +QT = core network xml sql uitools + +contains(QT_CONFIG,dbus): QT += dbus +contains(QT_CONFIG,opengl): QT += opengl +contains(QT_CONFIG,openvg): QT += openvg
\ No newline at end of file diff --git a/tests/auto/headersclean/tst_headersclean.cpp b/tests/auto/headersclean/tst_headersclean.cpp new file mode 100644 index 0000000000..fbe68f543c --- /dev/null +++ b/tests/auto/headersclean/tst_headersclean.cpp @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#define QT_NO_KEYWORDS +#define signals int +#define slots int +#define emit public:; +#define foreach public:; +#define forever public:; + +#include <QtCore/QtCore> +#include <QtTest/QtTest> + +#include <QtNetwork/QtNetwork> +#include <QtXml/QtXml> +#include <QtSql/QtSql> +#include <QtGui/QtGui> + +#include <QtUiTools/QtUiTools> + +#ifndef QT_NO_OPENGL +#include <QtOpenGL/QtOpenGL> +#endif + +#if !defined(QT_NO_DBUS) && defined(Q_OS_UNIX) +#include <QtDBus/QtDBus> +#endif + +#ifndef QT_NO_OPENVG +#include <QtOpenVG/QtOpenVG> +#endif + +class tst_HeadersClean: public QObject +{ + Q_OBJECT +public: + tst_HeadersClean() {} +}; + +QTEST_MAIN(tst_HeadersClean) +#include "tst_headersclean.moc"
\ No newline at end of file diff --git a/tests/auto/host.pro b/tests/auto/host.pro index 3ae6a7a09e..44216ae101 100644 --- a/tests/auto/host.pro +++ b/tests/auto/host.pro @@ -1,7 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ compiler \ - linguist \ + headersclean \ maketestselftest \ moc \ uic \ @@ -10,5 +10,5 @@ SUBDIRS=\ #atwrapper \ # These tests need significant updating, #uiloader \ # they have hardcoded machine names etc. -contains(QT_CONFIG,qt3support):SUBDIRS+=uic3 +#contains(QT_CONFIG,qt3support):SUBDIRS+=uic3 diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp index 8ed8cb88d0..9fbfd5a2c6 100644 --- a/tests/auto/maketestselftest/tst_maketestselftest.cpp +++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp @@ -148,7 +148,8 @@ void tst_MakeTestSelfTest::tests_pro_files_data() foreach (const QString& subdir, subdirs) { if (subdir == QString::fromLatin1("tmp") - || subdir.startsWith(".")) + || subdir.startsWith(".") + || !dir.exists(subdir + "/" + subdir + ".pro")) { continue; } diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp index 8dd7cbcc28..d0d8e9aead 100644 --- a/tests/auto/qalgorithms/tst_qalgorithms.cpp +++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp @@ -47,7 +47,7 @@ #include <sstream> #include <algorithm> #include <qalgorithms.h> -#include "../../../src/qt3support/tools/q3tl.h" +#include "q3tl.h" #include <QStringList> #include <QString> #include <QVector> diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro index b1fba732c8..91a2137f2c 100644 --- a/tests/auto/qsidebar/qsidebar.pro +++ b/tests/auto/qsidebar/qsidebar.pro @@ -1,7 +1,5 @@ CONFIG += qttest_p4 -include(../../src/qfiledialog.pri) - SOURCES += tst_qsidebar.cpp TARGET = tst_qsidebar diff --git a/tests/benchmarks/corelib/tools/qregexp/main.cpp b/tests/benchmarks/corelib/tools/qregexp/main.cpp index 98d539f21a..74f9e63ace 100644 --- a/tests/benchmarks/corelib/tools/qregexp/main.cpp +++ b/tests/benchmarks/corelib/tools/qregexp/main.cpp @@ -49,9 +49,10 @@ #include <boost/regex.hpp> #endif +#ifdef HAVE_JSC #include <QtScript> #include "pcre/pcre.h" - +#endif #define ZLIB_VERSION "1.2.3.4" class tst_qregexp : public QObject @@ -82,9 +83,11 @@ private slots: void rangeReplace2(); void matchReplace2(); +#ifdef HAVE_JSC void simpleFindJSC(); void rangeReplaceJSC(); void matchReplaceJSC(); +#endif #ifdef HAVE_BOOST void simpleFindBoost(); @@ -100,8 +103,10 @@ private slots: void horribleReplace1(); void horribleReplace2(); void horribleWrongReplace2(); +#ifdef HAVE_JSC void horribleWrongReplaceJSC(); void horribleReplaceJSC(); +#endif #ifdef HAVE_BOOST void horribleWrongReplaceBoost(); void horribleReplaceBoost(); @@ -454,8 +459,7 @@ void tst_qregexp::horribleReplace2() } QCOMPARE(r, QString("1.2.3")); } - - +#ifdef HAVE_JSC void tst_qregexp::simpleFindJSC() { int numr; @@ -525,7 +529,7 @@ void tst_qregexp::horribleReplaceJSC() } QCOMPARE(r.toString(), QString("1.2.3")); } - +#endif #ifdef HAVE_BOOST void tst_qregexp::simpleFindBoost(){ diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index ffdad12cef..5e53824a96 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -5,14 +5,17 @@ DEPENDPATH += . INCLUDEPATH += . RESOURCES+=qregexp.qrc QT -= gui -QT += script CONFIG += release # Input SOURCES += main.cpp -include( $${QT_SOURCE_TREE}/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri ) +!isEmpty(QT.webkit.sources):exists($${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri) { + include( $${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri ) + DEFINES += HAVE_JSC + QT += script +} exists( /usr/include/boost/regex.hpp ){ DEFINES+=HAVE_BOOST diff --git a/tests/global/global.cfg b/tests/global/global.cfg new file mode 100644 index 0000000000..f39f4a0cfd --- /dev/null +++ b/tests/global/global.cfg @@ -0,0 +1,12 @@ +<config> +<modules> +<module name="QtCore" qtname="core"/> +<module name="QtDBus" qtname="dbus"/> +<module name="QtGui" qtname="gui"/> +<module name="QtNetwork" qtname="network"/> +<module name="QtOpenGL" qtname="opengl"/> +<module name="QtTest" qtname="testlib"/> +<module name="QtXml" qtname="xml"/> +<module name="QtSql" qtname="sql"/> +</modules> +</config> diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 494ea52ec5..9c2ce2cfb4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv) if (syncqt_bat.open(QFile::WriteOnly)) { QTextStream stream(&syncqt_bat); stream << "@echo off" << endl - << "set QTDIR=" << QDir::toNativeSeparators(sourcePath) << endl - << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\"" << endl - << "set QTDIR=" << QDir::toNativeSeparators(buildPath) << endl; + << "call " << fixSeparators(sourcePath) << fixSeparators("/bin/syncqt.bat -outdir \"") << fixSeparators(buildPath) << "\" \"" << fixSeparators(sourcePath) << "\"" << endl; syncqt_bat.close(); } } @@ -1595,9 +1593,6 @@ void Configure::applySpecSpecifics() dictionary[ "SQL_SQLITE" ] = "yes"; dictionary[ "SQL_SQLITE_LIB" ] = "system"; - // Disable building docs and translations for now - disabledBuildParts << "docs" << "translations"; - } else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong. //TODO dictionary[ "STYLE_WINDOWSXP" ] = "no"; @@ -2684,7 +2679,7 @@ void Configure::generateOutputVars() qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]); if (dictionary[ "QT3SUPPORT" ] == "yes") - qtConfig += "qt3support"; + qtConfig += "gui-qt3support"; if (dictionary[ "OPENGL" ] == "yes") qtConfig += "opengl"; @@ -2729,51 +2724,52 @@ void Configure::generateOutputVars() if (dictionary[ "CETEST" ] == "yes") qtConfig += "cetest"; - if (dictionary[ "SCRIPT" ] == "yes") - qtConfig += "script"; +// No longer needed after modularization +// if (dictionary[ "SCRIPT" ] == "yes") +// qtConfig += "script"; - if (dictionary[ "SCRIPTTOOLS" ] == "yes") { - if (dictionary[ "SCRIPT" ] == "no") { - cout << "QtScriptTools was requested, but it can't be built due to QtScript being " - "disabled." << endl; - dictionary[ "DONE" ] = "error"; - } - qtConfig += "scripttools"; - } +// No longer needed after modularization +// if (dictionary[ "SCRIPTTOOLS" ] == "yes") { +// if (dictionary[ "SCRIPT" ] == "no") { +// cout << "QtScriptTools was requested, but it can't be built due to QtScript being " +// "disabled." << endl; +// dictionary[ "DONE" ] = "error"; +// } +// qtConfig += "scripttools"; +// } - if (dictionary[ "XMLPATTERNS" ] == "yes") - qtConfig += "xmlpatterns"; +// No longer needed after modularization +// if (dictionary[ "XMLPATTERNS" ] == "yes") +// qtConfig += "xmlpatterns"; if (dictionary["PHONON"] == "yes") { - qtConfig += "phonon"; + // No longer needed after modularization + //qtConfig += "phonon"; if (dictionary["PHONON_BACKEND"] == "yes") qtConfig += "phonon-backend"; } if (dictionary["MULTIMEDIA"] == "yes") { - qtConfig += "multimedia"; + // No longer needed after modularization + //qtConfig += "multimedia"; if (dictionary["AUDIO_BACKEND"] == "yes") qtConfig += "audio-backend"; } - QString dst = buildPath + "/mkspecs/modules/qt_webkit_version.pri"; - QFile::remove(dst); if (dictionary["WEBKIT"] != "no") { - // This include takes care of adding "webkit" to QT_CONFIG. - QString src = sourcePath + "/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri"; - QFile::copy(src, dst); if (dictionary["WEBKIT"] == "debug") qtConfig += "webkit-debug"; } - if (dictionary["DECLARATIVE"] == "yes") { - if (dictionary[ "SCRIPT" ] == "no") { - cout << "QtDeclarative was requested, but it can't be built due to QtScript being " - "disabled." << endl; - dictionary[ "DONE" ] = "error"; - } - qtConfig += "declarative"; - } +// No longer needed after modularization +// if (dictionary["DECLARATIVE"] == "yes") { +// if (dictionary[ "SCRIPT" ] == "no") { +// cout << "QtDeclarative was requested, but it can't be built due to QtScript being " +// "disabled." << endl; +// dictionary[ "DONE" ] = "error"; +// } +// qtConfig += "declarative"; +// } if (dictionary["DIRECTWRITE"] == "yes") qtConfig += "directwrite"; @@ -2911,63 +2907,101 @@ void Configure::generateCachefile() QFile cacheFile(buildPath + "/.qmake.cache"); if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream cacheStream(&cacheFile); + + cacheStream << "include($$PWD/mkspecs/qmodule.pri)" << endl; + for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) { cacheStream << (*var) << endl; } cacheStream << "CONFIG += " << qmakeConfig.join(" ") << " incremental msvc_mp create_prl link_prl depend_includepath QTDIR_build" << endl; + cacheStream.flush(); + cacheFile.close(); + } + + // Generate qmodule.pri + QFile moduleFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qmodule.pri"); + if (moduleFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. + QTextStream moduleStream(&moduleFile); + + moduleStream << "#paths" << endl; + moduleStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; + moduleStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; QStringList buildParts; - buildParts << "libs" << "tools" << "examples" << "demos" << "docs" << "translations"; + buildParts << "libs" << "examples" << "demos"; foreach (const QString &item, disabledBuildParts) { buildParts.removeAll(item); } - cacheStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl; + moduleStream << "QT_BUILD_PARTS = " << buildParts.join(" ") << endl << endl; + + //so that we can build without an install first (which would be impossible) + moduleStream << "#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR" << endl; + moduleStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; + moduleStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; + moduleStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; + moduleStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; + moduleStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; + moduleStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; + QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ]; QString mkspec_path = fixSeparators(sourcePath + "/mkspecs/" + targetSpec); if (QFile::exists(mkspec_path)) - cacheStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; + moduleStream << "QMAKESPEC = " << escapeSeparators(mkspec_path) << endl; else - cacheStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; - cacheStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; - cacheStream << "QT_BUILD_TREE = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl; - cacheStream << "QT_SOURCE_TREE = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl; + moduleStream << "QMAKESPEC = " << fixSeparators(targetSpec, true) << endl; + moduleStream << "ARCH = " << dictionary[ "ARCHITECTURE" ] << endl; if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") - cacheStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; + moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; - //so that we can build without an install first (which would be impossible) - cacheStream << "QMAKE_MOC = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl; - cacheStream << "QMAKE_UIC = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl; - cacheStream << "QMAKE_UIC3 = $$QT_BUILD_TREE" << fixSeparators("/bin/uic3.exe", true) << endl; - cacheStream << "QMAKE_RCC = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl; - cacheStream << "QMAKE_DUMPCPP = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl; - cacheStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl; - cacheStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl; if (dictionary["CETEST"] == "yes") { - cacheStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; - cacheStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; + moduleStream << "QT_CE_RAPI_INC = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl; + moduleStream << "QT_CE_RAPI_LIB = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl; + } + + moduleStream << "#Qt for Windows CE c-runtime deployment" << endl + << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl; + + if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) + moduleStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; + + if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) + moduleStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; + + if (!dictionary["QT_LIBINFIX"].isEmpty()) + moduleStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; + + moduleStream << "#Qt for Symbian FPU settings" << endl; + if (!dictionary["ARM_FPU_TYPE"].isEmpty()) { + moduleStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; + } + if (!dictionary["QT_NAMESPACE"].isEmpty()) { + moduleStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; } // embedded if (!dictionary["KBD_DRIVERS"].isEmpty()) - cacheStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; + moduleStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; if (!dictionary["GFX_DRIVERS"].isEmpty()) - cacheStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; + moduleStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; if (!dictionary["MOUSE_DRIVERS"].isEmpty()) - cacheStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; + moduleStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; if (!dictionary["DECORATIONS"].isEmpty()) - cacheStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; + moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) - cacheStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; + moduleStream << "QMAKE_RPATHDIR += "<<dictionary["QMAKE_RPATHDIR"]; - cacheStream.flush(); - cacheFile.close(); + moduleStream.flush(); + moduleFile.close(); } + + // Generate qconfig.pri QFile configFile(dictionary[ "QT_BUILD_TREE" ] + "/mkspecs/qconfig.pri"); if (configFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file. QTextStream configStream(&configFile); + configStream << "CONFIG+= "; configStream << dictionary[ "BUILD" ]; if (dictionary[ "SHARED" ] == "yes") @@ -3027,26 +3061,6 @@ void Configure::generateCachefile() << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; - configStream << "#Qt for Windows CE c-runtime deployment" << endl - << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl; - - if (dictionary["CE_SIGNATURE"] != QLatin1String("no")) - configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl; - - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) - configStream << "QMAKE_RPATHDIR += " << dictionary["QMAKE_RPATHDIR"] << endl; - - if (!dictionary["QT_LIBINFIX"].isEmpty()) - configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; - - configStream << "#Qt for Symbian FPU settings" << endl; - if (!dictionary["ARM_FPU_TYPE"].isEmpty()) { - configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\""; - } - if (!dictionary["QT_NAMESPACE"].isEmpty()) { - configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; - } - configStream.flush(); configFile.close(); } @@ -3856,7 +3870,7 @@ void Configure::generateMakefiles() } // don't pass -spec - .qmake.cache has it already args << "-r"; - args << (sourcePath + "/projects.pro"); + args << (sourcePath + "/qtbase.pro"); args << "-o"; args << buildPath; if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty()) diff --git a/tools/uilib/abstractformbuilder.h b/tools/uilib/abstractformbuilder.h index b76f0e42b2..2f99b36515 100644 --- a/tools/uilib/abstractformbuilder.h +++ b/tools/uilib/abstractformbuilder.h @@ -42,7 +42,7 @@ #ifndef ABSTRACTFORMBUILDER_H #define ABSTRACTFORMBUILDER_H -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QHash> diff --git a/tools/uilib/customwidget.h b/tools/uilib/customwidget.h index 52c234207c..0a04c93c6d 100644 --- a/tools/uilib/customwidget.h +++ b/tools/uilib/customwidget.h @@ -42,7 +42,7 @@ #ifndef CUSTOMWIDGET_H #define CUSTOMWIDGET_H -#include <QtDesigner/extension.h> +#include "extension.h" #include <QtCore/QObject> #include <QtCore/QString> #include <QtGui/QIcon> diff --git a/tools/uilib/extension.h b/tools/uilib/extension.h new file mode 100644 index 0000000000..d13e5173e1 --- /dev/null +++ b/tools/uilib/extension.h @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Designer 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 EXTENSION_H +#define EXTENSION_H + +#include <QtCore/QString> +#include <QtCore/QObject> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#define Q_TYPEID(IFace) QLatin1String(IFace##_iid) + +class QAbstractExtensionFactory +{ +public: + virtual ~QAbstractExtensionFactory() {} + + virtual QObject *extension(QObject *object, const QString &iid) const = 0; +}; +Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory") + +class QAbstractExtensionManager +{ +public: + virtual ~QAbstractExtensionManager() {} + + virtual void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; + virtual void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; + + virtual QObject *extension(QObject *object, const QString &iid) const = 0; +}; +Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager") + +#if defined(Q_CC_MSVC) && (_MSC_VER < 1300) + +template <class T> +inline T qt_extension_helper(QAbstractExtensionManager *, QObject *, T) +{ return 0; } + +template <class T> +inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) +{ return qt_extension_helper(manager, object, T(0)); } + +#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ +const char * const IFace##_iid = IId; \ +Q_DECLARE_INTERFACE(IFace, IId) \ +template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager *manager, QObject *object, IFace *) \ +{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return (IFace *)(extension ? extension->qt_metacast(IFace##_iid) : 0); } + +#else + +template <class T> +inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) +{ return 0; } + +#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ +const char * const IFace##_iid = IId; \ +Q_DECLARE_INTERFACE(IFace, IId) \ +template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \ +{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(0); } + +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // EXTENSION_H diff --git a/tools/uilib/formbuilder.h b/tools/uilib/formbuilder.h index 01aeb16a09..1d3dc5a395 100644 --- a/tools/uilib/formbuilder.h +++ b/tools/uilib/formbuilder.h @@ -42,8 +42,8 @@ #ifndef FORMBUILDER_H #define FORMBUILDER_H -#include <QtDesigner/uilib_global.h> -#include <QtDesigner/QAbstractFormBuilder> +#include "uilib_global.h" +#include "abstractformbuilder.h" #include <QtCore/QStringList> #include <QtCore/QMap> diff --git a/tools/uilib/formscriptrunner_p.h b/tools/uilib/formscriptrunner_p.h index 117b4e88ee..c13bd4ca7c 100644 --- a/tools/uilib/formscriptrunner_p.h +++ b/tools/uilib/formscriptrunner_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QFlags> #include <QtCore/QString> diff --git a/tools/uilib/properties_p.h b/tools/uilib/properties_p.h index 5f40f87d32..e57f9ed2ed 100644 --- a/tools/uilib/properties_p.h +++ b/tools/uilib/properties_p.h @@ -53,7 +53,7 @@ #ifndef UILIBPROPERTIES_H #define UILIBPROPERTIES_H -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QObject> #include <QtCore/QMetaProperty> diff --git a/tools/uilib/resourcebuilder_p.h b/tools/uilib/resourcebuilder_p.h index a3ccbf8168..549d81694d 100644 --- a/tools/uilib/resourcebuilder_p.h +++ b/tools/uilib/resourcebuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QString> diff --git a/tools/uilib/textbuilder_p.h b/tools/uilib/textbuilder_p.h index 8da296d041..066733cf59 100644 --- a/tools/uilib/textbuilder_p.h +++ b/tools/uilib/textbuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QString> |