diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 15:49:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 15:49:08 +0000 |
| commit | 7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (patch) | |
| tree | cde8deeea717fc25d64640d96cf13a4fd44d9db1 /src/src.pro | |
| parent | 2aeb2bcef48d7bca2186c262dde433737956a539 (diff) | |
| parent | 305dd1b61f657474d751cc3b24f58249ec21b61b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/src.pro')
| -rw-r--r-- | src/src.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/src.pro b/src/src.pro index 3b93b1a9d8..1f7c5d99c1 100644 --- a/src/src.pro +++ b/src/src.pro @@ -210,9 +210,11 @@ qtConfig(gui) { src_plugins.depends += src_gui src_platformsupport src_platformheaders src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers qtConfig(widgets) { - SUBDIRS += src_tools_uic src_widgets src_printsupport + SUBDIRS += src_tools_uic src_widgets + !android-embedded: SUBDIRS += src_printsupport TOOLS += src_tools_uic - src_plugins.depends += src_widgets src_printsupport + src_plugins.depends += src_widgets + !android-embedded: src_plugins.depends += src_printsupport src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers qtConfig(opengl) { SUBDIRS += src_opengl @@ -224,7 +226,7 @@ SUBDIRS += src_plugins nacl: SUBDIRS -= src_network src_testlib -android: SUBDIRS += src_android src_3rdparty_gradle +android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle TR_EXCLUDE = \ src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_uic src_tools_qlalr \ |