Merge dev into 5.6

Change-Id: I061f2513ef58f696e75b11928d89aaaf059659a3

diff --cc configure
Simple merge

diff --cc src/corelib/kernel/qcoreapplication.cpp
index e9fdb8c8ef279bbe04bbb72568afa821048b0050,687ff6d9a077dfbd88d3d154edc47f9def17239b..00d618745b7d4e78fc1ad4a0be9f650f74fec02a
--- 1/src/corelib/kernel/qcoreapplication.cpp
--- 2/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@@ -2540,7 -2528,19 +2528,8 @@@ QStringList QCoreApplication::libraryPa
          return *(coreappdata()->manual_libpaths);
  
      if (!coreappdata()->app_libpaths) {
-         QStringList *app_libpaths = coreappdata()->app_libpaths = new QStringList;
+         QStringList *app_libpaths = new QStringList;
+         coreappdata()->app_libpaths.reset(app_libpaths);
 -        QString installPathPlugins =  QLibraryInfo::location(QLibraryInfo::PluginsPath);
 -        if (QFile::exists(installPathPlugins)) {
 -            // Make sure we convert from backslashes to slashes.
 -            installPathPlugins = QDir(installPathPlugins).canonicalPath();
 -            if (!app_libpaths->contains(installPathPlugins))
 -                app_libpaths->append(installPathPlugins);
 -        }
 -
 -        // If QCoreApplication is not yet instantiated,
 -        // make sure we add the application path when we construct the QCoreApplication
 -        if (self) self->d_func()->appendApplicationPathToLibraryPaths();
  
          const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
          if (!libPathEnv.isEmpty()) {

diff --cc src/tools/qdoc/node.cpp
Simple merge