summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 16:05:08 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-04-03 16:05:09 +0200
commit183b690470fcea9ca1972bfc90e062219b71c38d (patch)
treee92497ddf52af690771c65303576424bdc1ec266
parent33afb890aefdfbeae6ccee3e91600388b3068108 (diff)
parent5ed36a9fe84f78c66692bb4a0395cb09eaf31d66 (diff)
Merge remote-tracking branch 'origin/release' into stable
-rw-r--r--dist/changes-5.0.222
-rw-r--r--qtquick1.pro2
2 files changed, 24 insertions, 0 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 00000000..708a3826
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,22 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+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/qtquick1.pro b/qtquick1.pro
index 58c33f27..318861f4 100644
--- a/qtquick1.pro
+++ b/qtquick1.pro
@@ -1 +1,3 @@
+requires(qtHaveModule(widgets))
+
load(qt_parts)