Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1ec45440
Unverified
Commit
1ec45440
authored
Jun 25, 2019
by
Gus Grubba
Committed by
GitHub
Jun 25, 2019
Browse files
Merge pull request #7548 from mavlink/revertQtQuickControl2ForParameters
Revert ParameterEditor to QtQuick.Controls 1.x
parents
53461a9b
dd50acdf
Changes
2
Hide whitespace changes
Inline
Side-by-side
custom-example/src/CustomPlugin.cc
View file @
1ec45440
...
...
@@ -6,7 +6,7 @@
* COPYING.md in the root of the source code directory.
*
* @brief Custom QGCCorePlugin Implementation
* @author Gus Grubba <gus@
custom
.com>
* @author Gus Grubba <gus@
auterion
.com>
*/
#include
<QtQml>
...
...
src/QmlControls/ParameterEditor.qml
View file @
1ec45440
...
...
@@ -7,10 +7,10 @@
*
****************************************************************************/
import
QtQuick
2.
11
import
QtQuick
.
Controls
2.4
import
QtQuick
2.
3
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Dialogs
1.2
import
QtQuick
.
Layouts
1.
11
import
QtQuick
.
Layouts
1.
2
import
QGroundControl
1.0
import
QGroundControl
.
Controls
1.0
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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