From dd50acdf84c0654a6846c74d2a3f87ceb3c8322a Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 25 Jun 2019 09:24:16 -0300 Subject: [PATCH] Revert ParameterEditor to QtQuick.Controls 1.x --- custom-example/src/CustomPlugin.cc | 2 +- src/QmlControls/ParameterEditor.qml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/custom-example/src/CustomPlugin.cc b/custom-example/src/CustomPlugin.cc index aa005b10b..7d7063141 100644 --- a/custom-example/src/CustomPlugin.cc +++ b/custom-example/src/CustomPlugin.cc @@ -6,7 +6,7 @@ * COPYING.md in the root of the source code directory. * * @brief Custom QGCCorePlugin Implementation - * @author Gus Grubba + * @author Gus Grubba */ #include diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 71de4c74e..68ab12633 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -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 -- 2.22.0