summaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-22 09:19:12 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-22 09:19:12 (GMT)
commitdab883be81f6037361e5c870d957686961515f4e (patch)
tree1aa67b8652108c74467da9e4bea411c15d85745c /tools/tools.pro
parentf25f7a2a19ba4c21b7a5d9fee02a9ae71c9f60ef (diff)
parent9462e7966b5b7db20249c9cb077f425c631afebf (diff)
downloadQt-dab883be81f6037361e5c870d957686961515f4e.zip
Qt-dab883be81f6037361e5c870d957686961515f4e.tar.gz
Qt-dab883be81f6037361e5c870d957686961515f4e.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'tools/tools.pro')
-rw-r--r--tools/tools.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro
index 4cff507..d5569b6 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -26,7 +26,7 @@ mac {
embedded:SUBDIRS += kmap2qmap
-contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger
+contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer
contains(QT_CONFIG, dbus):SUBDIRS += qdbus
!wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
embedded: SUBDIRS += makeqpf