diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 13:53:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-04 13:53:37 (GMT) |
| commit | c7b6c35e2b32b5d85f90088906d7ca6ecfe47202 (patch) | |
| tree | e489b6c938c9509a10ceb785bcf480798a0cb14a /src/corelib/global/qconfig-nacl.h | |
| parent | 8b610c28c1300e0aa800569225d8512d0b66ffce (diff) | |
| parent | 6a80266dae9e05de0a68d6a69f5f5416f9dd5746 (diff) | |
| download | Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.zip Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.tar.gz Qt-c7b6c35e2b32b5d85f90088906d7ca6ecfe47202.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
add integrity gbuild to the project file for convenience
don't build activeqt examples on mingw
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
Updated Russian translation
Ukrainian translation updated for 4.8
retreving -> retrieving
Removed duplicate Spectrum Analyzer entry from demos doc page.
Removed obsolete QWS_ALPHA_CURSOR feature.
Removed duplicate link from QFinalState documentation.
Clarified keypad navigation specific event documentation.
docs: Typo and link fixes.
Use the right callback in QObject::disconnect()
Diffstat (limited to 'src/corelib/global/qconfig-nacl.h')
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 18ae261..5aefdfe 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -247,9 +247,6 @@ #ifndef QT_NO_QWSEMBEDWIDGET # define QT_NO_QWSEMBEDWIDGET #endif -#ifndef QT_NO_QWS_ALPHA_CURSOR -# define QT_NO_QWS_ALPHA_CURSOR -#endif #ifndef QT_NO_QWS_CURSOR # define QT_NO_QWS_CURSOR #endif |