diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-20 13:52:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-20 13:52:30 (GMT) |
| commit | c2d2b3a45a674b4b7497b86b08a19c01ebc519ed (patch) | |
| tree | 3690ea636187c9af9459ff3bfd4cab3e2af97c57 /doc/src/snippets/code | |
| parent | 16a24659aa081ab17a3fddd63f7cd1b5342ae541 (diff) | |
| parent | 6ad3a6a7cbd25960c04f1718d45cd940bb174222 (diff) | |
| download | Qt-c2d2b3a45a674b4b7497b86b08a19c01ebc519ed.zip Qt-c2d2b3a45a674b4b7497b86b08a19c01ebc519ed.tar.gz Qt-c2d2b3a45a674b4b7497b86b08a19c01ebc519ed.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (93 commits)
Workaround for QTBUG-17468
Removed timestamp setting and checking for Symbian header export
Cocoa/Alien: bugfix corner cases with popups and enter/leave
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Phonon MMF backend enabled in configuration and deployment
Using a better flag to control the fast allocator
Using QElapesedTimer for Symbian idle detector
Idle detector thread improvements
Updated QtGui and QtCore DEF files
Cocoa/Alien: bugfix corner cases with popups and enter/leave
Add experimental support for armCC on Linux
Fixed resizing popups with QSizeGrip on X11
fix crash when setting QPROCESS_DEBUG
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
Add QDir/tree benchmark to "trusted" list
Added file header
...
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] |