summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
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 /src/corelib/global
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>
Diffstat (limited to 'src/corelib/global')
-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
4 files changed, 0 insertions, 12 deletions
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