From e49d6213ad129284a45d53c3fcdc03249e84efe2 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Thu, 3 Sep 2015 14:20:19 -0300 Subject: Move qt-ui to desktop-widgets Since we have now destkop and mobile versions, 'qt-ui' was a very poor name choice for a folder that contains only destkop-enabled widgets. Also, move the graphicsview-common.h/cpp to subsurface-core because it doesn't depend on qgraphicsview, it merely implements all the colors that we use throughout Subsurface, and we will use colors on both desktop and mobile versions Same thing applies for metrics.h/cpp Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- qt-ui/CMakeLists.txt | 113 --------------------------------------------------- 1 file changed, 113 deletions(-) delete mode 100644 qt-ui/CMakeLists.txt (limited to 'qt-ui/CMakeLists.txt') diff --git a/qt-ui/CMakeLists.txt b/qt-ui/CMakeLists.txt deleted file mode 100644 index 45447771a..000000000 --- a/qt-ui/CMakeLists.txt +++ /dev/null @@ -1,113 +0,0 @@ -# create the libraries -file(GLOB SUBSURFACE_UI *.ui) -qt5_wrap_ui(SUBSURFACE_UI_HDRS ${SUBSURFACE_UI}) -qt5_add_resources(SUBSURFACE_RESOURCES subsurface.qrc) -source_group("Subsurface Interface Files" FILES ${SUBSURFACE_UI}) - -if(BTSUPPORT) - set(BT_SRC_FILES btdeviceselectiondialog.cpp) -endif() - -include_directories(. - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR} -) - -# the interface, in C++ -set(SUBSURFACE_INTERFACE - updatemanager.cpp - about.cpp - divecomputermanagementdialog.cpp - divelistview.cpp - diveplanner.cpp - diveshareexportdialog.cpp - downloadfromdivecomputer.cpp - globe.cpp - graphicsview-common.cpp - kmessagewidget.cpp - maintab.cpp - mainwindow.cpp - modeldelegates.cpp - metrics.cpp - notificationwidget.cpp - preferences.cpp - simplewidgets.cpp - starwidget.cpp - subsurfacewebservices.cpp - tableview.cpp - divelogimportdialog.cpp - tagwidget.cpp - groupedlineedit.cpp - divelogexportdialog.cpp - divepicturewidget.cpp - usersurvey.cpp - configuredivecomputerdialog.cpp - undocommands.cpp - locationinformation.cpp - qtwaitingspinner.cpp -) - -if(NOT NO_USERMANUAL) - set(SUBSURFACE_INTERFACE ${SUBSURFACE_INTERFACE} - usermanual.cpp - ) -endif() - -if(NOT NO_PRINTING) - set(SUBSURFACE_INTERFACE ${SUBSURFACE_INTERFACE} - templateedit.cpp - printdialog.cpp - printoptions.cpp - printer.cpp - templatelayout.cpp - ) -endif() - -if (FBSUPPORT) - set(SUBSURFACE_INTERFACE ${SUBSURFACE_INTERFACE} - socialnetworks.cpp - ) -endif() - -if (BTSUPPORT) - set(SUBSURFACE_INTERFACE ${SUBSURFACE_INTERFACE} - btdeviceselectiondialog.cpp - ) -endif() - -source_group("Subsurface Interface" FILES ${SUBSURFACE_INTERFACE}) - -# the profile widget -set(SUBSURFACE_PROFILE_LIB_SRCS - profile/profilewidget2.cpp - profile/diverectitem.cpp - profile/divepixmapitem.cpp - profile/divelineitem.cpp - profile/divetextitem.cpp - profile/animationfunctions.cpp - profile/divecartesianaxis.cpp - profile/diveprofileitem.cpp - profile/diveeventitem.cpp - profile/divetooltipitem.cpp - profile/ruleritem.cpp - profile/tankitem.cpp -) -source_group("Subsurface Profile" FILES ${SUBSURFACE_PROFILE_LIB_SRCS}) - -# the yearly statistics widget. -set(SUBSURFACE_STATISTICS_LIB_SRCS - statistics/statisticswidget.cpp - statistics/yearstatistics.cpp - statistics/statisticsbar.cpp - statistics/monthstatistics.cpp -) -source_group("Subsurface Statistics" FILES ${SUBSURFACE_STATISTICS_LIB_SRCS}) - -add_library(subsurface_profile STATIC ${SUBSURFACE_PROFILE_LIB_SRCS}) -target_link_libraries(subsurface_profile ${QT_LIBRARIES}) -add_library(subsurface_statistics STATIC ${SUBSURFACE_STATISTICS_LIB_SRCS}) -target_link_libraries(subsurface_statistics ${QT_LIBRARIES}) -add_library(subsurface_generated_ui STATIC ${SUBSURFACE_UI_HDRS}) -target_link_libraries(subsurface_generated_ui ${QT_LIBRARIES}) -add_library(subsurface_interface STATIC ${SUBSURFACE_INTERFACE}) -target_link_libraries(subsurface_interface ${QT_LIBRARIES} ${MARBLE_LIBRARIES}) -- cgit v1.2.3-70-g09d2