summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-05-23 13:31:54 (GMT)
committerSimon Hausmann <simon.hausmann@qt.io>2017-05-23 13:32:04 (GMT)
commit7b0d285d8ae3636d554688eefe19707e67e31dca (patch)
tree75361880749476de16d1de98b08e8fdb90279db1
parentc65bde25f04304bdcc995191f5f076e5f7532678 (diff)
parentdacb91916b202208681471ba764504c7c7d086f0 (diff)
downloadqtquickcontrols-7b0d285d8ae3636d554688eefe19707e67e31dca.tar.gz
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I67b3761e42ad377d090a9dd20ad6309bd72c5484
-rw-r--r--dist/changes-5.9.060
-rw-r--r--src/dialogs/dialogs.pro28
2 files changed, 61 insertions, 27 deletions
diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..60ab2e8
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,60 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+ - Enabled QML caching.
+ - Removed the WinRT style.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - Button:
+ * [QTBUG-57853] Fixed to accept space key press and release events to
+ avoid leaking/propagating them to the parent item.
+
+ - GroupBox:
+ * Removed a hard-coded texture size from the Desktop style to avoid
+ skewed groupboxes in Plasma's config dialogs when using larger fonts.
+
+ - MenuBar:
+ * [QTBUG-59335] Fixed styling of disabled entries.
+
+ - ScrollView:
+ * Added a maximum scroll bar size limit to avoid scroll bars overflowing
+ the container when e.g. contentWidth/height becomes zero.
+ * [QTBUG-59633] Fixed jumps to the top with mouse wheel events.
+
+ - Slider:
+ * [QTBUG-42273] Prevented wheel events from escaping.
+
+****************************************************************************
+* Dialogs *
+****************************************************************************
+
+ - FileDialog:
+ * Fixed to remember the folder only when the dialog is accepted.
+
+****************************************************************************
+* Extras *
+****************************************************************************
+
+ - TumblerStyle:
+ * [QTBUG-55289] Deprecated unused spacing property.
diff --git a/src/dialogs/dialogs.pro b/src/dialogs/dialogs.pro
index e5cc7d7..69b64e0 100644
--- a/src/dialogs/dialogs.pro
+++ b/src/dialogs/dialogs.pro
@@ -84,32 +84,6 @@ ios|android|blackberry|winrt {
QT += quick-private gui gui-private core core-private qml qml-private
-!qmlcache {
- # Create the resource file
- GENERATED_RESOURCE_FILE = $$OUT_PWD/dialogs.qrc
-
- RESOURCE_CONTENT = \
- "<RCC>" \
- "<qresource prefix=\"/QtQuick/Dialogs\">"
-
- for(resourcefile, DIALOGS_QML_FILES) {
- resourcefileabsolutepath = $$absolute_path($$resourcefile)
- relativepath_in = $$relative_path($$resourcefileabsolutepath, $$_PRO_FILE_PWD_)
- relativepath_out = $$relative_path($$resourcefileabsolutepath, $$OUT_PWD)
- RESOURCE_CONTENT += "<file alias=\"$$relativepath_in\">$$relativepath_out</file>"
- }
-
- RESOURCE_CONTENT += \
- "</qresource>" \
- "</RCC>"
-
- write_file($$GENERATED_RESOURCE_FILE, RESOURCE_CONTENT)|error("Aborting.")
-
- RESOURCES += $$GENERATED_RESOURCE_FILE
- # In case of a debug build, deploy the QML files too
- !qtquickcompiler:CONFIG(debug, debug|release): QML_FILES += $$DIALOGS_QML_FILES
-} else {
- QML_FILES += $$DIALOGS_QML_FILES
-}
+QML_FILES += $$DIALOGS_QML_FILES
load(qml_plugin)