Minor style updates

This patch enables qquick compiler support and downgrades some
import versions to make it possible to compile with Qt 5.5.

7 files changed, 19 insertions, 13 deletions

diff --git a/src/qml/BrowserWindow.qml b/src/qml/BrowserWindow.qml
index d352c92..bedf57a 100644
--- a/src/qml/BrowserWindow.qml
+++ b/src/qml/BrowserWindow.qml
@@ -191,7 +191,7 @@ Item {
                         anchors.centerIn: parent
                         text: tabs.count
                         color: "white"
-                        font.family: "Sans"
+                        font.family: defaultFontFamily
                         font.pointSize: 20
                     }
                 }
@@ -207,7 +207,13 @@ Item {
             UIButton {
                 id:doneButton
                 color: uiSeparatorColor
-                source: "qrc:///done"
+                Text {
+                    color: "white"
+                    anchors.centerIn: parent
+                    text: "Done"
+                    font.family: defaultFontFamily
+                    font.pointSize: 28
+                }
                 implicitWidth: 120
                 onClicked: {
                     tabs.viewState = "page"
@@ -305,6 +311,7 @@ Item {
 
         property var certErrors: []
         property var currentError: null
+        visible: certErrors.length > 0
         icon: StandardIcon.Warning
         standardButtons: StandardButton.No | StandardButton.Yes
         title: "Server's certificate not trusted"
@@ -334,7 +341,6 @@ Item {
         }
         function presentError(){
             informativeText = "SSL error from URL\n\n" + currentError.url + "\n\n" + currentError.description + "\n"
-            visible = certErrors.length > 0
         }
     }
 }
diff --git a/src/qml/NavigationBar.qml b/src/qml/NavigationBar.qml
index 5b41514..23cca7e 100644
--- a/src/qml/NavigationBar.qml
+++ b/src/qml/NavigationBar.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
-import QtQuick.Controls 1.5
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.2
 
 import "assets"
 
@@ -112,7 +112,7 @@ ToolBar {
                 }
                 padding {
                     left: 15
-                    right: 20 + reloadButton.width
+                    right: reloadButton.width
                 }
             }
             onAccepted: {
diff --git a/src/qml/PageView.qml b/src/qml/PageView.qml
index 7236c88..bbe687f 100644
--- a/src/qml/PageView.qml
+++ b/src/qml/PageView.qml
@@ -38,9 +38,9 @@
 import QtQuick 2.5
 import QtWebEngine 1.3
 import QtWebEngine.experimental 1.0
-import QtQuick.Controls 1.5
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.2
 import QtGraphicalEffects 1.0
 
 import io.qt.browser 1.0
@@ -317,7 +317,7 @@ Rectangle {
             property real visibility: 0.0
             property bool isCurrentItem: PathView.isCurrentItem
 
-            visible: visibility != 0.0
+            visible: PathView.onPath && visibility != 0.0
             state: isCurrentItem ? root.viewState : "list"
 
             Behavior on scale {
@@ -378,7 +378,7 @@ Rectangle {
                     return 0.25
                 }
 
-                return 0.0001
+                return 0.25
             }
             z: PathView.itemZ
 
diff --git a/src/qml/assets/UIButton.qml b/src/qml/assets/UIButton.qml
index 66aec7b..e83c2e4 100644
--- a/src/qml/assets/UIButton.qml
+++ b/src/qml/assets/UIButton.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
-import QtQuick.Controls 1.5
+import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import QtQuick.Layouts 1.3
+import QtQuick.Layouts 1.2
 
 
 ToolButton {
diff --git a/src/qml/assets/icons/done.png b/src/qml/assets/icons/done.png
deleted file mode 100644
index db45ff8..0000000
--- a/src/qml/assets/icons/done.png
+++ /dev/null
diff --git a/src/resources.qrc b/src/resources.qrc
index e6bf71e..5d375e1 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -23,6 +23,5 @@
         <file alias="up">qml/assets/icons/Btn_Up.png</file>
         <file alias="search">qml/assets/icons/Btn_Search.png</file>
         <file alias="error">qml/assets/icons/Error_Icon.png</file>
-        <file alias="done">qml/assets/icons/done.png</file>
     </qresource>
 </RCC>
diff --git a/src/src.pro b/src/src.pro
index d97d37b..d0088da 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -28,5 +28,6 @@ QT += qml quick webengine
 QT_PRIVATE += quick-private gui-private core-private
 
 RESOURCES += resources.qrc
+CONFIG += qtquickcompiler
 
 !cross_compile: DEFINES += HOST_BUILD