From 253c962c74c9fd0b069f497a3ae58403c33a7870 Mon Sep 17 00:00:00 2001 From: dorian Date: Fri, 20 Mar 2020 17:14:23 +0100 Subject: [PATCH] some changes for IOS enrollment --- blueROCK.pro | 2 ++ resources/qml/Components/FancyBusyIndicator.qml | 2 +- resources/qml/Widgets/ResultWidget.qml | 4 ++-- resources/qml/main.qml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/blueROCK.pro b/blueROCK.pro index 5477919..7ee25c1 100644 --- a/blueROCK.pro +++ b/blueROCK.pro @@ -1,6 +1,8 @@ QT += quick qml quickcontrols2 purchasing widgets CONFIG += c++11 +VERSION = 0.04 + android { QT += androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources diff --git a/resources/qml/Components/FancyBusyIndicator.qml b/resources/qml/Components/FancyBusyIndicator.qml index b555bf1..569e0e1 100644 --- a/resources/qml/Components/FancyBusyIndicator.qml +++ b/resources/qml/Components/FancyBusyIndicator.qml @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Controls 2.4 -import QtQuick.Controls.Styles 1.2 +//import QtQuick.Controls.Styles 1.4 BusyIndicator { id: control diff --git a/resources/qml/Widgets/ResultWidget.qml b/resources/qml/Widgets/ResultWidget.qml index c412350..4139e81 100644 --- a/resources/qml/Widgets/ResultWidget.qml +++ b/resources/qml/Widgets/ResultWidget.qml @@ -21,9 +21,9 @@ import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import QtQuick.Controls.Material 2.3 - import QtLocation 5.13 + //import QtLocation 5.13 - import QtPurchasing 1.13 + import QtPurchasing 1.12 import "../Components" diff --git a/resources/qml/main.qml b/resources/qml/main.qml index d6c986d..fb2902a 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -20,7 +20,7 @@ import QtQuick 2.9 import QtQuick.Window 2.2 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.3 -import QtPurchasing 1.13 +import QtPurchasing 1.12 import com.itsblue.digitalRockRanking 1.0