I was having a few issues with building, it seems that the new folder architecture was not applied correctly on the include headers sometimes. :)
Tomaz
From 30c4fae77c011af0d509a0d866ba9f9c20b56427 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava <[email protected]> Date: Tue, 5 Apr 2016 14:12:17 -0300 Subject: [PATCH] Fix compilation with the new folder architecture Dirk forgot to test against the desktop version, perhaps. :) Signed-off-by: Tomaz Canabrava <[email protected]> --- desktop-widgets/maintab.ui | 20 ++++++++++---------- .../plugins/facebook/facebookconnectwidget.cpp | 6 ++++-- desktop-widgets/printer.cpp | 4 ++-- desktop-widgets/printoptions.cpp | 2 +- desktop-widgets/templatelayout.cpp | 4 ++-- desktop-widgets/templatelayout.h | 6 +++--- tests/CMakeLists.txt | 8 ++++++-- tests/testdivesiteduplication.cpp | 4 ++-- tests/testgitstorage.cpp | 12 +++++++----- tests/testgpscoords.cpp | 2 +- tests/testparse.cpp | 6 +++--- tests/testplan.cpp | 10 +++++----- tests/testprofile.cpp | 2 +- tests/testrenumber.cpp | 6 +++--- tests/testunitconversion.cpp | 2 +- 15 files changed, 51 insertions(+), 43 deletions(-) diff --git a/desktop-widgets/maintab.ui b/desktop-widgets/maintab.ui index 964593b..dc4c105 100644 --- a/desktop-widgets/maintab.ui +++ b/desktop-widgets/maintab.ui @@ -55,8 +55,8 @@ <rect> <x>0</x> <y>0</y> - <width>445</width> - <height>726</height> + <width>449</width> + <height>730</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_3"> @@ -525,8 +525,8 @@ <rect> <x>0</x> <y>0</y> - <width>445</width> - <height>754</height> + <width>100</width> + <height>30</height> </rect> </property> <layout class="QGridLayout" name="equipmentTabScrollAreaLayout"> @@ -620,8 +620,8 @@ <rect> <x>0</x> <y>0</y> - <width>287</width> - <height>320</height> + <width>294</width> + <height>270</height> </rect> </property> <layout class="QGridLayout" name="diveInfoScrollAreaLayout"> @@ -961,8 +961,8 @@ <rect> <x>0</x> <y>0</y> - <width>297</width> - <height>187</height> + <width>311</width> + <height>158</height> </rect> </property> <layout class="QHBoxLayout" name="horizontalLayout"> @@ -1205,7 +1205,7 @@ <customwidget> <class>KMessageWidget</class> <extends>QFrame</extends> - <header>desktop-widgets/kmessagewidget.h</header> + <header>kmessagewidget.h</header> <container>1</container> </customwidget> <customwidget> @@ -1223,7 +1223,7 @@ <customwidget> <class>TableView</class> <extends>QWidget</extends> - <header>desktop-widgets/desktop-widget/tableview.h</header> + <header>desktop-widgets/tableview.h</header> <container>1</container> </customwidget> <customwidget> diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp index 264244b..ba54ae3 100644 --- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp +++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp @@ -21,8 +21,10 @@ #include "mainwindow.h" #include "profile-widget/profilewidget2.h" -#include "pref.h" -#include "helpers.h" + +#include "core/pref.h" +#include "core/helpers.h" + #include "ui_socialnetworksdialog.h" #include "ui_facebookconnectwidget.h" diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp index 33ee71b..eea3043 100644 --- a/desktop-widgets/printer.cpp +++ b/desktop-widgets/printer.cpp @@ -1,7 +1,7 @@ #include "printer.h" #include "templatelayout.h" -#include "statistics.h" -#include "helpers.h" +#include "core/statistics.h" +#include "core/helpers.h" #include <algorithm> #include <QtWebKitWidgets> diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp index 75d6ad8..e7b5f5a 100644 --- a/desktop-widgets/printoptions.cpp +++ b/desktop-widgets/printoptions.cpp @@ -1,6 +1,6 @@ #include "printoptions.h" #include "templateedit.h" -#include "helpers.h" +#include "core/helpers.h" #include <QDebug> #include <QFileDialog> diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index fd0a44c..3bd9f1f 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -1,8 +1,8 @@ #include <string> #include "templatelayout.h" -#include "helpers.h" -#include "display.h" +#include "core/helpers.h" +#include "core/display.h" QList<QString> grantlee_templates, grantlee_statistics_templates; diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index fc77a50..195441f 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -4,9 +4,9 @@ #include <grantlee_templates.h> #include "mainwindow.h" #include "printoptions.h" -#include "statistics.h" -#include "qthelper.h" -#include "helpers.h" +#include "core/statistics.h" +#include "core/qthelper.h" +#include "core/helpers.h" #include "core/subsurface-qt/DiveObjectHelper.h" int getTotalWork(print_options *printOptions); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a31e2c6..d516bb6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,11 @@ # QTest based tests +qt5_add_resources(SUBSURFACE_TEST_RESOURCES ../subsurface.qrc) + +add_library(RESOURCE_LIBRARY STATIC ${SUBSURFACE_TEST_RESOURCES}) + macro(TEST NAME FILE) - add_executable(${NAME} ${FILE} ${SUBSURFACE_RESOURCES} ) - target_link_libraries(${NAME} subsurface_corelib ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} ) + add_executable(${NAME} ${FILE} ) + target_link_libraries(${NAME} subsurface_corelib RESOURCE_LIBRARY ${QT_TEST_LIBRARIES} ${SUBSURFACE_LINK_LIBRARIES} ) add_test(NAME ${NAME} COMMAND $<TARGET_FILE:${NAME}>) endmacro() diff --git a/tests/testdivesiteduplication.cpp b/tests/testdivesiteduplication.cpp index fc8ba0a..805dac4 100644 --- a/tests/testdivesiteduplication.cpp +++ b/tests/testdivesiteduplication.cpp @@ -1,6 +1,6 @@ #include "testdivesiteduplication.h" -#include "dive.h" -#include "divesite.h" +#include "core/dive.h" +#include "core/divesite.h" void TestDiveSiteDuplication::testReadV2() { diff --git a/tests/testgitstorage.cpp b/tests/testgitstorage.cpp index 30417b3..f495597 100644 --- a/tests/testgitstorage.cpp +++ b/tests/testgitstorage.cpp @@ -1,10 +1,12 @@ #include "testgitstorage.h" -#include "dive.h" -#include "divelist.h" -#include "file.h" #include "git2.h" -#include "prefs-macros.h" -#include "subsurfacestartup.h" + +#include "core/dive.h" +#include "core/divelist.h" +#include "core/file.h" +#include "core/prefs-macros.h" +#include "core/subsurfacestartup.h" + #include <QDir> #include <QTextStream> #include <QNetworkProxy> diff --git a/tests/testgpscoords.cpp b/tests/testgpscoords.cpp index 50bb4bc..535745d 100644 --- a/tests/testgpscoords.cpp +++ b/tests/testgpscoords.cpp @@ -1,4 +1,4 @@ -#include <dive.h> +#include "core/dive.h" #include "testgpscoords.h" //unit under test diff --git a/tests/testparse.cpp b/tests/testparse.cpp index 8bb092b..8d4cedb 100644 --- a/tests/testparse.cpp +++ b/tests/testparse.cpp @@ -1,7 +1,7 @@ #include "testparse.h" -#include "dive.h" -#include "file.h" -#include "divelist.h" +#include "core/dive.h" +#include "core/file.h" +#include "core/divelist.h" #include <QTextStream> char *intdup(int index) diff --git a/tests/testplan.cpp b/tests/testplan.cpp index 50966af..d6bca5e 100644 --- a/tests/testplan.cpp +++ b/tests/testplan.cpp @@ -1,9 +1,9 @@ -#include "dive.h" +#include "core/dive.h" #include "testplan.h" -#include "planner.h" -#include "units.h" -#include "subsurfacestartup.h" -#include "qthelper.h" +#include "core/planner.h" +#include "core/units.h" +#include "core/subsurfacestartup.h" +#include "core/qthelper.h" #include <QDebug> #define DEBUG 1 diff --git a/tests/testprofile.cpp b/tests/testprofile.cpp index d8aea3c..cf2db80 100644 --- a/tests/testprofile.cpp +++ b/tests/testprofile.cpp @@ -1,5 +1,5 @@ #include "testprofile.h" -#include "dive.h" +#include "core/dive.h" void TestProfile::testRedCeiling() { diff --git a/tests/testrenumber.cpp b/tests/testrenumber.cpp index 83c4b56..459987a 100644 --- a/tests/testrenumber.cpp +++ b/tests/testrenumber.cpp @@ -1,7 +1,7 @@ #include "testrenumber.h" -#include "dive.h" -#include "file.h" -#include "divelist.h" +#include "core/dive.h" +#include "core/file.h" +#include "core/divelist.h" #include <QTextStream> void TestRenumber::setup() diff --git a/tests/testunitconversion.cpp b/tests/testunitconversion.cpp index 8e64fdd..4583bca 100644 --- a/tests/testunitconversion.cpp +++ b/tests/testunitconversion.cpp @@ -1,5 +1,5 @@ #include "testunitconversion.h" -#include "dive.h" +#include "core/dive.h" void TestUnitConversion::testUnitConversions() { -- 2.8.0
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
