Merge remote-tracking branch 'origin/release' into stable

Change-Id: I6cfd392417a05f3e4877e29c1843a4ff004923aa

4 files changed, 31 insertions, 1 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 5de255c..02554ab 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,2 +1,4 @@
 load(qt_build_config)
 CONFIG += qt_example_installs
+
+MODULE_VERSION = 5.0.2
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 0000000..f29fa49
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,25 @@
+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                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - This release contains only minor code improvements.
diff --git a/examples/examples.pro b/examples/examples.pro
index 2bcd42a..69cdb08 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS +=  webkitwidgets webkitqml
+SUBDIRS +=  webkitqml
+qtHaveModule(webkitwidgets): SUBDIRS += webkitwidgets
diff --git a/qtwebkit-examples-and-demos.pro b/qtwebkit-examples-and-demos.pro
index 3d23bb4..c6ad8c8 100644
--- a/qtwebkit-examples-and-demos.pro
+++ b/qtwebkit-examples-and-demos.pro
@@ -1,2 +1,4 @@
+requires(qtHaveModule(webkit))
+
 TEMPLATE = subdirs
 SUBDIRS +=  examples doc