From 6d0231c7ec0f12f87bdd879cdfbf6fb8d06f6c9e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 28 Feb 2012 11:59:13 +0100
Subject: [PATCH] debugger: move defines to a .pro file that is actually looked
at
Change-Id: Ic14fe35a6a16093117d89ef83c55d7a8bf29a137
Reviewed-by: hjk <qthjk@ovi.com>
---
tests/manual/debugger/simple/simple.pro | 9 +++++++++
tests/manual/debugger/simple/simple_test_app.pro | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tests/manual/debugger/simple/simple.pro b/tests/manual/debugger/simple/simple.pro
index e6dbd0c35cd..9c46b121769 100644
--- a/tests/manual/debugger/simple/simple.pro
+++ b/tests/manual/debugger/simple/simple.pro
@@ -2,3 +2,12 @@
TEMPLATE = subdirs
SUBDIRS += simple_test_app.pro simple_test_plugin.pro
+
+exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE
+exists(/usr/include/boost/optional.hpp): DEFINES += USE_BOOST
+exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN
+
+*g++* {
+ DEFINES += USE_CXX11
+ QMAKE_CXXFLAGS += -std=c++0x
+}
diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro
index 614c6525ffe..9f0e5ae94c9 100644
--- a/tests/manual/debugger/simple/simple_test_app.pro
+++ b/tests/manual/debugger/simple/simple_test_app.pro
@@ -22,14 +22,6 @@ maemo5 {
INSTALLS += target
}
-exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE
-exists(/usr/include/boost/optional.hpp): DEFINES += USE_BOOST
-exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN
-
-*g++* {
- DEFINES += USE_CXX11
- QMAKE_CXXFLAGS += -std=c++0x
-}
# Use for semi-automated testing
#DEFINES += USE_AUTORUN=1
--
GitLab