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

Conflicts:
	src/corelib/io/qdatastream.cpp
	src/corelib/io/qdatastream.h
	src/corelib/json/qjsonwriter.cpp
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbkeyboard.cpp

Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62

4 files changed, 2 insertions, 17 deletions

diff --git a/src/sql/doc/src/qsqldatatype-table.qdoc b/src/sql/doc/src/qsqldatatype-table.qdoc
index 8480b5d412..fdd5437f9d 100644
--- a/src/sql/doc/src/qsqldatatype-table.qdoc
+++ b/src/sql/doc/src/qsqldatatype-table.qdoc
@@ -30,8 +30,6 @@
   \title Data Types for Qt-supported Database Systems
   \brief Recommended data types for database systems
 
-  \ingroup qt-sql
-
   \section1 Recommended Data Types for Qt-Supported Database Systems
 
   This table shows the recommended data types for extracting data from
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index 3de898c344..d8d10582f6 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -30,8 +30,6 @@
     \title SQL Database Drivers
     \brief How to configure and install Qt SQL drivers for supported databases.
 
-    \ingroup qt-sql
-
     The Qt SQL module uses driver \l{How to Create Qt
     Plugins}{plugins} to communicate with the different database
     APIs. Since Qt's SQL Module API is database-independent, all
diff --git a/src/sql/doc/src/sql-programming.qdoc b/src/sql/doc/src/sql-programming.qdoc
index 9b5e9318e0..9a4f0eec75 100644
--- a/src/sql/doc/src/sql-programming.qdoc
+++ b/src/sql/doc/src/sql-programming.qdoc
@@ -35,7 +35,6 @@
 /*!
     \page sql-programming.html
     \title SQL Programming
-    \ingroup qt-sql
     \nextpage Connecting to Databases
 
     \brief Database integration for Qt applications.
@@ -105,7 +104,6 @@
 /*!
     \page sql-connecting.html
     \title Connecting to Databases
-    \ingroup qt-sql
 
     \contentspage SQL Programming
     \previouspage SQL Programming
@@ -175,7 +173,6 @@
 /*!
     \page sql-sqlstatements.html
     \title Executing SQL Statements
-    \ingroup qt-sql
 
     \previouspage Connecting to Databases
     \contentspage SQL Programming
@@ -327,7 +324,6 @@
 /*!
     \page sql-model.html
     \title Using the SQL Model Classes
-    \ingroup qt-sql
 
     \previouspage Executing SQL Statements
     \contentspage SQL Programming
@@ -474,7 +470,6 @@
 /*!
     \page sql-presenting.html
     \title Presenting Data in a Table View
-    \ingroup qt-sql
 
     \previouspage Using the SQL Model Classes
     \contentspage SQL Programming
@@ -579,7 +574,6 @@
 /*!
     \page sql-forms.html
     \title Creating Data-Aware Forms
-    \ingroup qt-sql
 
     \previouspage Presenting Data in a Table View
     \contentspage SQL Programming
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
index 50f49ca548..3cfb6144a1 100644
--- a/src/sql/drivers/mysql/qsql_mysql.pri
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
@@ -1,10 +1,8 @@
 HEADERS += $$PWD/qsql_mysql_p.h
 SOURCES += $$PWD/qsql_mysql.cpp
 
-!isEmpty(MYSQL_PATH) {
-    INCLUDEPATH += $$MYSQL_PATH/include
-    QMAKE_LIBDIR += $$MYSQL_PATH/lib
-}
+QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
+LIBS += $$QT_LFLAGS_MYSQL
 
 unix {
     isEmpty(QT_LFLAGS_MYSQL) {
@@ -12,9 +10,6 @@ unix {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
             else:LIBS += -lmysqlclient
         }
-    } else {
-        LIBS += $$QT_LFLAGS_MYSQL
-        QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
     }
 } else {
     !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql