diff --git a/Docs/development/jasp-qml-style-example.qml b/Docs/development/jasp-qml-style-example.qml index 1120519173..0c936f231b 100644 --- a/Docs/development/jasp-qml-style-example.qml +++ b/Docs/development/jasp-qml-style-example.qml @@ -5,7 +5,6 @@ import QtQuick import QtQuick.Layouts import JASP.Controls -import JASP.Widgets //Not exactly a style thing but every QML form should have Form as it's root: Form diff --git a/QMLComponents/components/JASP/Controls/Form.qml b/QMLComponents/components/JASP/Controls/Form.qml index 15d9e770a2..22be130d29 100644 --- a/QMLComponents/components/JASP/Controls/Form.qml +++ b/QMLComponents/components/JASP/Controls/Form.qml @@ -198,7 +198,7 @@ AnalysisForm { id: popup - parent: Overlay.overlay + parent: QtC.Overlay.overlay anchors.centerIn: parent width: 400 * jaspTheme.uiScale diff --git a/QMLComponents/components/JASP/Controls/HelpButton.qml b/QMLComponents/components/JASP/Controls/HelpButton.qml index 59acd29892..de7a5ef96b 100644 --- a/QMLComponents/components/JASP/Controls/HelpButton.qml +++ b/QMLComponents/components/JASP/Controls/HelpButton.qml @@ -16,9 +16,9 @@ // . // -import QtQuick 2.8 -import QtQuick.Layouts 1.3 -import JASP.Controls 1.0 +import QtQuick +import QtQuick.Layouts +import JASP.Controls ///Simple help button that shows you the 'helpPage'. Only works when run from a Form. MenuButton diff --git a/QMLComponents/components/JASP/Controls/Slider.qml b/QMLComponents/components/JASP/Controls/Slider.qml index 9b9d57bbed..3ebda78470 100644 --- a/QMLComponents/components/JASP/Controls/Slider.qml +++ b/QMLComponents/components/JASP/Controls/Slider.qml @@ -1,8 +1,8 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.4 -import JASP.Controls 1.0 as JC //He returns! -import QtQuick.Layouts 1.3 -import JASP 1.0 +import QtQuick +import QtQuick.Controls +import JASP.Controls as JC //He returns! +import QtQuick.Layouts +import JASP SliderBase {