diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-05-15 04:09:06 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-05-15 04:09:06 (GMT) |
| commit | 49d1dd6083074a6225e6784fd185c34b76ed5648 (patch) | |
| tree | fd3029d7fc0e18888c52e9303313fd9be169c667 /tools/tools.pro | |
| parent | f9fa633257f856f03b6f8323506d1695e1705e5f (diff) | |
| parent | e3fcf351dee44b4f9457a6abbed76d37fc0fbe67 (diff) | |
| download | Qt-49d1dd6083074a6225e6784fd185c34b76ed5648.zip Qt-49d1dd6083074a6225e6784fd185c34b76ed5648.tar.gz Qt-49d1dd6083074a6225e6784fd185c34b76ed5648.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'tools/tools.pro')
| -rw-r--r-- | tools/tools.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/tools.pro b/tools/tools.pro index 2ff0214..7493aec 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -22,7 +22,7 @@ mac { SUBDIRS += macdeployqt } -SUBDIRS += kmap2qmap +embedded:SUBDIRS += kmap2qmap contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer contains(QT_CONFIG, dbus):SUBDIRS += qdbus |