Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
18df0b7d
Commit
18df0b7d
authored
Jan 13, 2020
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake: remove MultiVehicleDockWidget and fix Analyze (Qt5::Charts)
parent
86da51f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
22 deletions
+16
-22
CMakeLists.txt
CMakeLists.txt
+1
-0
CMakeLists.txt
src/AnalyzeView/CMakeLists.txt
+9
-9
CMakeLists.txt
src/ui/CMakeLists.txt
+6
-13
No files found.
CMakeLists.txt
View file @
18df0b7d
...
@@ -90,6 +90,7 @@ include(Qt5QGCConfiguration)
...
@@ -90,6 +90,7 @@ include(Qt5QGCConfiguration)
find_package
(
Qt5
${
QT_VERSION
}
find_package
(
Qt5
${
QT_VERSION
}
COMPONENTS
COMPONENTS
Bluetooth
Bluetooth
Charts
Concurrent
Concurrent
Core
Core
Location
Location
...
...
src/AnalyzeView/CMakeLists.txt
View file @
18df0b7d
...
@@ -17,15 +17,14 @@ add_library(AnalyzeView
...
@@ -17,15 +17,14 @@ add_library(AnalyzeView
${
EXTRA_SRC
}
${
EXTRA_SRC
}
)
)
add_custom_target
(
add_custom_target
(
AnalyzeViewQml
AnalyzeViewQml
SOURCES
SOURCES
AnalyzePage.qml
AnalyzePage.qml
AnalyzeView.qml
AnalyzeView.qml
GeoTagPage.qml
GeoTagPage.qml
LogDownloadPage.qml
LogDownloadPage.qml
MavlinkConsolePage.qml
MavlinkConsolePage.qml
MAVLinkInspectorPage.qml
MAVLinkInspectorPage.qml
)
)
target_link_libraries
(
AnalyzeView
target_link_libraries
(
AnalyzeView
...
@@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView
...
@@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView
qgc
qgc
PUBLIC
PUBLIC
Qt5::Charts
Qt5::Location
Qt5::Location
Qt5::SerialPort
Qt5::SerialPort
Qt5::TextToSpeech
Qt5::TextToSpeech
...
...
src/ui/CMakeLists.txt
View file @
18df0b7d
...
@@ -4,28 +4,22 @@ add_subdirectory(toolbar)
...
@@ -4,28 +4,22 @@ add_subdirectory(toolbar)
add_library
(
ui
add_library
(
ui
MAVLinkDecoder.cc
MAVLinkDecoder.cc
MultiVehicleDockWidget.cc
QGCPluginHost.cc
# HEADERS
# shouldn't be listed here, but aren't named properly for AUTOMOC
MAVLinkDecoder.h
MAVLinkDecoder.h
MultiVehicleDockWidget.h
QGCMapRCToParamDialog.h
QGCMapRCToParamDialog.h
QGCPluginHost.cc
QGCPluginHost.h
QGCPluginHost.h
# UI
# UI
MultiVehicleDockWidget.ui
QGCMapRCToParamDialog.ui
QGCMapRCToParamDialog.ui
QGCPluginHost.ui
QGCPluginHost.ui
QMap3D.ui
QMap3D.ui
)
)
add_custom_target
(
uiQml
add_custom_target
(
uiQml
SOURCES
SOURCES
AppSettings.qml
AppSettings.qml
ExitWithErrorWindow.qml
ExitWithErrorWindow.qml
MainRootWindow.qml
MainRootWindow.qml
)
)
target_link_libraries
(
ui
target_link_libraries
(
ui
...
@@ -39,5 +33,4 @@ target_include_directories(ui
...
@@ -39,5 +33,4 @@ target_include_directories(ui
${
CMAKE_CURRENT_BINARY_DIR
}
${
CMAKE_CURRENT_BINARY_DIR
}
PRIVATE
PRIVATE
linechart
linechart
)
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment