From 5371ec870e4fcba0b9ca1fa9d7a9607ae3d426ad Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sat, 16 Jun 2018 23:17:37 +0200 Subject: [PATCH] fix ci, speedup qmake --- .travis.yml | 1 + examples/examples.pro | 8 ++++++-- examples/mvvmdatasyncquick/mvvmdatasyncquick.pro | 3 ++- src/imports/imports.pro | 1 - src/src.pro | 15 +++++++++++---- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2199435..f39c9a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,7 @@ before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - rm -fr $QPMX_CACHE_DIR/locks + - rm -rf $QPMX_CACHE_DIR/tmp cache: directories: - $HOME/.gradle/caches/ diff --git a/examples/examples.pro b/examples/examples.pro index 3c3c5e2..4ffdc57 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -4,10 +4,14 @@ SUBDIRS = mvvmcore \ mvvmwidgets \ mvvmquick +mvvmwidgets.depends += mvvmcore +mvvmquick.depends += mvvmcore + qtHaveModule(datasync) { SUBDIRS += mvvmdatasynccore \ mvvmdatasyncwidgets \ mvvmdatasyncquick -} -CONFIG += ordered + mvvmdatasyncwidgets.depends += mvvmdatasynccore + mvvmdatasyncquick.depends += mvvmdatasynccore +} diff --git a/examples/mvvmdatasyncquick/mvvmdatasyncquick.pro b/examples/mvvmdatasyncquick/mvvmdatasyncquick.pro index 02a017c..e279dc0 100644 --- a/examples/mvvmdatasyncquick/mvvmdatasyncquick.pro +++ b/examples/mvvmdatasyncquick/mvvmdatasyncquick.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += quick SUBDIRS += \ - DataSyncSampleQuick + DataSyncSampleQuick diff --git a/src/imports/imports.pro b/src/imports/imports.pro index c70d571..844f148 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS += \ mvvmcore \ diff --git a/src/src.pro b/src/src.pro index 908c2ba..23361e3 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,17 +1,24 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS += mvvmcore \ mvvmwidgets \ - mvvmquick + mvvmquick \ + imports + +mvvmwidgets.depends += mvvmcore +mvvmquick.depends += mvvmcore +imports.depends += mvvmcore mvvmquick qtHaveModule(datasync) { SUBDIRS += mvvmdatasynccore \ mvvmdatasyncwidgets \ mvvmdatasyncquick -} -SUBDIRS += imports + mvvmdatasynccore.depends += mvvmcore + mvvmdatasyncwidgets.depends += mvvmdatasynccore mvvmwidgets + mvvmdatasyncquick.depends += mvvmdatasynccore mvvmquick + imports.depends += mvvmdatasynccore mvvmdatasyncquick +} imports.CONFIG += no_lrelease_target