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

Conflicts:
	src/assistant/assistant/assistant.pro

Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0

2 files changed, 26 insertions, 1 deletions

diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 000000000..f29fa49c5
--- /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/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 25e423883..c054147b8 100644
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -107,7 +107,7 @@ mac {
     QMAKE_INFO_PLIST = Info_mac.plist
 }
 
-QTPLUGIN += qsqlite
+contains(SQLPLUGINS, sqlite):QTPLUGIN += qsqlite
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target