feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Make simple manual test work with android

Browse Source 
Change-Id: I33283154214a07a0232b8d52c3da62861956a9a1
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-02-26 16:28:34 +01:00
parent b49ef52b86
commit 21ce31a4ef
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/manual/debugger/simple/simple.pro
+3 -3
View File
@@ -3,9 +3,9 @@ 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
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += HAS_PRIVATE
exists(/usr/include/boost/optional.hpp): DEFINES += HAS_BOOST
exists(/usr/include/eigen2/Eigen/Core): DEFINES += HAS_EIGEN
*g++* {
DEFINES += USE_CXX11
tests/manual/debugger/simple/simple_test_app.cpp
+16
View File
@@ -98,6 +98,20 @@
#endif // USE_UNINITIALIZED_AUTOBREAK
#endif
#ifdef HAS_BOOST
#ifndef ANDROID
#define USE_BOOST 1
#endif
#endif
#ifdef HAS_PRIVATE
#define USE_PRIVATE 1
#endif
#ifdef HAS_EIGEN
#define USE_EIGEN 1
#endif
#ifdef QT_SCRIPT_LIB
#define USE_SCRIPTLIB 1
#else
@@ -225,9 +239,11 @@ void dummyStatement(...) {}
#endif
#if defined(__GNUC__) && !defined(__llvm__) && !defined(Q_OS_MAC)
# ifndef ANDROID
# define USE_GCC_EXT 1
# undef __DEPRECATED
# include <ext/hash_set>
# endif
#endif
#ifdef Q_OS_WIN
tests/manual/debugger/simple/simple_test_app.pro
+6 -3
View File
@@ -42,10 +42,13 @@ maemo5 {
QMAKE_CXXFLAGS += -std=c++0x
}
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
exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += HAS_PRIVATE
exists(/usr/include/boost/optional.hpp): DEFINES += HAS_BOOST
exists(/usr/include/eigen2/Eigen/Core): DEFINES += HAS_EIGEN
win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS
# Use for semi-automated testing
#DEFINES += USE_AUTORUN=1
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
ANDROID_EXTRA_LIBS = $$OUT_PWD/libsimple_test_plugin.so