diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:48:09 (GMT) |
| commit | 1139eb432a18d556efb4ecfc079e82c2e2093b96 (patch) | |
| tree | 57bbe6a7588ba01d88f0a9b9b28e4d95beadad1d /tools/tools.pro | |
| parent | 2366667fc97eb6a56203b2dd7dac776ff4164abd (diff) | |
| parent | db4e2a600c53ad857d7fa3f7d84ac995215ecf93 (diff) | |
| download | Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.zip Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.gz Qt-1139eb432a18d556efb4ecfc079e82c2e2093b96.tar.bz2 | |
Merge branch 'master' of ../../qt/qt into kinetic-declarativeui
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 a531f85..da4ff67 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -15,7 +15,7 @@ no-png { SUBDIRS += linguist wince*: SUBDIRS = qtestlib designer unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig - win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt + win32:!wince*:SUBDIRS += activeqt } mac { |