diff options
| author | hjk <hjk121@nokiamail.com> | 2014-02-26 16:28:34 +0100 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-02-26 16:29:58 +0100 |
| commit | 21ce31a4ef27cd01f4ac7b724b9759645a7c4f95 (patch) | |
| tree | 276b092dd76112a79709d92a842eea54cac862f4 | |
| parent | b49ef52b86c22bee187c054c6c140f5178ad92aa (diff) | |
| download | qt-creator-21ce31a4ef27cd01f4ac7b724b9759645a7c4f95.tar.gz | |
Debugger: Make simple manual test work with android
Change-Id: I33283154214a07a0232b8d52c3da62861956a9a1
Reviewed-by: hjk <hjk121@nokiamail.com>
| -rw-r--r-- | tests/manual/debugger/simple/simple.pro | 6 | ||||
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.cpp | 16 | ||||
| -rw-r--r-- | tests/manual/debugger/simple/simple_test_app.pro | 9 |
3 files changed, 25 insertions, 6 deletions
diff --git a/tests/manual/debugger/simple/simple.pro b/tests/manual/debugger/simple/simple.pro index 9c46b12176..9be04f5431 100644 --- a/tests/manual/debugger/simple/simple.pro +++ b/tests/manual/debugger/simple/simple.pro @@ -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 diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index 3b374dfc80..f054b39bda 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -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 diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro index 4d7e5c9de1..f9461ef3d4 100644 --- a/tests/manual/debugger/simple/simple_test_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -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 |