summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2012-11-23 18:21:02 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-05 11:35:16 +0100
commit85e36faa2c677dc0bd9160538f89a2f4c71cbbe0 (patch)
tree869a0a2326bdf9d4656163bf668d289dbc94c1e4 /src/corelib/global
parent73969155416d8bcf9236b87d8d48ba8abf5b09e5 (diff)
Remove QUUID_STRING from qfeatures.{h,txt}
It is too specific and relatively small Change-Id: I55ec15ecaac0692741996a5c15a111db696490cf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.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.h5
-rw-r--r--src/corelib/global/qfeatures.h3
-rw-r--r--src/corelib/global/qfeatures.txt7
5 files changed, 0 insertions, 21 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
index 28cb8fbede..6a21492827 100644
--- a/src/corelib/global/qconfig-minimal.h
+++ b/src/corelib/global/qconfig-minimal.h
@@ -40,9 +40,6 @@
****************************************************************************/
/* Data structures */
-#ifndef QT_NO_QUUID_STRING
-# define QT_NO_QUUID_STRING
-#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 d5172aac29..9dac73ea93 100644
--- a/src/corelib/global/qconfig-nacl.h
+++ b/src/corelib/global/qconfig-nacl.h
@@ -46,9 +46,6 @@
#define QT_FONTS_ARE_RESOURCES
/* Data structures */
-#ifndef QT_NO_QUUID_STRING
-# define QT_NO_QUUID_STRING
-#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 9d72cd5d4c..405521c338 100644
--- a/src/corelib/global/qconfig-small.h
+++ b/src/corelib/global/qconfig-small.h
@@ -39,11 +39,6 @@
**
****************************************************************************/
-/* Data structures */
-#ifndef QT_NO_QUUID_STRING
-# define QT_NO_QUUID_STRING
-#endif
-
/* Dialogs */
#ifndef QT_NO_COLORDIALOG
# define QT_NO_COLORDIALOG
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 26d92592cb..d2c1095a4f 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -157,9 +157,6 @@
// Properties
//#define QT_NO_PROPERTIES
-// Universally Unique Identifier Convertion
-//#define QT_NO_QUUID_STRING
-
// Resize Handler
//#define QT_NO_RESIZEHANDLER
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 941150351a..d627f38a70 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -141,13 +141,6 @@ Name: QInputContext
SeeAlso: ???
# Data structures
-Feature: QUUID_STRING
-Description: Supports convertion between UUID and strings.
-Section: Data structures
-Requires:
-Name: Universally Unique Identifier Convertion
-SeeAlso: ???
-
Feature: TEXTDATE
Description: Supports month and day names in dates.
Section: Data structures