diff options
-rwxr-xr-x | configure | 33 | ||||
-rw-r--r-- | qtbase.pro | 4 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 18 |
3 files changed, 7 insertions, 48 deletions
@@ -699,7 +699,7 @@ CFG_FONTCONFIG=auto CFG_QWS_FREETYPE=auto CFG_LIBFREETYPE=auto CFG_SQL_AVAILABLE= -QT_DEFAULT_BUILD_PARTS="libs examples demos tests" +QT_DEFAULT_BUILD_PARTS="libs examples tests" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_RELEASE_QMAKE=no @@ -849,7 +849,6 @@ QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= QT_INSTALL_SETTINGS= QT_INSTALL_EXAMPLES= -QT_INSTALL_DEMOS= QT_HOST_PREFIX= #flags for SQL drivers @@ -1060,7 +1059,7 @@ while [ "$#" -gt 0 ]; do shift VAL=$1 ;; - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1314,9 +1313,6 @@ while [ "$#" -gt 0 ]; do examplesdir) QT_INSTALL_EXAMPLES="$VAL" ;; - demosdir) - QT_INSTALL_DEMOS="$VAL" - ;; qconfig) CFG_QCONFIG="$VAL" ;; @@ -3545,7 +3541,6 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS="\\\\resource\\\\qt$QT_LIBINFIX\\\\translations" [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS= [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES= - [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS= else #docs if [ -z "$QT_INSTALL_DOCS" ]; then #default @@ -3652,17 +3647,6 @@ else [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback fi QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"` - - #demos - if [ -z "$QT_INSTALL_DEMOS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos" - fi - fi - [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos" - fi - QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"` fi #------------------------------------------------------------------------------- @@ -3731,8 +3715,8 @@ if [ "$OPT_HELP" = "yes" ]; then Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>] [-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-importdir <dir>] [-datadir <dir>] [-translationdir <dir>] [-sysconfdir <dir>] [-examplesdir <dir>] - [-demosdir <dir>] [-buildkey <key>] [-release] [-debug] - [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] + [-buildkey <key>] [-release] [-debug] [-debug-and-release] + [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] [-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>] [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support] @@ -3808,8 +3792,6 @@ cat <<EOF (default PREFIX/etc/settings) -examplesdir <dir> .... Examples will be installed to <dir> (default PREFIX/examples) - -demosdir <dir> ....... Demos will be installed to <dir> - (default PREFIX/demos) You may use these options to turn on strict plugin loading. @@ -4657,7 +4639,6 @@ DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTA TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"` SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` -DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` TODAY=`date +%Y-%m-%d` cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF @@ -4682,7 +4663,6 @@ if [ ! -z "$QT_HOST_PREFIX" ]; then HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"` HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` - HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF @@ -4699,7 +4679,6 @@ static const char qt_configure_data_path_str [256 + 12] = "$HOSTDATA_PAT static const char qt_configure_translations_path_str [256 + 12] = "$HOSTTRANSLATIONS_PATH_STR"; static const char qt_configure_settings_path_str [256 + 12] = "$HOSTSETTINGS_PATH_STR"; static const char qt_configure_examples_path_str [256 + 12] = "$HOSTEXAMPLES_PATH_STR"; -static const char qt_configure_demos_path_str [256 + 12] = "$HOSTDEMOS_PATH_STR"; #else // QT_BOOTSTRAPPED EOF fi @@ -4717,7 +4696,6 @@ static const char qt_configure_data_path_str [256 + 12] = "$DATA_PATH_ST static const char qt_configure_translations_path_str [256 + 12] = "$TRANSLATIONS_PATH_STR"; static const char qt_configure_settings_path_str [256 + 12] = "$SETTINGS_PATH_STR"; static const char qt_configure_examples_path_str [256 + 12] = "$EXAMPLES_PATH_STR"; -static const char qt_configure_demos_path_str [256 + 12] = "$DEMOS_PATH_STR"; EOF if [ ! -z "$QT_HOST_PREFIX" ]; then @@ -4742,7 +4720,6 @@ cat >> "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF #define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12; #define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12; #define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12; -#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12; EOF # avoid unecessary rebuilds by copying only if qconfig.cpp has changed @@ -9038,7 +9015,7 @@ for part in $CFG_BUILD_PARTS; do tools) PART_ROOTS="$PART_ROOTS tools" ;; libs) PART_ROOTS="$PART_ROOTS src tools/linguist/lrelease" ;; translations) PART_ROOTS="$PART_ROOTS translations" ;; - examples) PART_ROOTS="$PART_ROOTS examples demos" ;; + examples) PART_ROOTS="$PART_ROOTS examples" ;; *) ;; esac done diff --git a/qtbase.pro b/qtbase.pro index 95f497fef4..ecbb183471 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -27,10 +27,6 @@ contains(PROJECTS, examples) { PROJECTS -= examples SUBDIRS += examples } -contains(PROJECTS, demos) { - PROJECTS -= demos - SUBDIRS += demos -} contains(PROJECTS, tests) { PROJECTS -= tests SUBDIRS += module_qtbase_tests diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 6857bdeb7d..7be1e28d57 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1176,13 +1176,6 @@ void Configure::parseCmdLine() dictionary[ "QT_INSTALL_EXAMPLES" ] = configCmdLine.at(i); } - else if (configCmdLine.at(i) == "-demosdir") { - ++i; - if (i == argCount) - break; - dictionary[ "QT_INSTALL_DEMOS" ] = configCmdLine.at(i); - } - else if (configCmdLine.at(i) == "-hostprefix") { ++i; if (i == argCount) @@ -1664,7 +1657,7 @@ bool Configure::displayHelp() // desc("Usage: configure [-prefix dir] [-bindir <dir>] [-libdir <dir>]\n" // "[-docdir <dir>] [-headerdir <dir>] [-plugindir <dir>]\n" // "[-importdir <dir>] [-datadir <dir>] [-translationdir <dir>]\n" -// "[-examplesdir <dir>] [-demosdir <dir>][-buildkey <key>]\n" +// "[-examplesdir <dir>] [-buildkey <key>]\n" "[-release] [-debug] [-debug-and-release] [-shared] [-static]\n" "[-no-fast] [-fast] [-no-exceptions] [-exceptions]\n" "[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n" @@ -1709,7 +1702,6 @@ bool Configure::displayHelp() desc( "-datadir <dir>", "Data used by Qt programs will be installed to dir\n(default PREFIX)"); desc( "-translationdir <dir>","Translations of Qt programs will be installed to dir\n(default PREFIX/translations)\n"); desc( "-examplesdir <dir>", "Examples will be installed to dir\n(default PREFIX/examples)"); - desc( "-demosdir <dir>", "Demos will be installed to dir\n(default PREFIX/demos)"); */ desc(" You may use these options to turn on strict plugin loading:\n\n", 0, 1); @@ -2828,8 +2820,6 @@ void Configure::generateOutputVars() dictionary[ "QT_INSTALL_TRANSLATIONS" ] = qipempty ? "" : fixSeparators(dictionary[ "QT_INSTALL_PREFIX" ] + "/translations"); if (!dictionary[ "QT_INSTALL_EXAMPLES" ].size()) dictionary[ "QT_INSTALL_EXAMPLES" ] = qipempty ? "" : fixSeparators(dictionary[ "QT_INSTALL_PREFIX" ] + "/examples"); - if (!dictionary[ "QT_INSTALL_DEMOS" ].size()) - dictionary[ "QT_INSTALL_DEMOS" ] = qipempty ? "" : fixSeparators(dictionary[ "QT_INSTALL_PREFIX" ] + "/demos"); if (dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("linux")) dictionary[ "QMAKE_RPATHDIR" ] = dictionary[ "QT_INSTALL_LIBS" ]; @@ -2930,7 +2920,7 @@ void Configure::generateCachefile() 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" << "examples" << "demos"; + buildParts << "libs" << "examples"; foreach (const QString &item, disabledBuildParts) { buildParts.removeAll(item); } @@ -3356,7 +3346,6 @@ void Configure::generateConfigfiles() << "static const char qt_configure_data_path_str [512 + 12] = \"qt_datapath=" << escapeSeparators(dictionary["QT_INSTALL_DATA"]) << "\";" << endl << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << escapeSeparators(dictionary["QT_INSTALL_TRANSLATIONS"]) << "\";" << endl << "static const char qt_configure_examples_path_str [512 + 12] = \"qt_xmplpath=" << escapeSeparators(dictionary["QT_INSTALL_EXAMPLES"]) << "\";" << endl - << "static const char qt_configure_demos_path_str [512 + 12] = \"qt_demopath=" << escapeSeparators(dictionary["QT_INSTALL_DEMOS"]) << "\";" << endl //<< "static const char qt_configure_settings_path_str [256] = \"qt_stngpath=" << escapeSeparators(dictionary["QT_INSTALL_SETTINGS"]) << "\";" << endl ; if (!dictionary[ "QT_HOST_PREFIX" ].isNull()) { @@ -3371,7 +3360,6 @@ void Configure::generateConfigfiles() << "static const char qt_configure_data_path_str [512 + 12] = \"qt_datapath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ], true) <<"\";" << endl << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/translations", true) <<"\";" << endl << "static const char qt_configure_examples_path_str [512 + 12] = \"qt_xmplpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/example", true) <<"\";" << endl - << "static const char qt_configure_demos_path_str [512 + 12] = \"qt_demopath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/demos", true) <<"\";" << endl << "#endif //QT_BOOTSTRAPPED" << endl; } tmpStream << "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl @@ -3387,7 +3375,6 @@ void Configure::generateConfigfiles() << "#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;" << endl << "#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;" << endl << "#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;" << endl - << "#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;" << endl //<< "#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;" << endl << endl; @@ -3547,7 +3534,6 @@ void Configure::displayConfig() cout << "Data installed to..........." << dictionary[ "QT_INSTALL_DATA" ] << endl; cout << "Translations installed to..." << dictionary[ "QT_INSTALL_TRANSLATIONS" ] << endl; cout << "Examples installed to......." << dictionary[ "QT_INSTALL_EXAMPLES" ] << endl; - cout << "Demos installed to.........." << dictionary[ "QT_INSTALL_DEMOS" ] << endl << endl; if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith(QLatin1String("wince"))) { cout << "Using c runtime detection..." << dictionary[ "CE_CRT" ] << endl; |