summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-30 07:45:06 (GMT)
committerLiang Qi <liang.qi@qt.io>2017-10-30 08:17:43 (GMT)
commit1320f7f9840e94db66988f2dce265dfd373add27 (patch)
tree59d191178b86522b19fff44c592ac905326d86b1
parentb2922baedd8b6a2aa1e6aa49a28e774e331c2be9 (diff)
parent296810ea4bb4f734881a517eb101e5b948c1905b (diff)
downloadqtquickcontrols-1320f7f9840e94db66988f2dce265dfd373add27.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts: .qmake.conf Change-Id: Ia33462a31303ae79f7a6ef26dc6065a0afeef3e1
-rw-r--r--dist/changes-5.6.324
-rw-r--r--dist/changes-5.9.231
-rw-r--r--examples/quickcontrols/controls/basiclayouts/main.qml16
-rw-r--r--examples/quickcontrols/controls/touch/src/main.cpp16
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp2
-rw-r--r--src/controls/Slider.qml4
-rw-r--r--tests/auto/controls/data/rangemodel/init.qml16
-rw-r--r--tests/auto/controls/data/tst_slider.qml15
-rw-r--r--tests/auto/dialogs/data/DialogImplicitSize.qml16
-rw-r--r--tests/auto/dialogs/data/DialogMinimumSize.qml16
-rw-r--r--tests/benchmarks/startup/startup_bench.cpp1
11 files changed, 138 insertions, 19 deletions
diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3
new file mode 100644
index 0000000..016fc10
--- /dev/null
+++ b/dist/changes-5.6.3
@@ -0,0 +1,24 @@
+Qt 5.6.3 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.6.0.
+
+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.6 series is binary compatible with the 5.5.x series.
+Applications compiled for 5.5 will continue to run with 5.6.
+
+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.
+
+****************************************************************************
+* General *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2
new file mode 100644
index 0000000..be791d8
--- /dev/null
+++ b/dist/changes-5.9.2
@@ -0,0 +1,31 @@
+Qt 5.9.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+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.
+
+****************************************************************************
+* Controls *
+****************************************************************************
+
+ - [QTBUG-57895] Increased Label's QtQuick import version to 2.6 to make
+ the new revisioned properties in the QML Text base type available.
+
+****************************************************************************
+* Dialogs *
+****************************************************************************
+
+ - [QTBUG-60991] Fixed QML compiler support
diff --git a/examples/quickcontrols/controls/basiclayouts/main.qml b/examples/quickcontrols/controls/basiclayouts/main.qml
index b6694b4..cc4c0d4 100644
--- a/examples/quickcontrols/controls/basiclayouts/main.qml
+++ b/examples/quickcontrols/controls/basiclayouts/main.qml
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/examples/quickcontrols/controls/touch/src/main.cpp b/examples/quickcontrols/controls/touch/src/main.cpp
index e66387f..be01f28 100644
--- a/examples/quickcontrols/controls/touch/src/main.cpp
+++ b/examples/quickcontrols/controls/touch/src/main.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index c7f641c..d8cfdae 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -222,7 +222,7 @@ QQuickControlSettings1::QQuickControlSettings1(QQmlEngine *engine)
// If the style name is a path..
const QString styleNameFromEnvVar = styleEnvironmentVariable();
- if (QFile::exists(styleNameFromEnvVar)) {
+ if (!styleNameFromEnvVar.isEmpty() && QFile::exists(styleNameFromEnvVar)) {
StyleData styleData;
styleData.m_styleDirPath = styleNameFromEnvVar;
m_styleMap[m_name] = styleData;
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index c4d25ac..e290640 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -187,10 +187,10 @@ Control {
/*! \internal
The extra arguments positionAtMinimum and positionAtMaximum are there to force
re-evaluation of the handle position when the constraints change (QTBUG-41255),
- and the same for range.minimumValue (QTBUG-51765).
+ and the same for range.minimumValue (QTBUG-51765) and range.maximumValue (QTBUG-63354).
*/
property real __handlePos: range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y,
- range.positionAtMinimum, range.positionAtMaximum, range.minimumValue)
+ range.positionAtMinimum, range.positionAtMaximum, range.minimumValue, range.maximumValue)
activeFocusOnTab: true
diff --git a/tests/auto/controls/data/rangemodel/init.qml b/tests/auto/controls/data/rangemodel/init.qml
index 9d05014..1239527 100644
--- a/tests/auto/controls/data/rangemodel/init.qml
+++ b/tests/auto/controls/data/rangemodel/init.qml
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index a27cf70..9e2ba0f 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -399,7 +399,7 @@ Item {
}
}
- function test_minimumValueLargerThanValue() {
+ function test_minimumMaximumValueLargerThanValue() {
var control = sliderComponent.createObject(container, { "style": namedHandleStyle, "minimumValue": 0, "maximumValue": 2, value: "minimumValue" });
verify(control);
@@ -412,6 +412,19 @@ Item {
compare(control.value, control.minimumValue);
compare(handle.mapToItem(null, 0, 0).x, 0)
+ control.maximumValue = 5;
+ control.value = 5;
+ compare(control.value, 5);
+
+ // get the slider position at max
+ var maxPos = handle.mapToItem(null, 0, 0).x;
+
+ // reduce the maximum value, resulting in the value becoming 4 as well
+ control.maximumValue = 4;
+ compare(control.value, 4);
+ // make sure that the actual position of the handle is the same (it used to be off - see QTBUG-63354)
+ compare(handle.mapToItem(null, 0, 0).x, maxPos);
+
control.destroy();
}
}
diff --git a/tests/auto/dialogs/data/DialogImplicitSize.qml b/tests/auto/dialogs/data/DialogImplicitSize.qml
index 8239c45..2cac1df 100644
--- a/tests/auto/dialogs/data/DialogImplicitSize.qml
+++ b/tests/auto/dialogs/data/DialogImplicitSize.qml
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/tests/auto/dialogs/data/DialogMinimumSize.qml b/tests/auto/dialogs/data/DialogMinimumSize.qml
index 7f5baa6..0ab3c0d 100644
--- a/tests/auto/dialogs/data/DialogMinimumSize.qml
+++ b/tests/auto/dialogs/data/DialogMinimumSize.qml
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
diff --git a/tests/benchmarks/startup/startup_bench.cpp b/tests/benchmarks/startup/startup_bench.cpp
index 4127f8d..cdc754e 100644
--- a/tests/benchmarks/startup/startup_bench.cpp
+++ b/tests/benchmarks/startup/startup_bench.cpp
@@ -52,6 +52,7 @@
#include <QtQml/QQmlApplicationEngine>
#include <QtCore/QElapsedTimer>
#include <functional>
+#include <stdio.h>
int runBenchmark(std::function<int()> f) {
{