diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /src/src.pro | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 6815fe4a75..c6ae533cff 100644 --- a/src/src.pro +++ b/src/src.pro @@ -143,5 +143,9 @@ nacl: SUBDIRS -= src_network src_testlib android:!android-no-sdk: SUBDIRS += src_android +TR_EXCLUDE = \ + src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic \ + src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml + sub-tools.depends = $$TOOLS -QMAKE_EXTRA_TARGETS = sub-tools +QMAKE_EXTRA_TARGETS = sub-tools
\ No newline at end of file |