diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2014-06-28 17:25:42 +0900 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2014-07-07 09:21:32 +0200 |
| commit | feff9aacd851624eb41ed3308ae276a226e4bcc9 (patch) | |
| tree | 61fc54a523e6517b4ce48f3aeda79ce9cc00f594 | |
| parent | 73d2aca7ef3d7ba0872296210aa8517001c9685c (diff) | |
fix/optimize dependencies on qt modules
Change-Id: I50bb083523431f9bd8d3da24e3364bb088c8f0ef
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| -rw-r--r-- | src/enginio_client/enginio_client.pro | 2 | ||||
| -rw-r--r-- | src/enginio_plugin/enginio_plugin.pro | 4 | ||||
| -rw-r--r-- | src/src.pro | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 5 | ||||
| -rw-r--r-- | tests/auto/files/files.pro | 1 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/enginio_client/enginio_client.pro b/src/enginio_client/enginio_client.pro index 3680f53..34cb84d 100644 --- a/src/enginio_client/enginio_client.pro +++ b/src/enginio_client/enginio_client.pro @@ -1,5 +1,5 @@ TARGET = Enginio -QT += core-private network +QT = core-private network DEFINES += ENGINIOCLIENT_LIBRARY MODULE = enginio diff --git a/src/enginio_plugin/enginio_plugin.pro b/src/enginio_plugin/enginio_plugin.pro index ac108ea..2d9f5c6 100644 --- a/src/enginio_plugin/enginio_plugin.pro +++ b/src/enginio_plugin/enginio_plugin.pro @@ -1,8 +1,8 @@ -requires(qtHaveModule(quick)) +requires(qtHaveModule(qml)) TARGETPATH = Enginio -QT += qml quick enginio enginio-private core-private +QT = qml enginio enginio-private core-private QMAKE_DOCS = $$PWD/doc/qtenginioqml.qdocconf OTHER_FILES += \ diff --git a/src/src.pro b/src/src.pro index c3f8a69..e20d0b4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,10 +1,8 @@ -requires(qtHaveModule(network)) - TEMPLATE = subdirs SUBDIRS += enginio_client -qtHaveModule(quick) { +qtHaveModule(qml) { SUBDIRS += enginio_plugin enginio_plugin.depends = enginio_client } diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 83030ed..8148202 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -2,10 +2,13 @@ TEMPLATE = subdirs SUBDIRS += \ enginioclient \ - files \ notifications \ identity \ +qtHaveModule(gui) { + SUBDIRS += files +} + qtHaveModule(quick) { SUBDIRS += qmltests } diff --git a/tests/auto/files/files.pro b/tests/auto/files/files.pro index 7907092..ae191b7 100644 --- a/tests/auto/files/files.pro +++ b/tests/auto/files/files.pro @@ -1,5 +1,4 @@ QT += testlib enginio enginio-private core-private -QT -= gui DEFINES += TEST_FILE_PATH=\\\"$$_PRO_FILE_PWD_/../common/enginio.png\\\" |