diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-13 12:05:58 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-13 12:05:58 (GMT) |
| commit | 235bdeea52059010ef2e92058adb1213161b0956 (patch) | |
| tree | bcf24441076d47835cdd4dce90f71c43cc9d020c /tools/tools.pro | |
| parent | 3e94b3a77affeef80544e48949e018ced4e0d96e (diff) | |
| parent | 8e6b240eef98060737324e33b09f4323ced58213 (diff) | |
| download | Qt-235bdeea52059010ef2e92058adb1213161b0956.zip Qt-235bdeea52059010ef2e92058adb1213161b0956.tar.gz Qt-235bdeea52059010ef2e92058adb1213161b0956.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
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 3ed07b1..7aba8f3 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -28,7 +28,8 @@ embedded:SUBDIRS += kmap2qmap contains(QT_CONFIG, declarative):SUBDIRS += qml 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 |