From eed190b8457b7e388a256b768624e3efd04a94be Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 22 Jun 2014 20:18:26 +0200 Subject: [PATCH] don't use .qmake.conf as it seems to break in some circumstances --- .qmake.conf | 2 -- guh.pri | 3 +++ server/server.pro | 2 -- tests/auto/autotests.pri | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 .qmake.conf diff --git a/.qmake.conf b/.qmake.conf deleted file mode 100644 index b303d719..00000000 --- a/.qmake.conf +++ /dev/null @@ -1,2 +0,0 @@ -top_srcdir=$$PWD -top_builddir=$$shadowed($$PWD) diff --git a/guh.pri b/guh.pri index 8f2cd2ac..15edcdb0 100644 --- a/guh.pri +++ b/guh.pri @@ -9,3 +9,6 @@ coverage { QMAKE_LFLAGS += -fprofile-arcs } +top_srcdir=$$PWD +top_builddir=$$shadowed($$PWD) + diff --git a/server/server.pro b/server/server.pro index 6a7c0ead..f17a03d0 100644 --- a/server/server.pro +++ b/server/server.pro @@ -2,8 +2,6 @@ include(../guh.pri) message("Building guh version $${GUH_VERSION_STRING}") -message("server: $$top_srcdir") - TARGET = guh TEMPLATE = app diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri index 2fb214b3..df3b790c 100644 --- a/tests/auto/autotests.pri +++ b/tests/auto/autotests.pri @@ -1,7 +1,6 @@ QT += testlib network CONFIG += testcase c++11 -message ("tests: $$top_srcdir") include($$top_srcdir/server/server.pri) DEFINES += TESTING_ENABLED