From baa078494dedebfa99906d5dcfbd88151bbe88d3 Mon Sep 17 00:00:00 2001
From: Arin Alexander <arin_a@bk.ru>
Date: Sat, 22 Sep 2018 12:34:48 +0300
Subject: [PATCH] .qmake.cache has been removed

---
 .qmake.cache.in |  2 --
 .qmake.conf     |  2 --
 common.pri      | 14 +++++++-------
 initvars.pro    |  3 ---
 limereport.pro  |  8 --------
 5 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 .qmake.cache.in
 delete mode 100644 .qmake.conf
 delete mode 100644 initvars.pro

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 e79765e..714f6bf 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
 }
@@ -30,12 +36,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 2fc1bb0..f954fae 100644
--- a/limereport.pro
+++ b/limereport.pro
@@ -13,16 +13,8 @@ export($$CONFIG)
 
 CONFIG  += ordered
 SUBDIRS += \
-        initvars.pro \
         limereport \
         demo_r1 \
         demo_r2 \
         designer
 
-# 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