diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 07:43:57 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-12 08:42:37 (GMT) |
| commit | f96470898c11ac2dfc0111925cc1843348e72f19 (patch) | |
| tree | 89a5483a7d101b4d1a485218c340453b3cfb3f92 /tools | |
| parent | 9eab27889b1e14385f9428417e048da960ca06de (diff) | |
| download | Qt-f96470898c11ac2dfc0111925cc1843348e72f19.zip Qt-f96470898c11ac2dfc0111925cc1843348e72f19.tar.gz Qt-f96470898c11ac2dfc0111925cc1843348e72f19.tar.bz2 | |
Partially revert MR 543 changes to Linguist.
Whatever this is doing, it breaks the build on Windows CE/Mobile. This
has stopped oslo-staging-1 from integrating for over a week now.
Not reviewed. This patch is a blind attempt at fixing the issue.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/linguist/linguist.pro | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/linguist/linguist.pro b/tools/linguist/linguist.pro index 248c89e..85ecd5a 100644 --- a/tools/linguist/linguist.pro +++ b/tools/linguist/linguist.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS = \ + linguist \ lrelease \ lupdate \ lconvert -!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist diff --git a/tools/tools.pro b/tools/tools.pro index 99a965d..47ad0d7 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -14,6 +14,7 @@ TEMPLATE = subdirs } else { SUBDIRS += designer } + SUBDIRS += linguist symbian: SUBDIRS = designer wince*: SUBDIRS = qtestlib designer unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig @@ -22,8 +23,6 @@ TEMPLATE = subdirs contains(QT_CONFIG, declarative):SUBDIRS += qml } -SUBDIRS += linguist - mac { SUBDIRS += macdeployqt } |