diff --git a/.qmake.cache.in b/.qmake.cache.in deleted file mode 100644 index 008a232..0000000 --- a/.qmake.cache.in +++ /dev/null @@ -1,2 +0,0 @@ -TOP_SRC_DIR=$$PWD -TOP_BUILD_DIR=$$OUT_PWD diff --git a/.qmake.conf b/.qmake.conf deleted file mode 100644 index 5b5aab0..0000000 --- a/.qmake.conf +++ /dev/null @@ -1,2 +0,0 @@ -TOP_SRC_DIR=$$PWD -TOP_BUILD_DIR=$$shadowed($$PWD) \ No newline at end of file diff --git a/common.pri b/common.pri index ee8811a..02aa3e9 100644 --- a/common.pri +++ b/common.pri @@ -1,7 +1,13 @@ -!contains(CONFIG, config_build_dir){ +isEmpty(TOP_BUILD_DIR) { TOP_BUILD_DIR = $${PWD} } +message(TOP_BUILD_DIR: $$TOP_BUILD_DIR) + +#!contains(CONFIG, config_build_dir){ +# TOP_BUILD_DIR = $${PWD} +#} + !contains(CONFIG, no_build_translations){ CONFIG += build_translations } @@ -73,12 +79,6 @@ CONFIG(release, debug|release){ BUILD_TYPE = debug } -#isEmpty(TOP_BUILD_DIR) { -# BUILD_DIR = $${OUT_PWD}/build/$${QT_VERSION} -#}else{ -# BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION} -#} - BUILD_DIR = $${TOP_BUILD_DIR}/build/$${QT_VERSION} DEST_INCLUDE_DIR = $$PWD/include diff --git a/initvars.pro b/initvars.pro deleted file mode 100644 index b3dc9a9..0000000 --- a/initvars.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE=subdirs -SUBDIRS= # don't build anything, we're just generating the .qmake.cache file -QMAKE_SUBSTITUTES += .qmake.cache.in diff --git a/limereport.pro b/limereport.pro index 74c1524..0ac45be 100644 --- a/limereport.pro +++ b/limereport.pro @@ -13,7 +13,6 @@ export($$CONFIG) CONFIG += ordered SUBDIRS += \ - initvars.pro \ limereport \ demo_r1 \ demo_r2 \ @@ -24,11 +23,3 @@ SUBDIRS += \ SUBDIRS += designer_plugin } } - -# QMake top level srcdir and builddir -# https://wiki.qt.io/QMake-top-level-srcdir-and-builddir -#Qt4 .qmake.cache.in -#Qt5 .qmake.conf -OTHER_FILES += \ - .qmake.conf \ - .qmake.cache.in