path: root/dist
diff options
authorLars Knoll <>2012-05-03 10:18:36 +0200
committerLars Knoll <>2012-05-03 12:26:09 +0200
commit1e49914fee099c4c0d634743326b50ad02e6c8f1 (patch)
tree422eedb9ddcb16fa9f5a653737b4c78d8930eeae /dist
parent1eac22a1b9dad7f843916afa9b7c820aa1c23777 (diff)
parentc0d249019b098890fb8e5e9e144c2dd8029a670c (diff)
Merge remote-tracking branch 'origin/api_changes'
Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/gui/kernel/qguiapplication.h src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow.h tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e
Diffstat (limited to 'dist')
1 files changed, 6 insertions, 0 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 9610cc1878..353c7694d6 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -68,6 +68,12 @@ information about a particular change.
method returns void is to compare the return value of QMetaMethod::returnType()
to QMetaType::Void.
+- QVariant:
+ * Inconsistent constructor taking Qt::GlobalColor and producing QVariant(QColor)
+ instance was removed. Code constructing such variants can be migrated by
+ explicitly calling QColor constructor. For example from "QVariant(Qt::red)"
+ to "QVariant(QColor(Qt::red))"
- QTestLib:
* The plain-text, xml and lightxml test output formats have been changed to
show a test result for every row of test data in data-driven tests. In