diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:41 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-17 12:58:52 +0200 |
| commit | 64255ef6502b1144f7b0aa4b2bf62803e0d4788b (patch) | |
| tree | 29bf116bfda2ccf61057115690d14f85cc9b085b /src/corelib/global/qconfig-minimal.h | |
| parent | 4a9fb41a7947d0bb7a47a9625603a436df288b24 (diff) | |
| parent | 7e0beba891cb963a1d535bd45b0be78b43b8d07f (diff) | |
Merge remote-tracking branch 'origin/api_changes'
Change-Id: I964b0a6f5c38351fdfafb8a2a128a349ff8c89d1
Diffstat (limited to 'src/corelib/global/qconfig-minimal.h')
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 24349a76ba..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 @@ -494,9 +491,6 @@ #ifndef QT_NO_MENUBAR # define QT_NO_MENUBAR #endif -#ifndef QT_NO_WORKSPACE -# define QT_NO_WORKSPACE -#endif #ifndef QT_NO_PROGRESSBAR # define QT_NO_PROGRESSBAR #endif |