diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 13:26:59 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 13:26:59 (GMT) |
| commit | baa54f601871b2873b09097596428b4292bd7186 (patch) | |
| tree | 584b1a0d2106fcd4edefe644e7068fffedc9f44a /tools/tools.pro | |
| parent | e5deaaa6ab843913bdf3ade47611f61f968db130 (diff) | |
| parent | fd009286dfcea0a849d85c824f214e640c4d4ce2 (diff) | |
| download | Qt-baa54f601871b2873b09097596428b4292bd7186.zip Qt-baa54f601871b2873b09097596428b4292bd7186.tar.gz Qt-baa54f601871b2873b09097596428b4292bd7186.tar.bz2 | |
Merge remote branch 'earth-team/master' into master-i18n
Conflicts:
src/corelib/tools/qlocale.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 e82bcaa..f090b86 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -20,7 +20,7 @@ TEMPLATE = subdirs SUBDIRS += designer } } - unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig + unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } contains(QT_CONFIG, declarative):SUBDIRS += qml |