summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-03-26 14:57:40 -0300
committerQt by Nokia <qt-info@nokia.com>2012-03-28 16:31:34 +0200
commit7adbc9b2341e5443427d7e33ddf7f9e2ed5de5a0 (patch)
tree61f8fa94e97e26639eef016fb762c343e60ea77e
parentd43fe0b672a665fc366f7d4a91a522959801165d (diff)
Remove the -no-stl option from configure
This was decided on the mailing list. See: http://lists.qt-project.org/pipermail/development/2012-March/002442.html http://lists.qt-project.org/pipermail/development/2012-March/002465.html Change-Id: I7681e5cc743b20f6d4e29d2aea45c50df41a0b98 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rwxr-xr-xconfigure54
-rw-r--r--src/corelib/global/qconfig-minimal.h3
-rw-r--r--src/corelib/global/qconfig-nacl.h3
-rw-r--r--src/corelib/global/qconfig-small.h3
-rw-r--r--src/corelib/global/qfeatures.h3
-rw-r--r--tools/configure/configureapp.cpp17
6 files changed, 8 insertions, 75 deletions
diff --git a/configure b/configure
index 882f10b4cd..0009a22e04 100755
--- a/configure
+++ b/configure
@@ -739,7 +739,6 @@ CFG_GSTREAMER=auto
CFG_QGTKSTYLE=auto
CFG_LARGEFILE=auto
CFG_OPENSSL=auto
-CFG_STL=auto
CFG_PRECOMPILE=auto
CFG_SEPARATE_DEBUG_INFO=no
CFG_SEPARATE_DEBUG_INFO_NOCOPY=no
@@ -911,7 +910,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
- -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
+ -profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-eglfs|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -1464,13 +1463,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- stl)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_STL="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
pch)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PRECOMPILE="$VAL"
@@ -2885,13 +2877,6 @@ if [ "$OPT_HELP" = "yes" ]; then
LFSY="*"
LFSN=" "
fi
- if [ "$CFG_STL" = "auto" ] || [ "$CFG_STL" = "yes" ]; then
- SHY="*"
- SHN=" "
- else
- SHY=" "
- SHN="*"
- fi
if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then
PHY=" "
PHN="*"
@@ -2931,7 +2916,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-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>]
+ [-accessibility] [-no-sql-<driver>] [-sql-<driver>]
[-plugin-sql-<driver>] [-system-sqlite]
[-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
[-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng]
@@ -3070,9 +3055,6 @@ fi
-no-accessibility .. Do not compile Accessibility support.
* -accessibility ..... Compile Accessibility support.
- $SHN -no-stl ............ Do not compile STL support.
- $SHY -stl ............... Compile STL support.
-
-no-sql-<driver> ... Disable SQL <driver> entirely.
-qt-sql-<driver> ... Enable a SQL <driver> in the QtSql library, by default
none are turned on.
@@ -5220,26 +5202,13 @@ if [ "$CFG_LIBFREETYPE" = "auto" ]; then
fi
fi
-HAVE_STL=no
-if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
- HAVE_STL=yes
+if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS &&
+ [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+ echo "STL functionality check failed! Cannot build Qt with this STL library."
+ echo " Turn on verbose messaging (-v) to $0 to see the final report."
+ exit 101
fi
-if [ "$CFG_STL" != "no" ]; then
- if [ "$HAVE_STL" = "yes" ]; then
- CFG_STL=yes
- else
- if [ "$CFG_STL" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
- echo "STL support cannot be enabled due to functionality tests!"
- echo " Turn on verbose messaging (-v) to $0 to see the final report."
- echo " If you believe this message is in error you may use the continue"
- echo " switch (-continue) to $0 to continue."
- exit 101
- else
- CFG_STL=no
- fi
- fi
-fi
# detect POSIX clock_gettime()
if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then
@@ -5581,11 +5550,6 @@ QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR"
if [ "$CFG_LARGEFILE" = "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG largefile"
fi
-if [ "$CFG_STL" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STL"
-else
- QMAKE_CONFIG="$QMAKE_CONFIG stl"
-fi
if [ "$CFG_USE_GNUMAKE" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG GNUmake"
fi
@@ -6301,9 +6265,6 @@ elif [ "$CFG_DEBUG" = "no" ]; then
fi
QT_CONFIG="$QT_CONFIG release"
fi
-if [ "$CFG_STL" = "yes" ]; then
- QTCONFIG_CONFIG="$QTCONFIG_CONFIG stl"
-fi
if [ "$CFG_FRAMEWORK" = "no" ]; then
QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_no_framework"
else
@@ -6555,7 +6516,6 @@ else
echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT"
fi
echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
-echo "STL support ............ $CFG_STL"
echo "PCH support ............ $CFG_PRECOMPILE"
if [ "$CFG_ARCH" = "i386" -o "$CFG_ARCH" = "x86_64" ]; then
echo "SSE2/SSE3/SSSE3......... ${CFG_SSE2}/${CFG_SSE3}/${CFG_SSSE3}"
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 512b82c60f..3244e01c9e 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -43,9 +43,6 @@
#ifndef QT_NO_QUUID_STRING
# define QT_NO_QUUID_STRING
#endif
-#ifndef QT_NO_STL
-# define QT_NO_STL
-#endif
#ifndef QT_NO_TEXTDATE
# define QT_NO_TEXTDATE
#endif
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
index 88da7f3d44..69980f97a6 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -45,9 +45,6 @@
#ifndef QT_NO_QUUID_STRING
# define QT_NO_QUUID_STRING
#endif
-#ifndef QT_NO_STL
-# define QT_NO_STL
-#endif
#ifndef QT_NO_TEXTDATE
# define QT_NO_TEXTDATE
#endif
diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
index 9fca199964..e764285e4a 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -43,9 +43,6 @@
#ifndef QT_NO_QUUID_STRING
# define QT_NO_QUUID_STRING
#endif
-#ifndef QT_NO_STL
-# define QT_NO_STL
-#endif
/* Dialogs */
#ifndef QT_NO_COLORDIALOG
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index ff6a8af873..4ce586a858 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -208,9 +208,6 @@
// Status Tip
//#define QT_NO_STATUSTIP
-// Standard Template Library
-//#define QT_NO_STL
-
// QMotifStyle
//#define QT_NO_STYLE_MOTIF
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 62040db66f..a45f396ebe 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -197,7 +197,6 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "QMAKE_INTERNAL" ] = "no";
dictionary[ "FAST" ] = "no";
dictionary[ "NOPROCESS" ] = "no";
- dictionary[ "STL" ] = "yes";
dictionary[ "EXCEPTIONS" ] = "yes";
dictionary[ "WIDGETS" ] = "yes";
dictionary[ "RTTI" ] = "yes";
@@ -768,11 +767,6 @@ void Configure::parseCmdLine()
else if (configCmdLine.at(i) == "-no-fast")
dictionary[ "FAST" ] = "no";
- else if (configCmdLine.at(i) == "-stl")
- dictionary[ "STL" ] = "yes";
- else if (configCmdLine.at(i) == "-no-stl")
- dictionary[ "STL" ] = "no";
-
else if (configCmdLine.at(i) == "-exceptions")
dictionary[ "EXCEPTIONS" ] = "yes";
else if (configCmdLine.at(i) == "-no-exceptions")
@@ -1362,7 +1356,6 @@ void Configure::applySpecSpecifics()
dictionary[ "FREETYPE" ] = "no";
dictionary[ "OPENGL" ] = "no";
dictionary[ "OPENSSL" ] = "no";
- dictionary[ "STL" ] = "no";
dictionary[ "EXCEPTIONS" ] = "no";
dictionary[ "RTTI" ] = "no";
dictionary[ "SSE2" ] = "no";
@@ -1446,7 +1439,7 @@ bool Configure::displayHelp()
"[-release] [-debug] [-debug-and-release] [-shared] [-static]\n"
"[-no-fast] [-fast] [-no-exceptions] [-exceptions]\n"
"[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n"
- "[-no-stl] [-stl] [-no-sql-<driver>] [-qt-sql-<driver>]\n"
+ "[-no-sql-<driver>] [-qt-sql-<driver>]\n"
"[-plugin-sql-<driver>] [-system-sqlite]\n"
"[-D <define>] [-I <includepath>] [-L <librarypath>]\n"
"[-help] [-no-dsp] [-dsp] [-no-vcproj] [-vcproj]\n"
@@ -1508,9 +1501,6 @@ bool Configure::displayHelp()
desc("ACCESSIBILITY", "no", "-no-accessibility", "Do not compile Windows Active Accessibility support.");
desc("ACCESSIBILITY", "yes", "-accessibility", "Compile Windows Active Accessibility support.\n");
- desc("STL", "no", "-no-stl", "Do not compile STL support.");
- desc("STL", "yes", "-stl", "Compile STL support.\n");
-
desc( "-no-sql-<driver>", "Disable SQL <driver> entirely, by default none are turned on.");
desc( "-qt-sql-<driver>", "Enable a SQL <driver> in the Qt Library.");
desc( "-plugin-sql-<driver>", "Enable SQL <driver> as a plugin to be linked to at run time.\n"
@@ -2043,7 +2033,6 @@ bool Configure::verifyConfiguration()
Options:
debug release
- stl
Things that do not affect the Qt API/ABI:
system-jpeg no-jpeg jpeg
@@ -2593,8 +2582,6 @@ void Configure::generateQConfigPri()
if (dictionary[ "LTCG" ] == "yes")
configStream << " ltcg";
- if (dictionary[ "STL" ] == "yes")
- configStream << " stl";
if (dictionary[ "EXCEPTIONS" ] == "yes")
configStream << " exceptions";
if (dictionary[ "EXCEPTIONS" ] == "no")
@@ -2759,7 +2746,6 @@ void Configure::generateConfigfiles()
tmpStream << endl << "// Compile time features" << endl;
QStringList qconfigList;
- if (dictionary["STL"] == "no") qconfigList += "QT_NO_STL";
if (dictionary["STYLE_WINDOWS"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWS";
if (dictionary["STYLE_PLASTIQUE"] != "yes") qconfigList += "QT_NO_STYLE_PLASTIQUE";
if (dictionary["STYLE_CLEANLOOKS"] != "yes") qconfigList += "QT_NO_STYLE_CLEANLOOKS";
@@ -3005,7 +2991,6 @@ void Configure::displayConfig()
cout << "Debug symbols..............." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl;
cout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl;
cout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl;
- cout << "STL support................." << dictionary[ "STL" ] << endl;
cout << "Exception support..........." << dictionary[ "EXCEPTIONS" ] << endl;
cout << "RTTI support................" << dictionary[ "RTTI" ] << endl;
cout << "SSE2 support................" << dictionary[ "SSE2" ] << endl;