mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: don't compile subsurface-helper.cpp for tests

Browse source 
It is unclear why the subsurface-helper.cpp file was linked with the
tests. In any case, it led to comlicated ifdef-ery, so let's remove
that for now and readd later if the need arises.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-31 14:55:11 +02:00 • committed by Dirk Hohndel
parent 286100c10a
commit 6dbc9ca4b0
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
subsurface-helper.cpp
View file

@ -33,7 +33,6 @@ QString getAndroidHWInfo(); // from android.cpp
#include <QFontDatabase> #include <QFontDatabase>
#endif /* Q_OS_ANDROID */ #endif /* Q_OS_ANDROID */
#ifndef SUBSURFACE_TEST_DATA
QObject *qqWindowObject = NULL; QObject *qqWindowObject = NULL;
// Forward declaration // Forward declaration
@ -181,7 +180,6 @@ static void register_meta_types()
{ {
qRegisterMetaType<duration_t>(); qRegisterMetaType<duration_t>();
} }
#endif // not SUBSURFACE_TEST_DATA
template <typename T> template <typename T>
static void register_qml_type(const char *name) static void register_qml_type(const char *name)
@ -195,8 +193,6 @@ static void register_qml_types(QQmlEngine *engine)
// register qPref* // register qPref*
qPref::registerQML(engine); qPref::registerQML(engine);
#ifndef SUBSURFACE_TEST_DATA
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
register_qml_type<QMLManager>("QMLManager"); register_qml_type<QMLManager>("QMLManager");
register_qml_type<QMLProfile>("QMLProfile"); register_qml_type<QMLProfile>("QMLProfile");
@ -206,5 +202,4 @@ static void register_qml_types(QQmlEngine *engine)
register_qml_type<MapWidgetHelper>("MapWidgetHelper"); register_qml_type<MapWidgetHelper>("MapWidgetHelper");
register_qml_type<MapLocationModel>("MapLocationModel"); register_qml_type<MapLocationModel>("MapLocationModel");
#endif // not SUBSURFACE_TEST_DATA
} }

3
tests/CMakeLists.txt
View file

@ -88,8 +88,7 @@ add_definitions(-g)
add_definitions(-DSUBSURFACE_TEST_DATA="${SUBSURFACE_TEST_DATA}") add_definitions(-DSUBSURFACE_TEST_DATA="${SUBSURFACE_TEST_DATA}")
# Build QML test runner # Build QML test runner
# add_executable demands relative path, therefore ../ add_executable(TestQML testqml.cpp)
add_executable(TestQML testqml.cpp ../subsurface-helper.cpp )
target_link_libraries( target_link_libraries(
TestQML TestQML
subsurface_corelib subsurface_corelib