diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-06-18 14:51:35 (GMT) |
| commit | 396eeb3f71c1c7edd861da1c8a8ec3086348502e (patch) | |
| tree | 3ff6670ef4b192fd0993e0e9629e616570a6475a /projects.pro | |
| parent | e356eed2fa3d8e62085d6bd72caba9d11c40bacf (diff) | |
| parent | 31ed96ef2c34429d61a5d9d1c1b7fe4fc17c708b (diff) | |
| download | Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.zip Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.gz Qt-396eeb3f71c1c7edd861da1c8a8ec3086348502e.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
tests/auto/qpainter/tst_qpainter.cpp
translations/qt_ru.ts
Diffstat (limited to 'projects.pro')
| -rw-r--r-- | projects.pro | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/projects.pro b/projects.pro index 2d8e7f4..953eae8 100644 --- a/projects.pro +++ b/projects.pro @@ -41,12 +41,7 @@ for(PROJECT, $$list($$lower($$unique(QT_BUILD_PARTS)))) { } else:isEqual(PROJECT, docs) { contains(QT_BUILD_PARTS, tools):include(doc/doc.pri) } else:isEqual(PROJECT, translations) { - contains(QT_BUILD_PARTS, tools) { - include(translations/translations.pri) # ts targets - } else { - SUBDIRS += tools/linguist/lrelease - } - SUBDIRS += translations # qm build step + contains(QT_BUILD_PARTS, tools):include(translations/translations.pri) } else:isEqual(PROJECT, qmake) { # SUBDIRS += qmake } else { |