summaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:29:46 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:29:46 (GMT)
commit1400ce5b85fbe7c67899f5f62bfd276eecb21ae0 (patch)
treeccc72723d2305b4d24f9ec296e6d9ee7d3d9d16a /tools/tools.pro
parent867be3fd7a2017377e8ae5cc3ab789b3b01733bd (diff)
parentbe71186962db5974113e89b0e7c7aa1ab3987379 (diff)
downloadQt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.zip
Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.gz
Qt-1400ce5b85fbe7c67899f5f62bfd276eecb21ae0.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 4b36115..87ba3c9 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -26,6 +26,7 @@ mac {
embedded:SUBDIRS += kmap2qmap
+contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger
contains(QT_CONFIG, dbus):SUBDIRS += qdbus
!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
embedded: SUBDIRS += makeqpf