diff --git a/Desktop/components/JASP/Theme/DarkTheme.qml b/Desktop/components/JASP/Theme/DarkTheme.qml
index e661c2fb73..7ece2edd16 100644
--- a/Desktop/components/JASP/Theme/DarkTheme.qml
+++ b/Desktop/components/JASP/Theme/DarkTheme.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.12
+import QtQuick
Theme
{
diff --git a/Desktop/components/JASP/Widgets/FileMenu/OSF.qml b/Desktop/components/JASP/Widgets/FileMenu/OSF.qml
index 7d1a45722a..38c9241e67 100644
--- a/Desktop/components/JASP/Widgets/FileMenu/OSF.qml
+++ b/Desktop/components/JASP/Widgets/FileMenu/OSF.qml
@@ -21,7 +21,6 @@ import QtQuick.Controls as QtC
import JASP.Controls
import JASP.Widgets
-//import QtQuick.Layouts 1.3
Item
{
diff --git a/Desktop/qquick/datasetview.cpp b/Desktop/qquick/datasetview.cpp
index 74557d8c84..f92aac5546 100644
--- a/Desktop/qquick/datasetview.cpp
+++ b/Desktop/qquick/datasetview.cpp
@@ -666,7 +666,7 @@ QQuickItem * DataSetView::createTextItem(int row, int col)
if(_itemDelegate == nullptr)
{
_itemDelegate = new QQmlComponent(qmlEngine(this));
- _itemDelegate->setData("import QtQuick 2.9\nText { text: itemText; color: itemActive ? 'black' : 'grey'; verticalAlignment: Text.AlignVCenter; }", QUrl());
+ _itemDelegate->setData("import QtQuick \nText { text: itemText; color: itemActive ? 'black' : 'grey'; verticalAlignment: Text.AlignVCenter; }", QUrl());
emit itemDelegateChanged();
}
@@ -783,7 +783,7 @@ QQuickItem * DataSetView::createRowNumber(int row)
if(_rowNumberDelegate == nullptr)
{
_rowNumberDelegate = new QQmlComponent(qmlEngine(this));
- _rowNumberDelegate->setData("import QtQuick 2.9\nItem {\n"
+ _rowNumberDelegate->setData("import QtQuick \nItem {\n"
"Rectangle { color: jaspTheme.uiBackground; anchors.fill: parent }\n"
"Text { text: rowNumber; anchors.centerIn: parent; color: jaspTheme.textEnabled; }\n"
"}", QUrl());
@@ -873,7 +873,7 @@ QQuickItem * DataSetView::createColumnHeader(int col)
if(_columnHeaderDelegate == nullptr)
{
_columnHeaderDelegate = new QQmlComponent(qmlEngine(this));
- _columnHeaderDelegate->setData("import QtQuick 2.9\nItem {\n"
+ _columnHeaderDelegate->setData("import QtQuick \nItem {\n"
"Rectangle { color: jaspTheme.uiBackground; anchors.fill: parent }\n"
"Text { text: headerText; anchors.centerIn: parent; color: jaspTheme.textEnabled; }\n"
"}", QUrl());
@@ -977,7 +977,7 @@ QQuickItem * DataSetView::createleftTopCorner()
if(_leftTopCornerDelegate == nullptr)
{
_leftTopCornerDelegate = new QQmlComponent(qmlEngine(this));
- _leftTopCornerDelegate->setData("import QtQuick 2.9\nItem {}", QUrl());
+ _leftTopCornerDelegate->setData("import QtQuick \nItem {}", QUrl());
}
QQmlIncubator localIncubator(QQmlIncubator::Synchronous);
@@ -1065,7 +1065,7 @@ void DataSetView::positionEditItem(int row, int col)
_editDelegate = new QQmlComponent(qmlEngine(this));
_editDelegate->setData(
-"import QtQuick 2.9" "\n"
+"import QtQuick" "\n"
"TextInput { text: itemText; color: itemActive ? 'black' : 'grey'; verticalAlignment: Text.AlignVCenter; \n"
" onEditingFinished: dataview.commitEdit(rowIndex, columnIndex, text); " "\n"
"}", QUrl());
diff --git a/Docs/development/jasp-adding-module.md b/Docs/development/jasp-adding-module.md
index c60b95f028..be914ade06 100644
--- a/Docs/development/jasp-adding-module.md
+++ b/Docs/development/jasp-adding-module.md
@@ -65,8 +65,8 @@ Click below to see an example. In the next lines, we'll dissect it to understand
Example
```qml
-import QtQuick 2.12
-import JASP.Module 1.0
+import QtQuick
+import JASP.Module
Description
{
diff --git a/Docs/development/jasp-qml-guide.md b/Docs/development/jasp-qml-guide.md
index 2b3d6933f5..9441c43829 100644
--- a/Docs/development/jasp-qml-guide.md
+++ b/Docs/development/jasp-qml-guide.md
@@ -897,10 +897,10 @@ We can begin actual work on the QML file, first we have to tell the engine where
Code
```qml
- import QtQuick 2.11
- import QtQuick.Layouts 1.3
- import JASP.Controls 1.0
- import JASP.Widgets 1.0
+ import QtQuick
+ import QtQuick.Layouts
+ import JASP.Controls
+ import JASP.Widgets
```
If you want to import QML components from another jasp module, you can!
@@ -914,11 +914,11 @@ In the future, we will require using qualified namespace for the import statemen
Code
```qml
- import QtQuick 2.11
- import QtQuick.Layouts 1.3
- import JASP.Controls 1.0 as JC
- import JASP.Theme 1.0 as JT
- import JASP.Widgets 1.0 as JW
+ import QtQuick
+ import QtQuick.Layouts
+ import JASP.Controls as JC
+ import JASP.Theme as JT
+ import JASP.Widgets as JW
```
@@ -931,10 +931,10 @@ At this point we add a `Form` which will hold all our input components:
Code
```qml
- import QtQuick 2.11
- import QtQuick.Layouts 1.3
- import JASP.Controls 1.0
- import JASP.Widgets 1.0
+ import QtQuick
+ import QtQuick.Layouts
+ import JASP.Controls
+ import JASP.Widgets
Form
{
@@ -951,10 +951,10 @@ It's now a matter of mixing and matching the previously shown components to crea
Code
```qml
- import QtQuick 2.11
- import QtQuick.Layouts 1.3
- import JASP.Controls 1.0
- import JASP.Widgets 1.0
+ import QtQuick
+ import QtQuick.Layouts
+ import JASP.Controls
+ import JASP.Widgets
Form
{
diff --git a/Docs/development/jasp-upgrade-qml.md b/Docs/development/jasp-upgrade-qml.md
index d4e9a50759..deb570b6fb 100644
--- a/Docs/development/jasp-upgrade-qml.md
+++ b/Docs/development/jasp-upgrade-qml.md
@@ -16,8 +16,8 @@ If you are writing an `Upgrade` for an analysis as it was in JASP before version
Just having a `functionName` and the two `version`s would do very little and the minimal sensible change you could make is adding `newFunctionName` with a new name for the analysis.
A very short example of that would be fixing the typo that someone could have made in 0.9 of a fictional module:
```qml
-import QtQuick 2.12
-import JASP.Module 1.0
+import QtQuick
+import JASP.Module
Upgrades
{
@@ -57,8 +57,8 @@ Something important to keep in mind is that a list of these `Changes` will be ap
For all following examples the full QML file would look something like:
```qml
-import QtQuick 2.12
-import JASP.Module 1.0
+import QtQuick
+import JASP.Module
Upgrades
{