Minor style updates

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

diff --git a/src/qml/BrowserWindow.qml b/src/qml/BrowserWindow.qml
index d352c925e00f5d6058158b71df200ebb0469f5d1..bedf57af3922532e259813e8a513d12ce34c0cd6 100644 (file)
--- 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 5b415144c2d1aaeed53ba80417f0981ab814d5ed..23cca7e9670507fbdc9e4cf3e45dec4fd906ba88 100644 (file)
--- 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 7236c886306a33d6cc2ee4c1fa618aedfe65b6ce..bbe687f1d71c22edb701986cbd407115a63f4b43 100644 (file)
--- 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 66aec7bc20ba9e2eb8ab98ab6050d0da98765eeb..e83c2e4206bc0bade89bc1b691ad30b9ac6fb15b 100644 (file)
--- 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 (file)
index db45ff8..0000000
Binary files a/src/qml/assets/icons/done.png and /dev/null differ

diff --git a/src/resources.qrc b/src/resources.qrc
index e6bf71e0722950397017400ccc0b1452d6e1c2c4..5d375e18d822de47d55eefcf4cb727d724bbe378 100644 (file)
--- 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 d97d37bbd7029c8d9351d07503318f18f1eb3b38..d0088dab1efbf5312d57994d749bbf99b1064581 100644 (file)
--- 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