From 710ec5caeda49ea1c3177880f70c0a853bdcff40 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 15 Apr 2016 08:21:26 +0200 Subject: [PATCH] Remove the -qconfig command line argument This functionality will get replaced by a new and more flexible system to configure Qt. Change-Id: I04cf694ab1671eeed39b79a660566595a22f54a7 Reviewed-by: Oswald Buddenhagen --- configure | 34 -- qtbase.pro | 4 +- src/corelib/global/qconfig-dist.h | 48 --- src/corelib/global/qconfig-large.h | 140 -------- src/corelib/global/qconfig-medium.h | 241 -------------- src/corelib/global/qconfig-minimal.h | 463 --------------------------- src/corelib/global/qconfig-nacl.h | 233 -------------- src/corelib/global/qconfig-small.h | 281 ---------------- tools/configure/configureapp.cpp | 53 --- 9 files changed, 2 insertions(+), 1495 deletions(-) delete mode 100644 src/corelib/global/qconfig-dist.h delete mode 100644 src/corelib/global/qconfig-large.h delete mode 100644 src/corelib/global/qconfig-medium.h delete mode 100644 src/corelib/global/qconfig-minimal.h delete mode 100644 src/corelib/global/qconfig-nacl.h delete mode 100644 src/corelib/global/qconfig-small.h diff --git a/configure b/configure index 9bb3f215d2..633c27b628 100755 --- a/configure +++ b/configure @@ -610,7 +610,6 @@ CFG_PROFILE=no CFG_STRIP=yes CFG_GUI=auto # (yes|no|auto) CFG_WIDGETS=yes -CFG_QCONFIG=full CFG_DEBUG=auto CFG_MYSQL_CONFIG= CFG_PSQL_CONFIG= @@ -1179,9 +1178,6 @@ while [ "$#" -gt 0 ]; do testsdir) QT_INSTALL_TESTS="$VAL" ;; - qconfig) - CFG_QCONFIG="$VAL" - ;; qreal) CFG_QREAL="$VAL" if [ "$CFG_QREAL" = "float" ]; then @@ -2582,9 +2578,6 @@ Additional options: -feature- .. Compile in . The available features are described in src/corelib/global/qfeatures.txt - -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the - default ($CFG_QCONFIG). - -qreal [double|float] typedef qreal to the specified type. The default is double. Note that changing this flag affects binary compatibility. @@ -3039,21 +3032,6 @@ fi # command line and environment validation #------------------------------------------------------------------------------- -# update QT_CONFIG to show our current predefined configuration -CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h -if [ "$CFG_QCONFIG" = full ]; then - CFG_QCONFIG_PATH= -elif [ ! -f "$CFG_QCONFIG_PATH" ]; then - CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"` - if [ ! -f "$CFG_QCONFIG_PATH" ]; then - echo >&2 "Error: configuration file not found:" - echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" - echo >&2 " or" - echo >&2 " $CFG_QCONFIG_PATH" - exit 1 - fi -fi - if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then echo echo "WARNING: -debug-and-release is not supported outside of Mac OS X." @@ -6434,17 +6412,6 @@ cat <= 0) { - for (int c = 0; c <= index; c++) { - qtConfig += possible_configs[c] + "-config"; - } - if (dictionary["QCONFIG"] != "full") - dictionary["QCONFIG_PATH"] = cfgpath; - return; - } - - if (!QFileInfo::exists(cfgpath)) { - cfgpath = QFileInfo(dictionary["QCONFIG"]).absoluteFilePath(); - if (!QFileInfo::exists(cfgpath)) { - dictionary[ "DONE" ] = "error"; - cout << "No such configuration \"" << qPrintable(dictionary["QCONFIG"]) << "\"" << endl ; - return; - } - } - dictionary["QCONFIG_PATH"] = cfgpath; } // Output helper functions --------------------------------[ Start ]- @@ -2927,11 +2891,6 @@ void Configure::generateCachefile() moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl; if (!skipModules.isEmpty()) moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl; - QString qcpath = dictionary["QCONFIG_PATH"]; - QString qlpath = sourcePath + "/src/corelib/global/"; - if (qcpath.startsWith(qlpath)) - qcpath.remove(0, qlpath.length()); - moduleStream << "QT_QCONFIG_PATH = " << qcpath << endl; moduleStream << endl; moduleStream << "host_build {" << endl; @@ -3412,18 +3371,6 @@ void Configure::generateConfigfiles() << "#define QT_VERSION_PATCH " << dictionary["VERSION_PATCH"] << endl << "#define QT_VERSION_STR \"" << dictionary["VERSION"] << "\"\n" << endl; - - if (dictionary[ "QCONFIG" ] == "full") { - tmpStream << "/* Everything */" << endl; - } else { - tmpStream << "#ifndef QT_BOOTSTRAPPED" << endl; - QFile inFile(dictionary["QCONFIG_PATH"]); - if (inFile.open(QFile::ReadOnly)) { - tmpStream << QTextStream(&inFile).readAll(); - inFile.close(); - } - tmpStream << "#endif // QT_BOOTSTRAPPED" << endl; - } tmpStream << endl; if (dictionary[ "SHARED" ] == "no") {