diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-07 12:16:50 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-07 12:27:30 (GMT) |
| commit | e3edad83a1e6e99a551d40d4118352435c6dd710 (patch) | |
| tree | 2fc7a80b7bed8f8ec12a6bfa022c6557e5907d48 /tools/tools.pro | |
| parent | fbca6e1747eb8430729f0f0eb80b13f6d3d19f3a (diff) | |
| download | Qt-e3edad83a1e6e99a551d40d4118352435c6dd710.zip Qt-e3edad83a1e6e99a551d40d4118352435c6dd710.tar.gz Qt-e3edad83a1e6e99a551d40d4118352435c6dd710.tar.bz2 | |
Revert the integration of the merge request 2286.
The merge request 2286 will be integrated in master.
This should let an angry developer calm down and
resume his work.
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 c64fe25..8f23fe4 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -20,7 +20,7 @@ TEMPLATE = subdirs SUBDIRS += designer } } - unix:!mac:!embedded:SUBDIRS += qtconfig + unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } contains(QT_CONFIG, declarative):SUBDIRS += qml |