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
d99141e6
Commit
d99141e6
authored
Nov 12, 2020
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
after removing .orig files
parent
fd63568a
Changes
133
Hide whitespace changes
Inline
Side-by-side
Showing
133 changed files
with
0 additions
and
88097 deletions
+0
-88097
.gitmodules.orig
.gitmodules.orig
+0
-33
CMakeLists.txt.orig
CMakeLists.txt.orig
+0
-232
UnitTest.qrc.orig
UnitTest.qrc.orig
+0
-37
backup-Jenkinsfile.orig
backup-Jenkinsfile.orig
+0
-345
CMakeLists.txt.orig
libs/CMakeLists.txt.orig
+0
-10
SDL.h.orig
libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h.orig
+0
-135
SDL_assert.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_assert.h.orig
+0
-291
SDL_atomic.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_atomic.h.orig
+0
-277
SDL_audio.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_audio.h.orig
+0
-826
SDL_bits.h.orig
...meworks/SDL2.framework/Versions/A/Headers/SDL_bits.h.orig
+0
-112
SDL_clipboard.h.orig
...ks/SDL2.framework/Versions/A/Headers/SDL_clipboard.h.orig
+0
-71
SDL_config.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_config.h.orig
+0
-55
SDL_config_macosx.h.orig
...DL2.framework/Versions/A/Headers/SDL_config_macosx.h.orig
+0
-240
SDL_copying.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_copying.h.orig
+0
-20
SDL_cpuinfo.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h.orig
+0
-188
SDL_endian.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_endian.h.orig
+0
-260
SDL_error.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_error.h.orig
+0
-76
SDL_events.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_events.h.orig
+0
-788
SDL_filesystem.h.orig
...s/SDL2.framework/Versions/A/Headers/SDL_filesystem.h.orig
+0
-136
SDL_gamecontroller.h.orig
...L2.framework/Versions/A/Headers/SDL_gamecontroller.h.orig
+0
-390
SDL_gesture.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_gesture.h.orig
+0
-87
SDL_haptic.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_haptic.h.orig
+0
-1238
SDL_hints.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_hints.h.orig
+0
-1135
SDL_joystick.h.orig
...rks/SDL2.framework/Versions/A/Headers/SDL_joystick.h.orig
+0
-408
SDL_keyboard.h.orig
...rks/SDL2.framework/Versions/A/Headers/SDL_keyboard.h.orig
+0
-217
SDL_keycode.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_keycode.h.orig
+0
-349
SDL_loadso.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_loadso.h.orig
+0
-81
SDL_log.h.orig
...ameworks/SDL2.framework/Versions/A/Headers/SDL_log.h.orig
+0
-211
SDL_main.h.orig
...meworks/SDL2.framework/Versions/A/Headers/SDL_main.h.orig
+0
-168
SDL_messagebox.h.orig
...s/SDL2.framework/Versions/A/Headers/SDL_messagebox.h.orig
+0
-144
SDL_mouse.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_mouse.h.orig
+0
-302
SDL_mutex.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_mutex.h.orig
+0
-251
SDL_name.h.orig
...meworks/SDL2.framework/Versions/A/Headers/SDL_name.h.orig
+0
-33
SDL_opengl.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_opengl.h.orig
+0
-2183
SDL_opengles.h.orig
...rks/SDL2.framework/Versions/A/Headers/SDL_opengles.h.orig
+0
-39
SDL_opengles2.h.orig
...ks/SDL2.framework/Versions/A/Headers/SDL_opengles2.h.orig
+0
-52
SDL_pixels.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_pixels.h.orig
+0
-470
SDL_platform.h.orig
...rks/SDL2.framework/Versions/A/Headers/SDL_platform.h.orig
+0
-198
SDL_power.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_power.h.orig
+0
-75
SDL_quit.h.orig
...meworks/SDL2.framework/Versions/A/Headers/SDL_quit.h.orig
+0
-58
SDL_rect.h.orig
...meworks/SDL2.framework/Versions/A/Headers/SDL_rect.h.orig
+0
-148
SDL_render.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_render.h.orig
+0
-931
SDL_rwops.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_rwops.h.orig
+0
-254
SDL_scancode.h.orig
...rks/SDL2.framework/Versions/A/Headers/SDL_scancode.h.orig
+0
-413
SDL_shape.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_shape.h.orig
+0
-144
SDL_stdinc.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_stdinc.h.orig
+0
-607
SDL_surface.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_surface.h.orig
+0
-553
SDL_system.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_system.h.orig
+0
-279
SDL_syswm.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_syswm.h.orig
+0
-324
SDL_thread.h.orig
...works/SDL2.framework/Versions/A/Headers/SDL_thread.h.orig
+0
-343
SDL_timer.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_timer.h.orig
+0
-115
SDL_touch.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_touch.h.orig
+0
-86
SDL_types.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_types.h.orig
+0
-29
SDL_version.h.orig
...orks/SDL2.framework/Versions/A/Headers/SDL_version.h.orig
+0
-162
SDL_video.h.orig
...eworks/SDL2.framework/Versions/A/Headers/SDL_video.h.orig
+0
-1276
begin_code.h.orig
...works/SDL2.framework/Versions/A/Headers/begin_code.h.orig
+0
-167
close_code.h.orig
...works/SDL2.framework/Versions/A/Headers/close_code.h.orig
+0
-37
Info.plist.orig
...works/SDL2.framework/Versions/A/Resources/Info.plist.orig
+0
-46
LLT_LAPACKE.h.orig
libs/eigen/Eigen/src/Cholesky/LLT_LAPACKE.h.orig
+0
-99
GeneralMatrixMatrixTriangular_BLAS.h.orig
...c/Core/products/GeneralMatrixMatrixTriangular_BLAS.h.orig
+0
-145
GeneralMatrixMatrix_BLAS.h.orig
...n/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h.orig
+0
-122
GeneralMatrixVector_BLAS.h.orig
...n/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h.orig
+0
-136
SelfadjointMatrixMatrix_BLAS.h.orig
...gen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h.orig
+0
-287
SelfadjointMatrixVector_BLAS.h.orig
...gen/src/Core/products/SelfadjointMatrixVector_BLAS.h.orig
+0
-118
TriangularMatrixMatrix_BLAS.h.orig
...igen/src/Core/products/TriangularMatrixMatrix_BLAS.h.orig
+0
-315
TriangularMatrixVector_BLAS.h.orig
...igen/src/Core/products/TriangularMatrixVector_BLAS.h.orig
+0
-255
TriangularSolverMatrix_BLAS.h.orig
...igen/src/Core/products/TriangularSolverMatrix_BLAS.h.orig
+0
-163
ComplexSchur_LAPACKE.h.orig
libs/eigen/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h.orig
+0
-91
RealSchur_LAPACKE.h.orig
libs/eigen/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h.orig
+0
-77
SelfAdjointEigenSolver_LAPACKE.h.orig
...gen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h.orig
+0
-87
InverseImpl.h.orig
libs/eigen/Eigen/src/LU/InverseImpl.h.orig
+0
-415
PartialPivLU_LAPACKE.h.orig
libs/eigen/Eigen/src/LU/PartialPivLU_LAPACKE.h.orig
+0
-83
ColPivHouseholderQR_LAPACKE.h.orig
libs/eigen/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h.orig
+0
-97
HouseholderQR_LAPACKE.h.orig
libs/eigen/Eigen/src/QR/HouseholderQR_LAPACKE.h.orig
+0
-68
JacobiSVD_LAPACKE.h.orig
libs/eigen/Eigen/src/SVD/JacobiSVD_LAPACKE.h.orig
+0
-91
qgcresources.qrc.orig
qgcresources.qrc.orig
+0
-335
qgroundcontrol.pro.orig
qgroundcontrol.pro.orig
+0
-1625
qgroundcontrol.qrc.orig
qgroundcontrol.qrc.orig
+0
-375
ADSBVehicle.h.orig
src/ADSB/ADSBVehicle.h.orig
+0
-84
SettingsFact.cc.orig
src/FactSystem/SettingsFact.cc.orig
+0
-97
APM-MavCmdInfoCommon.json.orig
src/FirmwarePlugin/APM/APM-MavCmdInfoCommon.json.orig
+0
-95
APM-MavCmdInfoFixedWing.json.orig
src/FirmwarePlugin/APM/APM-MavCmdInfoFixedWing.json.orig
+0
-23
APMParameterFactMetaData.Plane.3.9.xml.orig
...arePlugin/APM/APMParameterFactMetaData.Plane.3.9.xml.orig
+0
-10620
APMParameterFactMetaData.Sub.3.6.xml.orig
...mwarePlugin/APM/APMParameterFactMetaData.Sub.3.6.xml.orig
+0
-12574
Copter3.6.OfflineEditing.params.orig
src/FirmwarePlugin/APM/Copter3.6.OfflineEditing.params.orig
+0
-833
PX4-MavCmdInfoCommon.json.orig
src/FirmwarePlugin/PX4/PX4-MavCmdInfoCommon.json.orig
+0
-23
PX4-MavCmdInfoFixedWing.json.orig
src/FirmwarePlugin/PX4/PX4-MavCmdInfoFixedWing.json.orig
+0
-8
FlyViewMap.qml.orig
src/FlightDisplay/FlyViewMap.qml.orig
+0
-575
GuidedActionsController.qml.orig
src/FlightDisplay/GuidedActionsController.qml.orig
+0
-627
GuidedToolStripAction.qml.orig
src/FlightDisplay/GuidedToolStripAction.qml.orig
+0
-22
qmldir.orig
src/FlightDisplay/qmldir.orig
+0
-19
MissionItemIndicator.qml.orig
src/FlightMap/MapItems/MissionItemIndicator.qml.orig
+0
-67
MissionLineView.qml.orig
src/FlightMap/MapItems/MissionLineView.qml.orig
+0
-47
QGCGeo.cc.orig
src/Geo/QGCGeo.cc.orig
+0
-156
QGCGeo.h.orig
src/Geo/QGCGeo.h.orig
+0
-108
KMLHelper.cc.orig
src/KMLHelper.cc.orig
+0
-167
KMLHelper.h.orig
src/KMLHelper.h.orig
+0
-32
BlankPlanCreator.h.orig
src/MissionManager/BlankPlanCreator.h.orig
+0
-22
MissionController.cc.orig
src/MissionManager/MissionController.cc.orig
+0
-5480
MissionController.h.orig
src/MissionManager/MissionController.h.orig
+0
-840
QGCMapPolygon.cc.orig
src/MissionManager/QGCMapPolygon.cc.orig
+0
-725
QGCMapPolygon.h.orig
src/MissionManager/QGCMapPolygon.h.orig
+0
-305
QGCMapPolygonVisuals.qml.orig
src/MissionManager/QGCMapPolygonVisuals.qml.orig
+0
-739
SimpleMissionItem.cc.orig
src/MissionManager/SimpleMissionItem.cc.orig
+0
-1082
SimpleMissionItem.h.orig
src/MissionManager/SimpleMissionItem.h.orig
+0
-240
StructureScanComplexItem.h.orig
src/MissionManager/StructureScanComplexItem.h.orig
+0
-209
SurveyComplexItem.cc.orig
src/MissionManager/SurveyComplexItem.cc.orig
+0
-1563
TransectStyleComplexItem.cc.orig
src/MissionManager/TransectStyleComplexItem.cc.orig
+0
-1439
TransectStyleComplexItem.h.orig
src/MissionManager/TransectStyleComplexItem.h.orig
+0
-484
UT-MavCmdInfoCommon.json.orig
src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json.orig
+0
-222
UT-MavCmdInfoFixedWing.json.orig
src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json.orig
+0
-50
UT-MavCmdInfoRover.json.orig
src/MissionManager/UnitTest/UT-MavCmdInfoRover.json.orig
+0
-8
VisualMissionItem.cc.orig
src/MissionManager/VisualMissionItem.cc.orig
+0
-259
QGCApplication.cc.orig
src/QGCApplication.cc.orig
+0
-1900
qmldir.orig
src/QmlControls/QGroundControl/FactControls/qmldir.orig
+0
-12
qmldir.orig
src/QmlControls/QGroundControl/PX4/qmldir.orig
+0
-4
QGroundControlQmlGlobal.h.orig
src/QmlControls/QGroundControlQmlGlobal.h.orig
+0
-322
QmlObjectListModel.cc.orig
src/QmlControls/QmlObjectListModel.cc.orig
+0
-444
QmlObjectListModel.h.orig
src/QmlControls/QmlObjectListModel.h.orig
+0
-164
SectionHeader.qml.orig
src/QmlControls/SectionHeader.qml.orig
+0
-81
ToolStrip.qml.orig
src/QmlControls/ToolStrip.qml.orig
+0
-478
CMakeLists.txt.orig
src/Settings/CMakeLists.txt.orig
+0
-50
FlyViewSettings.cc.orig
src/Settings/FlyViewSettings.cc.orig
+0
-37
SettingsManager.cc.orig
src/Settings/SettingsManager.cc.orig
+0
-92
SettingsManager.h.orig
src/Settings/SettingsManager.h.orig
+0
-142
TerrainQuery.cc.orig
src/Terrain/TerrainQuery.cc.orig
+0
-929
Vehicle.h.orig
src/Vehicle/Vehicle.h.orig
+0
-1309
README.md.orig
src/VideoReceiver/README.md.orig
+0
-117
VideoReceiver.pri.orig
src/VideoReceiver/VideoReceiver.pri.orig
+0
-152
main.cc.orig
src/main.cc.orig
+0
-422
GeneralSettings.qml.orig
src/ui/preferences/GeneralSettings.qml.orig
+0
-1168
MainToolBar.qml.orig
src/ui/toolbar/MainToolBar.qml.orig
+0
-353
qgc.ts.orig
translations/qgc.ts.orig
+0
-16958
No files found.
.gitmodules.orig
deleted
100644 → 0
View file @
fd63568a
[submodule "src/GPS/Drivers"]
path = src/GPS/Drivers
url = https://github.com/PX4/GpsDrivers.git
[submodule "libs/mavlink/include/mavlink/v2.0"]
path = libs/mavlink/include/mavlink/v2.0
url = https://github.com/mavlink/c_library_v2.git
<<<<<<< HEAD
[submodule "libs/polylabel"]
path = libs/polylabel
url = https://github.com/mapbox/polylabel.git
[submodule ".libs/or-tools/dependencies/Cbc/source"]
path = .libs/or-tools/dependencies/Cbc/source
url = https://github.com/Mizux/Cbc.git
[submodule ".libs/or-tools/dependencies/Cgl/source"]
path = .libs/or-tools/dependencies/Cgl/source
url = https://github.com/Mizux/Cgl.git
[submodule ".libs/or-tools/dependencies/Clp/source"]
path = .libs/or-tools/dependencies/Clp/source
url = https://github.com/Mizux/Clp.git
[submodule ".libs/or-tools/dependencies/Osi/source"]
path = .libs/or-tools/dependencies/Osi/source
url = https://github.com/Mizux/Osi.git
[submodule "libs/or-tools"]
path = libs/or-tools
url = https://github.com/google/or-tools.git
=======
>>>>>>> upstream_merge
[submodule "libs/OpenSSL/android_openssl"]
path = libs/OpenSSL/android_openssl
url = https://github.com/Auterion/android_openssl
[submodule "libs/qmlglsink/gst-plugins-good"]
path = libs/qmlglsink/gst-plugins-good
url = https://github.com/mavlink/gst-plugins-good.git
CMakeLists.txt.orig
deleted
100644 → 0
View file @
fd63568a
cmake_minimum_required(VERSION 3.10)
project(QGroundControl LANGUAGES C CXX)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug;Release;RelWithDebInfo;MinSizeRel;Coverage")
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
include(FeatureSummary)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
add_compile_options(-Wall -Wextra)
endif()
# CMake build type
# Debug Release RelWithDebInfo MinSizeRel Coverage
if (NOT CMAKE_BUILD_TYPE)
# default to release with debug symbols
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type" FORCE)
endif()
<<<<<<< HEAD
if(DEFINED ENV{QT_VERSION})
set(QT_VERSION $ENV{QT_VERSION})
endif()
if(NOT QT_VERSION)
# try Qt 5.9.5 if none specified
set(QT_VERSION "5.9.5")
endif()
if(DEFINED ENV{QT_MKSPEC})
set(QT_MKSPEC $ENV{QT_MKSPEC})
endif()
if(UNIX AND NOT APPLE)
set(LINUX TRUE)
endif()
if(NOT QT_MKSPEC)
if(APPLE)
set(QT_MKSPEC clang_64)
elseif(LINUX)
set(QT_MKSPEC gcc_64)
elseif(WIN32)
set(QT_MKSPEC msvc2017_64)
#set(QT_MKSPEC winrt_x64_msvc2017)
endif()
endif()
=======
>>>>>>> upstream_merge
# Add folder where are supportive functions
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
# Configure Qt5 to get necessary variables
include(Qt5QGCConfiguration)
message(STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
message(STATUS "Qt version: ${QT_VERSION}")
message(STATUS "Qt spec: ${QT_MKSPEC}")
set(COMPANY "Mavlink")
set(COPYRIGHT "Copyright (c) 2018 QGroundControl. All rights reserved.")
set(IDENTIFIER "io.mavlink.qgroundcontrol")
add_definitions(
-DQGC_APPLICATION_NAME="QGCWima"
-DQGC_ORG_NAME="QGCWima.org"
-DQGC_ORG_DOMAIN="org.qgroundcontrol"
)
include(Git)
message(STATUS "QGroundControl version: ${GIT_VERSION}")
#=============================================================================
# ccache
#
option(CCACHE "Use ccache if available" ON)
find_program(CCACHE_PROGRAM ccache)
if (CCACHE AND CCACHE_PROGRAM AND NOT DEFINED ENV{CCACHE_DISABLE})
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
endif()
#=============================================================================
# Compile QML
#
option(COMPILE_QML "Pre-compile QML files using the Qt Quick compiler." FALSE)
add_feature_info(COMPILE_QML COMPILE_QML "Pre-compile QML files using the Qt Quick compiler.")
if(COMPILE_QML)
find_package(Qt5QuickCompiler)
set_package_properties(Qt5QuickCompiler PROPERTIES
DESCRIPTION "Pre-compile QML files using the Qt Quick compiler."
TYPE OPTIONAL
)
endif()
#=============================================================================
# Debug QML
#
option(DEBUG_QML "Build QGroundControl with QML debugging/profiling support." FALSE)
add_feature_info(DEBUG_QML DEBUG_QML "Build QGroundControl with QML debugging/profiling support.")
if(DEBUG_QML)
message(STATUS "To enable the QML debugger/profiler, run with: '-qmljsdebugger=port:1234'")
add_definitions(-DQMLJSDEBUGGER)
add_definitions(-DQT_DECLARATIVE_DEBUG)
add_definitions(-DQT_QML_DEBUG)
endif()
#=============================================================================
# GStreamer
#
find_package(PkgConfig)
pkg_check_modules(GST
gstreamer-1.0>=1.14
gstreamer-video-1.0>=1.14
gstreamer-gl-1.0>=1.14
egl
)
if (GST_FOUND)
include_directories(
${GST_INCLUDE_DIRS}
src/Taisync
src/Microhard
)
add_definitions(
-DQGC_GST_STREAMING
-DQGC_GST_TAISYNC_ENABLED
-DQGC_GST_MICROHARD_ENABLED
)
endif()
add_definitions(
-DQGC_ENABLE_MAVLINK_INSPECTOR
)
#=============================================================================
# Qt5
#
find_package(Qt5 ${QT_VERSION}
COMPONENTS
Bluetooth
Charts
Concurrent
Core
Location
Multimedia
Network
Positioning
Quick
QuickControls2
QuickWidgets
OpenGL
Sql
Svg
Test
TextToSpeech
Widgets
Xml
REQUIRED
HINTS
${QT_LIBRARY_HINTS}
)
if(NOT QT_MKSPEC MATCHES "winrt")
find_package(Qt5 ${QT_VERSION}
COMPONENTS
SerialPort
REQUIRED
HINTS
${QT_LIBRARY_HINTS}
)
endif()
# Sets the default flags for compilation and linking.
include(CompileOptions)
include_directories(
libs/eigen
libs/mavlink/include/mavlink/v2.0
libs/mavlink/include/mavlink/v2.0/ardupilotmega
libs/mavlink/include/mavlink/v2.0/common
libs/shapelib
)
add_subdirectory(libs)
add_subdirectory(src)
set(QGC_RESOURCES
qgcresources.qrc
qgroundcontrol.qrc
qgcimages.qrc
src/FirmwarePlugin/APM/APMResources.qrc
src/FirmwarePlugin/PX4/PX4Resources.qrc
src/Airmap/airmap.qrc
src/Airmap/dummy/airmap_dummy.qrc
)
if(BUILD_TESTING)
list(APPEND QGC_RESOURCES
UnitTest.qrc
)
endif()
if(ANDROID)
add_library(QGroundControl SHARED ${QGC_RESOURCES})
else()
add_executable(QGroundControl ${QGC_RESOURCES})
endif()
target_link_libraries(QGroundControl PRIVATE qgc)
if(BUILD_TESTING)
target_link_libraries(QGroundControl PRIVATE Qt5::Test)
endif()
if(NOT QT_MKSPEC MATCHES "winrt")
target_link_libraries(QGroundControl
PUBLIC
Qt5::SerialPort
)
endif()
include(QGCDeploy)
UnitTest.qrc.orig
deleted
100644 → 0
View file @
fd63568a
<RCC>
<qresource prefix="/unittest">
<<<<<<< HEAD
<file alias="SectionTest.plan">src/MissionManager/UnitTest/SectionTest.plan</file>
<file alias="MavCmdInfoCommon.json">src/MissionManager/UnitTest/MavCmdInfoCommon.json</file>
<file alias="MavCmdInfoFixedWing.json">src/MissionManager/UnitTest/MavCmdInfoFixedWing.json</file>
<file alias="MavCmdInfoMultiRotor.json">src/MissionManager/UnitTest/MavCmdInfoMultiRotor.json</file>
<file alias="MavCmdInfoRover.json">src/MissionManager/UnitTest/MavCmdInfoRover.json</file>
<file alias="MavCmdInfoSub.json">src/MissionManager/UnitTest/MavCmdInfoSub.json</file>
<file alias="MavCmdInfoVTOL.json">src/MissionManager/UnitTest/MavCmdInfoVTOL.json</file>
<file alias="MissionPlanner.waypoints">src/MissionManager/UnitTest/MissionPlanner.waypoints</file>
<file alias="OldFileFormat.mission">src/MissionManager/UnitTest/OldFileFormat.mission</file>
<file alias="PolygonAreaTest.kml">src/MissionManager/UnitTest/PolygonAreaTest.kml</file>
<file alias="PolygonGood.kml">src/MissionManager/UnitTest/PolygonGood.kml</file>
<file alias="PolygonMissingNode.kml">src/MissionManager/UnitTest/PolygonMissingNode.kml</file>
<file alias="PolygonBadXml.kml">src/MissionManager/UnitTest/PolygonBadXml.kml</file>
<file alias="PolygonBadCoordinatesNode.kml">src/MissionManager/UnitTest/PolygonBadCoordinatesNode.kml</file>
=======
<file alias="SectionTest.plan">src/MissionManager/UnitTest/SectionTest.plan</file>
<file alias="UT-MavCmdInfoCommon.json">src/MissionManager/UnitTest/UT-MavCmdInfoCommon.json</file>
<file alias="UT-MavCmdInfoFixedWing.json">src/MissionManager/UnitTest/UT-MavCmdInfoFixedWing.json</file>
<file alias="UT-MavCmdInfoMultiRotor.json">src/MissionManager/UnitTest/UT-MavCmdInfoMultiRotor.json</file>
<file alias="UT-MavCmdInfoRover.json">src/MissionManager/UnitTest/UT-MavCmdInfoRover.json</file>
<file alias="UT-MavCmdInfoSub.json">src/MissionManager/UnitTest/UT-MavCmdInfoSub.json</file>
<file alias="UT-MavCmdInfoVTOL.json">src/MissionManager/UnitTest/UT-MavCmdInfoVTOL.json</file>
<file alias="MissionPlanner.waypoints">src/MissionManager/UnitTest/MissionPlanner.waypoints</file>
<file alias="OldFileFormat.mission">src/MissionManager/UnitTest/OldFileFormat.mission</file>
<file alias="PolygonAreaTest.kml">src/MissionManager/UnitTest/PolygonAreaTest.kml</file>
<file alias="PolygonGood.kml">src/MissionManager/UnitTest/PolygonGood.kml</file>
<file alias="PolygonMissingNode.kml">src/MissionManager/UnitTest/PolygonMissingNode.kml</file>
<file alias="PolygonBadXml.kml">src/MissionManager/UnitTest/PolygonBadXml.kml</file>
<file alias="PolygonBadCoordinatesNode.kml">src/MissionManager/UnitTest/PolygonBadCoordinatesNode.kml</file>
<file alias="MockLinkOptionsDlg.qml">src/comm/MockLinkOptionsDlg.qml</file>
>>>>>>> upstream_merge
</qresource>
<qresource prefix="/"/>
</RCC>
backup-Jenkinsfile.orig
deleted
100644 → 0
View file @
fd63568a
pipeline {
agent none
stages {
stage('build') {
parallel {
stage('Android 32 bit Release') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CCACHE_CPP2 = '1'
QGC_CONFIG = 'release'
QMAKE_VER = "5.12.5/android_armv7/bin/qmake"
QT_MKSPEC = "android-clang"
BITNESS=32
}
agent {
docker {
image 'mavlink/qgc-build-android:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
sh 'cd build; make -j`nproc --all`'
sh 'ccache -s'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('Android 64 bit Release') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CCACHE_CPP2 = '1'
QGC_CONFIG = 'release'
QMAKE_VER = "5.12.5/android_arm64_v8a/bin/qmake"
QT_MKSPEC = "android-clang"
BITNESS=64
}
agent {
docker {
image 'mavlink/qgc-build-android_arm64_v8a:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
//sh 'cd build; make -j`nproc --all`' // FIXME
sh 'ccache -s'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('Linux Debug') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'debug'
QMAKE_VER = "5.12.5/gcc_64/bin/qmake"
}
agent {
docker {
image 'mavlink/qgc-build-linux:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
sh 'cd build; make -j`nproc --all`'
sh 'ccache -s'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('Linux Debug (cmake)') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CMAKE_BUILD_TYPE = 'Debug'
QT_VERSION = "5.12.5"
QT_MKSPEC = "gcc_64"
}
agent {
docker {
image 'mavlink/qgc-build-linux:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'make distclean'
sh 'make submodulesclean'
sh 'make linux'
//sh 'make linux check' // TODO: needs Xvfb or similar
sh 'ccache -s'
sh 'make distclean'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('Linux Release') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'release'
QMAKE_VER = "5.12.5/gcc_64/bin/qmake"
}
agent {
docker {
image 'mavlink/qgc-build-linux:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
withCredentials([file(credentialsId: 'QGC_Airmap_api_key', variable: 'AIRMAP_API_HEADER')]) {
sh 'cp $AIRMAP_API_HEADER ${WORKSPACE}/src/Airmap/Airmap_api_key.h'
}
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
//sh 'cd build; make -j`nproc --all`' // TODO: increase slave memory
sh 'cd build; make'
sh 'ccache -s'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('Linux Release (cmake)') {
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CMAKE_BUILD_TYPE = 'Release'
QT_VERSION = "5.12.5"
QT_MKSPEC = "gcc_64"
}
agent {
docker {
image 'mavlink/qgc-build-linux:2019-11-12'
args '-v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
}
}
steps {
sh 'export'
sh 'ccache -z'
sh 'make distclean'
sh 'make submodulesclean'
sh 'make linux'
sh 'ccache -s'
sh 'make distclean'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('OSX Debug') {
agent {
node {
label 'mac'
}
}
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
QGC_CONFIG = 'debug'
QMAKE_VER = "5.11.0/clang_64/bin/qmake"
}
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
sh 'cd build; make -j`sysctl -n hw.ncpu`'
sh 'ccache -s'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('OSX Debug (cmake)') {
agent {
node {
label 'mac'
}
}
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CCACHE_CPP2 = '1'
CMAKE_BUILD_TYPE = 'Debug'
QT_VERSION = "5.11.0"
QT_MKSPEC = "clang_64"
}
steps {
sh 'export'
sh 'ccache -z'
sh 'make distclean'
sh 'make submodulesclean'
sh 'make mac'
sh 'ccache -s'
sh 'make distclean'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('OSX Release') {
agent {
node {
label 'mac'
}
}
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CCACHE_CPP2 = '1'
QGC_CONFIG = 'installer'
QMAKE_VER = "5.11.0/clang_64/bin/qmake"
}
stages {
stage('Clean Checkout') {
steps {
sh 'export'
sh 'ccache -z'
sh 'git submodule deinit -f .'
sh 'git clean -ff -x -d .'
sh 'git submodule update --init --recursive --force'
}
}
stage('Add Airmap API key') {
steps {
withCredentials([file(credentialsId: 'QGC_Airmap_api_key', variable: 'AIRMAP_API_HEADER')]) {
sh 'cp $AIRMAP_API_HEADER ${WORKSPACE}/src/Airmap/Airmap_api_key.h'
}
}
when {
anyOf {
branch 'master';
branch 'Stable_*'
}
}
}
stage('Build OSX Release') {
steps {
sh 'mkdir build; cd build; ${QT_PATH}/${QMAKE_VER} -r ${WORKSPACE}/qgroundcontrol.pro CONFIG+=${QGC_CONFIG} CONFIG+=WarningsAsErrorsOn'
sh 'cd build; make -j`sysctl -n hw.ncpu`'
archiveArtifacts(artifacts: 'build/**/*.dmg', fingerprint: true)
sh 'ccache -s'
}
}
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
stage('OSX Release (cmake)') {
agent {
node {
label 'mac'
}
}
environment {
CCACHE_BASEDIR = "${env.WORKSPACE}"
CCACHE_CPP2 = '1'
CMAKE_BUILD_TYPE = 'Release'
QT_VERSION = "5.11.0"
QT_MKSPEC = "clang_64"
}
steps {
sh 'export'
sh 'ccache -z'
sh 'make distclean'
sh 'make submodulesclean'
sh 'make mac'
sh 'ccache -s'
sh 'make distclean'
}
post {
cleanup {
sh 'git clean -ff -x -d .'
}
}
}
} // parallel
} // stage('build')
} // stages
environment {
CCACHE_DIR = '/tmp/ccache'
QT_FATAL_WARNINGS = '1'
}
options {
buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
timeout(time: 60, unit: 'MINUTES')
}
}
libs/CMakeLists.txt.orig
deleted
100644 → 0
View file @
fd63568a
add_subdirectory(qtandroidserialport)
add_subdirectory(shapelib)
<<<<<<< HEAD
add_subdirectory(clipper)
add_subdirectory(snake)
=======
if (GST_FOUND)
add_subdirectory(qmlglsink)
endif()
>>>>>>> upstream_merge
libs/Frameworks/SDL2.framework/Versions/A/Headers/SDL.h.orig
deleted
100644 → 0
View file @
fd63568a
/*
Simple DirectMedia Layer
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
/**
* \file SDL.h
*
* Main include header for the SDL library
*/
#ifndef SDL_h_
#define SDL_h_
#include "SDL_main.h"
#include "SDL_stdinc.h"
#include "SDL_assert.h"
#include "SDL_atomic.h"
#include "SDL_audio.h"
#include "SDL_clipboard.h"
#include "SDL_cpuinfo.h"
#include "SDL_endian.h"
#include "SDL_error.h"
#include "SDL_events.h"
#include "SDL_filesystem.h"
#include "SDL_gamecontroller.h"
#include "SDL_haptic.h"
#include "SDL_hints.h"
#include "SDL_joystick.h"
#include "SDL_loadso.h"
#include "SDL_log.h"
#include "SDL_messagebox.h"
#include "SDL_mutex.h"
#include "SDL_power.h"
#include "SDL_render.h"