summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf1
-rw-r--r--examples/quick/controls/basiclayouts/basiclayouts.pro2
-rw-r--r--examples/quick/controls/calendar/qml/main.qml7
-rw-r--r--examples/quick/controls/gallery/gallery.pro2
-rw-r--r--examples/quick/controls/splitview/splitview.pro2
-rw-r--r--examples/quick/controls/tableview/tableview.pro2
-rw-r--r--examples/quick/controls/texteditor/texteditor.pro2
-rw-r--r--examples/quick/controls/touch/touch.pro2
-rw-r--r--examples/quick/dialogs/systemdialogs/systemdialogs.pro2
-rw-r--r--src/controls/Private/private.pri2
-rw-r--r--src/controls/Styles/Base/CalendarStyle.qml12
-rw-r--r--src/controls/Styles/styles.pri52
-rw-r--r--tests/auto/activeFocusOnTab/activeFocusOnTab.pro2
-rw-r--r--tests/auto/controls/controls.pro2
-rw-r--r--tests/auto/testplugin/testplugin.pro2
-rw-r--r--tests/manual/combobox/combobox.pro2
16 files changed, 52 insertions, 44 deletions
diff --git a/.qmake.conf b/.qmake.conf
index e28797de..997c1b46 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,4 @@
load(qt_build_config)
+android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop
MODULE_VERSION = 5.4.0
diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro
index fbb5f0c1..54e60992 100644
--- a/examples/quick/controls/basiclayouts/basiclayouts.pro
+++ b/examples/quick/controls/basiclayouts/basiclayouts.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = basiclayouts
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/controls/calendar/qml/main.qml b/examples/quick/controls/calendar/qml/main.qml
index feb21852..579937ea 100644
--- a/examples/quick/controls/calendar/qml/main.qml
+++ b/examples/quick/controls/calendar/qml/main.qml
@@ -40,6 +40,7 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
+import QtQuick.Controls.Private 1.0
import QtQuick.Controls.Styles 1.1
import org.qtproject.examples.calendar 1.0
@@ -53,6 +54,10 @@ ApplicationWindow {
title: "Calendar Example"
+ SystemPalette {
+ id: systemPalette
+ }
+
SqlEventModel {
id: eventModel
}
@@ -163,7 +168,7 @@ ApplicationWindow {
style: CalendarStyle {
dayDelegate: Item {
readonly property color sameMonthDateTextColor: "#444"
- readonly property color selectedDateColor: Qt.platform.os === "osx" ? "#3778d0" : __syspal.highlight
+ readonly property color selectedDateColor: Qt.platform.os === "osx" ? "#3778d0" : systemPalette.highlight
readonly property color selectedDateTextColor: "white"
readonly property color differentMonthDateTextColor: "#bbb"
readonly property color invalidDatecolor: "#dddddd"
diff --git a/examples/quick/controls/gallery/gallery.pro b/examples/quick/controls/gallery/gallery.pro
index d7328918..e10e9763 100644
--- a/examples/quick/controls/gallery/gallery.pro
+++ b/examples/quick/controls/gallery/gallery.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = gallery
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/controls/splitview/splitview.pro b/examples/quick/controls/splitview/splitview.pro
index 79f1f7d5..40adf3d1 100644
--- a/examples/quick/controls/splitview/splitview.pro
+++ b/examples/quick/controls/splitview/splitview.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = splitview
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/controls/tableview/tableview.pro b/examples/quick/controls/tableview/tableview.pro
index 77520ea5..c982ac20 100644
--- a/examples/quick/controls/tableview/tableview.pro
+++ b/examples/quick/controls/tableview/tableview.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = tableview
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/controls/texteditor/texteditor.pro b/examples/quick/controls/texteditor/texteditor.pro
index b6a908b4..ec9d8d86 100644
--- a/examples/quick/controls/texteditor/texteditor.pro
+++ b/examples/quick/controls/texteditor/texteditor.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = texteditor
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/controls/touch/touch.pro b/examples/quick/controls/touch/touch.pro
index e230797f..63902f81 100644
--- a/examples/quick/controls/touch/touch.pro
+++ b/examples/quick/controls/touch/touch.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = touch
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
include(src/src.pri)
include(../shared/shared.pri)
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
index d0489cd2..128bb1b5 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
@@ -1,5 +1,5 @@
QT += qml quick
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
QT += quick qml
SOURCES += main.cpp
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri
index 19c02018..ac2c5238 100644
--- a/src/controls/Private/private.pri
+++ b/src/controls/Private/private.pri
@@ -22,7 +22,7 @@ SOURCES += \
$$PWD/qquickabstractstyle.cpp
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) {
+!no_desktop {
QT += widgets
HEADERS += $$PWD/qquickstyleitem_p.h
SOURCES += $$PWD/qquickstyleitem.cpp
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml
index c8a373b6..bb1c6970 100644
--- a/src/controls/Styles/Base/CalendarStyle.qml
+++ b/src/controls/Styles/Base/CalendarStyle.qml
@@ -172,8 +172,8 @@ Style {
*/
property Component background: Rectangle {
color: "#fff"
- implicitWidth: 250
- implicitHeight: 250
+ implicitWidth: Math.max(250, Math.round(TextSingleton.implicitHeight * 14))
+ implicitHeight: Math.max(250, Math.round(TextSingleton.implicitHeight * 14))
}
/*!
@@ -189,7 +189,7 @@ Style {
\endtable
*/
property Component navigationBar: Rectangle {
- height: 41
+ height: Math.round(TextSingleton.implicitHeight * 2.73)
color: "#f9f9f9"
Rectangle {
@@ -218,7 +218,7 @@ Style {
text: styleData.title
elide: Text.ElideRight
horizontalAlignment: Text.AlignHCenter
- font.pointSize: 14
+ font.pixelSize: TextSingleton.implicitHeight * 1.25
anchors.verticalCenter: parent.verticalCenter
anchors.left: previousMonth.right
anchors.leftMargin: 2
@@ -319,7 +319,7 @@ Style {
*/
property Component dayOfWeekDelegate: Rectangle {
color: gridVisible ? "#fcfcfc" : "transparent"
- implicitHeight: 40
+ implicitHeight: Math.round(TextSingleton.implicitHeight * 2.25)
Label {
text: control.__locale.dayName(styleData.dayOfWeek, control.dayOfWeekFormat)
anchors.centerIn: parent
@@ -340,7 +340,7 @@ Style {
\endtable
*/
property Component weekNumberDelegate: Rectangle {
- implicitWidth: 30
+ implicitWidth: Math.round(TextSingleton.implicitHeight * 2)
Label {
text: styleData.weekNumber
anchors.centerIn: parent
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri
index ddc867a5..bcc1e8ba 100644
--- a/src/controls/Styles/styles.pri
+++ b/src/controls/Styles/styles.pri
@@ -25,31 +25,33 @@ STYLES_QML_FILES = \
$$PWD/Base/ToolButtonStyle.qml
# Desktop
-STYLES_QML_FILES += \
- $$PWD/Desktop/qmldir \
- $$PWD/Desktop/RowItemSingleton.qml \
- $$PWD/Desktop/ButtonStyle.qml \
- $$PWD/Desktop/CalendarStyle.qml \
- $$PWD/Desktop/BusyIndicatorStyle.qml \
- $$PWD/Desktop/CheckBoxStyle.qml \
- $$PWD/Desktop/ComboBoxStyle.qml \
- $$PWD/Desktop/FocusFrameStyle.qml \
- $$PWD/Desktop/GroupBoxStyle.qml \
- $$PWD/Desktop/MenuBarStyle.qml \
- $$PWD/Desktop/MenuStyle.qml \
- $$PWD/Desktop/ProgressBarStyle.qml \
- $$PWD/Desktop/RadioButtonStyle.qml \
- $$PWD/Desktop/ScrollViewStyle.qml \
- $$PWD/Desktop/SliderStyle.qml \
- $$PWD/Desktop/SpinBoxStyle.qml \
- $$PWD/Desktop/SwitchStyle.qml \
- $$PWD/Desktop/StatusBarStyle.qml\
- $$PWD/Desktop/TabViewStyle.qml \
- $$PWD/Desktop/TableViewStyle.qml \
- $$PWD/Desktop/TextAreaStyle.qml \
- $$PWD/Desktop/TextFieldStyle.qml \
- $$PWD/Desktop/ToolBarStyle.qml \
- $$PWD/Desktop/ToolButtonStyle.qml
+!no_desktop {
+ STYLES_QML_FILES += \
+ $$PWD/Desktop/qmldir \
+ $$PWD/Desktop/RowItemSingleton.qml \
+ $$PWD/Desktop/ButtonStyle.qml \
+ $$PWD/Desktop/CalendarStyle.qml \
+ $$PWD/Desktop/BusyIndicatorStyle.qml \
+ $$PWD/Desktop/CheckBoxStyle.qml \
+ $$PWD/Desktop/ComboBoxStyle.qml \
+ $$PWD/Desktop/FocusFrameStyle.qml \
+ $$PWD/Desktop/GroupBoxStyle.qml \
+ $$PWD/Desktop/MenuBarStyle.qml \
+ $$PWD/Desktop/MenuStyle.qml \
+ $$PWD/Desktop/ProgressBarStyle.qml \
+ $$PWD/Desktop/RadioButtonStyle.qml \
+ $$PWD/Desktop/ScrollViewStyle.qml \
+ $$PWD/Desktop/SliderStyle.qml \
+ $$PWD/Desktop/SpinBoxStyle.qml \
+ $$PWD/Desktop/SwitchStyle.qml \
+ $$PWD/Desktop/StatusBarStyle.qml\
+ $$PWD/Desktop/TabViewStyle.qml \
+ $$PWD/Desktop/TableViewStyle.qml \
+ $$PWD/Desktop/TextAreaStyle.qml \
+ $$PWD/Desktop/TextFieldStyle.qml \
+ $$PWD/Desktop/ToolBarStyle.qml \
+ $$PWD/Desktop/ToolButtonStyle.qml
+}
# Images
STYLES_QML_FILES += \
diff --git a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
index d47a92e8..47b14865 100644
--- a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
+++ b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
@@ -9,5 +9,5 @@ include (../shared/util.pri)
TESTDATA = data/*
QT += core-private gui-private qml-private quick-private testlib
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro
index dad036a2..c3f00094 100644
--- a/tests/auto/controls/controls.pro
+++ b/tests/auto/controls/controls.pro
@@ -3,7 +3,7 @@ TARGET = tst_controls
IMPORTPATH = $$OUT_PWD/../testplugin
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
CONFIG += qmltestcase console
diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro
index 2b34ae77..3914c7ee 100644
--- a/tests/auto/testplugin/testplugin.pro
+++ b/tests/auto/testplugin/testplugin.pro
@@ -4,7 +4,7 @@ TARGET = testplugin
TARGETPATH = QtQuickControlsTests
QT += qml quick core-private gui-private
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
QMLDIR = $$PWD/$$TARGETPATH/qmldir
diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro
index 7d4a347f..89c89627 100644
--- a/tests/manual/combobox/combobox.pro
+++ b/tests/manual/combobox/combobox.pro
@@ -1,6 +1,6 @@
QT += qml quick
TARGET = combobox
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
SOURCES += $$PWD/main.cpp
View Lorry Controller Status