diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 18:47:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-16 18:47:40 (GMT) |
| commit | dee5662e0218e754d425c8960edb1e8ffd27fde6 (patch) | |
| tree | 3690ea636187c9af9459ff3bfd4cab3e2af97c57 /doc/src/snippets/code | |
| parent | f08181c9b252ee8fd53aec8f7ab76dfa6d4f8f0f (diff) | |
| parent | 9db05f0b7bf68392dc925d4047aa74dac88b348a (diff) | |
| download | Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.zip Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.tar.gz Qt-dee5662e0218e754d425c8960edb1e8ffd27fde6.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (52 commits)
Add experimental support for armCC on Linux
Fixed resizing popups with QSizeGrip on X11
Workaround public header depending on private in symbian^3
Fix reversed condition
Fix warning, unused parametter error
Fixed mapFromGlobal in some window managers on X11
Removed obsolete code that was incorrectly handling ConfigureNotify
QMutex: do not use inline mutex in debug.
Fix race condition between QEventLoop::exec and QThread::exit
Remove QThreadData::mutex
tst_qnetworkreply: Use proper test server hostname
demo browser: Verbose output about Zerocopy usage
tst_qnetworkreply: Some additions
QNAM: Delete old file
QNAM: Move authentication cache to separate class
tst_qnetworkreply: Relax a condition
Implement QThreadData::current using __thread
Crash in QFileSystemEngine::canonicalName with older libc version
Fix leak in QFactoryLoader
Fixed "not a valid preprocessing token" on GCCE.
...
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index f6ac4f8..a35a3d9 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1029,3 +1029,15 @@ DEPLOYMENT += dep_note //! [156] DEPLOYMENT.display_name = My Qt App //! [156] + +//! [157] +packagesExist(sqlite3 QtNetwork QtDeclarative) { + DEFINES += USE_FANCY_UI +} +//! [157] + +//! [158] +#ifdef USE_FANCY_UI + // Use the fancy UI, as we have extra packages available +#endif +//! [158] |