diff options
| -rw-r--r-- | subsurface-helper.cpp | 5 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index a23e63d6e..da73c05a7 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -33,7 +33,6 @@ QString getAndroidHWInfo(); // from android.cpp #include <QFontDatabase> #endif /* Q_OS_ANDROID */ -#ifndef SUBSURFACE_TEST_DATA QObject *qqWindowObject = NULL; // Forward declaration @@ -181,7 +180,6 @@ static void register_meta_types() { qRegisterMetaType<duration_t>(); } -#endif // not SUBSURFACE_TEST_DATA template <typename T> static void register_qml_type(const char *name) @@ -195,8 +193,6 @@ static void register_qml_types(QQmlEngine *engine) // register qPref* qPref::registerQML(engine); -#ifndef SUBSURFACE_TEST_DATA - #ifdef SUBSURFACE_MOBILE register_qml_type<QMLManager>("QMLManager"); register_qml_type<QMLProfile>("QMLProfile"); @@ -206,5 +202,4 @@ static void register_qml_types(QQmlEngine *engine) register_qml_type<MapWidgetHelper>("MapWidgetHelper"); register_qml_type<MapLocationModel>("MapLocationModel"); -#endif // not SUBSURFACE_TEST_DATA } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c2e10dc63..77312a215 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -88,8 +88,7 @@ add_definitions(-g) add_definitions(-DSUBSURFACE_TEST_DATA="${SUBSURFACE_TEST_DATA}") # Build QML test runner -# add_executable demands relative path, therefore ../ -add_executable(TestQML testqml.cpp ../subsurface-helper.cpp ) +add_executable(TestQML testqml.cpp) target_link_libraries( TestQML subsurface_corelib |