diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 03:47:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 03:47:08 (GMT) |
| commit | 4af9cc043370846c52ec21cf874696ee650394c1 (patch) | |
| tree | d3ac24631fb9e759e399042c65000fa5f0ee6ea9 /tools/tools.pro | |
| parent | 0def696a8d569f0895010706fb989e78b25c13c1 (diff) | |
| parent | d2d4be2901ef1e377ea77b447632fe29d3adac33 (diff) | |
| download | Qt-4af9cc043370846c52ec21cf874696ee650394c1.zip Qt-4af9cc043370846c52ec21cf874696ee650394c1.tar.gz Qt-4af9cc043370846c52ec21cf874696ee650394c1.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert change 07c347f54 from 4.6.
Implement some changes to the AIX xlC mkspec suggested by IBM.
Fixed app freeze if switching to offline in middle of HTTP transaction.
Document Symbian platform security requirements on Qt APIs
Fixed app freeze if switching to offline in middle of HTTP transaction.
CSS: fixes border only affecting the first widget.
Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.
fix closing state in QLocalSocket on Windows
Fix segfault, if QPixmap::loadFromData() fails
Don't build QtXmlPatterns' command line tools on Symbian.
Diffstat (limited to 'tools/tools.pro')
| -rw-r--r-- | tools/tools.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 7598962..f254230 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -35,7 +35,8 @@ mac { embedded:SUBDIRS += kmap2qmap contains(QT_CONFIG, dbus):SUBDIRS += qdbus -!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator +# We don't need these command line utilities on embedded platforms. +!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator embedded: SUBDIRS += makeqpf !wince*:!cross_compile:SUBDIRS += qdoc3 |