Work with qt 5.7 again.

The popup template results in crashes with qt 5.7, so we just import the
control as workaround.

3 files changed, 7 insertions, 6 deletions

diff --git a/framework/qml/Button.qml b/framework/qml/Button.qml
index 44e36e34..4f3dd776 100644
--- a/framework/qml/Button.qml
+++ b/framework/qml/Button.qml
@@ -16,8 +16,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
 import org.kube.framework 1.0
 
 T.Button {
diff --git a/framework/qml/Popup.qml b/framework/qml/Popup.qml
index 6a74fd12..084913e7 100644
--- a/framework/qml/Popup.qml
+++ b/framework/qml/Popup.qml
@@ -16,8 +16,9 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.7
+//FIXME This should really be QtQuick.Templates, but that is crashing with qt 5.7, so we'll have to wait for a bit.
+import QtQuick.Controls 2.0 as T
 import org.kube.framework 1.0
 
 T.Popup {
diff --git a/framework/qml/PositiveButton.qml b/framework/qml/PositiveButton.qml
index 8265a71a..534d48cd 100644
--- a/framework/qml/PositiveButton.qml
+++ b/framework/qml/PositiveButton.qml
@@ -16,8 +16,8 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
 import org.kube.framework 1.0
 
 T.Button {