Merge remote-tracking branch 'origin/3.2'

src/plugins/coreplugin/variablemanager.cpp

@@ -254,7 +254,7 @@ void VariableManager::registerIntVariable(const QByteArray &variable,
     const QString &description, const VariableManager::IntFunction &value)
 {
     registerVariable(variable, description,
-        [=]() -> QString { return QString::number(value ? value() : 0); });
+        [value]() { return QString::number(value ? value() : 0); });
 }
 
 /*!
@@ -270,19 +270,19 @@ void VariableManager::registerFileVariables(const QByteArray &prefix,
 {
     registerVariable(prefix + kFilePathPostfix,
          QCoreApplication::translate("Core::VariableManager", "%1: Full path including file name.").arg(heading),
-         [=]() -> QString { return QFileInfo(base()).filePath(); });
+         [base]() { return QFileInfo(base()).filePath(); });
 
     registerVariable(prefix + kPathPostfix,
          QCoreApplication::translate("Core::VariableManager", "%1: Full path excluding file name.").arg(heading),
-         [=]() -> QString { return QFileInfo(base()).path(); });
+         [base]() { return QFileInfo(base()).path(); });
 
     registerVariable(prefix + kFileNamePostfix,
          QCoreApplication::translate("Core::VariableManager", "%1: File name without path.").arg(heading),
-         [=]() -> QString { return QFileInfo(base()).fileName(); });
+         [base]() { return QFileInfo(base()).fileName(); });
 
     registerVariable(prefix + kFileBaseNamePostfix,
          QCoreApplication::translate("Core::VariableManager", "%1: File base name without path and suffix.").arg(heading),
-         [=]() -> QString { return QFileInfo(base()).baseName(); });
+         [base]() { return QFileInfo(base()).baseName(); });
 }
 
 /*!

src/plugins/cpptools/cppmodelmanager.cpp

@@ -172,7 +172,7 @@ QStringList CppModelManager::timeStampModifiedFiles(const QList<Document::Ptr> &
 CppSourceProcessor *CppModelManager::createSourceProcessor()
 {
     CppModelManager *that = instance();
-    return new CppSourceProcessor(that->snapshot(), [=](const Document::Ptr &doc) {
+    return new CppSourceProcessor(that->snapshot(), [that](const Document::Ptr &doc) {
         that->emitDocumentUpdated(doc);
         doc->releaseSourceAndAST();
     });

src/plugins/debugger/debuggerengine.cpp

@@ -178,7 +178,7 @@ public:
 
         VariableManager::registerFileVariables(PrefixDebugExecutable,
             tr("Debugged executable"),
-            [&]() { return this->m_startParameters.executable; });
+            [this]() { return m_startParameters.executable; });
     }
 
 public slots:

src/plugins/projectexplorer/projectexplorer.cpp

@@ -1049,7 +1049,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     VariableManager::registerFileVariables(Constants::VAR_CURRENTPROJECT_PREFIX,
         tr("Current project's main file"),
-        []() -> QString {
+        [&]() -> QString {
             QString projectFilePath;
             if (Project *project = ProjectExplorerPlugin::currentProject())
                 if (IDocument *doc = project->document())
@@ -1066,44 +1066,44 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     VariableManager::registerVariable(Constants::VAR_CURRENTPROJECT_NAME,
         tr("The current project's name."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTPROJECT_NAME); });
+        []() { return variableValue(Constants::VAR_CURRENTPROJECT_NAME); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTKIT_NAME,
         tr("The currently active kit's name."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTKIT_NAME); });
+        []() { return variableValue(Constants::VAR_CURRENTKIT_NAME); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTKIT_FILESYSTEMNAME,
         tr("The currently active kit's name in a filesystem friendly version."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTKIT_FILESYSTEMNAME); });
+        []() { return variableValue(Constants::VAR_CURRENTKIT_FILESYSTEMNAME); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTKIT_ID,
         tr("The currently active kit's id."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTKIT_ID); });
+        []() { return variableValue(Constants::VAR_CURRENTKIT_ID); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_HOSTADDRESS,
         tr("The host address of the device in the currently active kit."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTDEVICE_HOSTADDRESS); });
+        []() { return variableValue(Constants::VAR_CURRENTDEVICE_HOSTADDRESS); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_SSHPORT,
         tr("The SSH port of the device in the currently active kit."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTDEVICE_SSHPORT); });
+        []() { return variableValue(Constants::VAR_CURRENTDEVICE_SSHPORT); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_USERNAME,
         tr("The user name with which to log into the device in the currently active kit."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTDEVICE_USERNAME); });
+        []() { return variableValue(Constants::VAR_CURRENTDEVICE_USERNAME); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE,
         tr("The private key file with which to authenticate when logging into the device "
            "in the currently active kit."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE); });
+        []() { return variableValue(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTBUILD_NAME,
         tr("The currently active build configuration's name."),
-        []() -> QString { return variableValue(Constants::VAR_CURRENTBUILD_NAME); });
+        []() { return variableValue(Constants::VAR_CURRENTBUILD_NAME); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTBUILD_TYPE,
         tr("The currently active build configuration's type."),
-        []() -> QString {
+        [&]() -> QString {
             if (BuildConfiguration *bc = activeBuildConfiguration()) {
                 BuildConfiguration::BuildType type = bc->buildType();
                 if (type == BuildConfiguration::Debug)
@@ -1116,11 +1116,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
 
     VariableManager::registerFileVariables(Constants::VAR_CURRENTSESSION_PREFIX,
         tr("File where current session is saved."),
-        []() -> QString { return SessionManager::sessionNameToFileName(SessionManager::activeSession()).toString(); });
+        []() { return SessionManager::sessionNameToFileName(SessionManager::activeSession()).toString(); });
 
     VariableManager::registerVariable(Constants::VAR_CURRENTSESSION_NAME,
         tr("Name of current session."),
-        []() -> QString { return SessionManager::activeSession(); });
+        []() { return SessionManager::activeSession(); });
 
     return true;
 }

src/plugins/qmldesigner/componentsplugin/components.metainfo

@@ -249,12 +249,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Controls.Frame"
-        icon: ":/desktopplugin//images/window16.png"
+        icon: ":/componentsplugin//images/window16.png"
 
         ItemLibraryEntry {
             name: "Frame"
             category: "Qt Quick - Controls"
-            libraryIcon: ":/desktopplugin/images/window.png"
+            libraryIcon: ":/componentsplugin/images/window.png"
             version: "1.0"
             requiredImport: "QtQuick.Controls"
 
@@ -265,12 +265,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Controls.ToolButton"
-        icon: ":/desktopplugin/images/button16.png"
+        icon: ":/componentsplugin/images/button16.png"
 
         ItemLibraryEntry {
             name: "Tool Button"
             category: "Qt Quick - Controls"
-            libraryIcon: ":/desktopplugin/images/button.png"
+            libraryIcon: ":/componentsplugin/images/button.png"
             version: "1.0"
             requiredImport: "QtQuick.Controls"
 
@@ -281,12 +281,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Controls.ToolBar"
-        icon: ":/desktopplugin/images/toolbar16.png"
+        icon: ":/componentsplugin/images/toolbar16.png"
 
         ItemLibraryEntry {
             name: "Tool Bar"
             category: "Qt Quick - Controls"
-            libraryIcon: ":/desktopplugin/images/toolbar.png"
+            libraryIcon: ":/componentsplugin/images/toolbar.png"
             version: "1.0"
             requiredImport: "QtQuick.Controls"
 
@@ -297,12 +297,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Controls.StatusBar"
-        icon: ":/desktopplugin/images/toolbar16.png"
+        icon: ":/componentsplugin/images/toolbar16.png"
 
         ItemLibraryEntry {
             name: "Status Bar"
             category: "Qt Quick - Controls"
-            libraryIcon: ":/desktopplugin/images/toolbar.png"
+            libraryIcon: ":/componentsplugin/images/toolbar.png"
             version: "1.0"
             requiredImport: "QtQuick.Controls"
         }
@@ -310,12 +310,12 @@ MetaInfo {
 
     Type {
         name: "QtQuick.Controls.Dial"
-        //icon: ":/desktopplugin/images/progressbar16.png"
+        //icon: ":/componentsplugin/images/progressbar16.png"
 
         ItemLibraryEntry {
             name: "Dial"
             category: "Qt Quick - Controls"
-            //libraryIcon: ":/desktopplugin/images/progressbar.png"
+            //libraryIcon: ":/componentsplugin/images/progressbar.png"
             version: "1.0"
             requiredImport: "QtQuick.Controls"
 

src/plugins/qtsupport/qtsupportplugin.cpp

@@ -117,12 +117,12 @@ void QtSupportPlugin::extensionsInitialized()
 {
     VariableManager::registerVariable(kHostBins,
         tr("Full path to the host bin directory of the current project's Qt version."),
-        []() -> QString { return qmakeProperty("QT_HOST_BINS"); });
+        []() { return qmakeProperty("QT_HOST_BINS"); });
 
     VariableManager::registerVariable(kInstallBins,
         tr("Full path to the target bin directory of the current project's Qt version."
            " You probably want %1 instead.").arg(QString::fromLatin1(kHostBins)),
-        []() -> QString { return qmakeProperty("QT_INSTALL_BINS"); });
+        []() { return qmakeProperty("QT_INSTALL_BINS"); });
 }
 
 bool QtSupportPlugin::delayedInitialize()

src/src.qbs

@@ -26,10 +26,11 @@ Project {
         property bool installApiHeaders: false
         property string libInstallDir: project.ide_library_path
         property stringList libRPaths:  qbs.targetOS.contains("osx")
-            ? ["@loader_path/.."] : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
+            ? ["@loader_path/" + FileInfo.relativePath(appInstallDir, libInstallDir)]
+            : ["$ORIGIN/..", "$ORIGIN/../" + project.ide_library_path]
         property string resourcesInstallDir: project.ide_data_path + "/qbs"
         property string pluginsInstallDir: project.libDirName + "/qtcreator"
-        property string appInstallDir: project.ide_libexec_path
+        property string appInstallDir: project.ide_bin_path
         property string relativePluginsPath: FileInfo.relativePath(appInstallDir, pluginsInstallDir)
         property string relativeSearchPath: FileInfo.relativePath(appInstallDir,
                                                                   resourcesInstallDir)

tests/manual/debugger/simple/simple_test_app.cpp

@@ -412,7 +412,7 @@ class XX : virtual public Foo { public: XX() { } };
 
 class Y : virtual public Foo { public: Y() { } };
 
-class D : public X, public Y { int diamond; };
+class D : public X, public Y { int diamond; D(){Q_UNUSED(diamond);} };
 
 
 namespace peekandpoke {
@@ -6503,7 +6503,7 @@ namespace bug5106 {
     class A5106
     {
     public:
-            A5106(int a, int b) : m_a(a), m_b(b) {}
+            A5106(int a, int b) : m_a(a), m_b(b) {Q_UNUSED(m_a);Q_UNUSED(m_b);}
             virtual int test() { return 5; }
     private:
             int m_a, m_b;
@@ -6512,7 +6512,7 @@ namespace bug5106 {
     class B5106 : public A5106
     {
     public:
-            B5106(int c, int a, int b) : A5106(a, b), m_c(c) {}
+            B5106(int c, int a, int b) : A5106(a, b), m_c(c) {Q_UNUSED(m_c);}
             virtual int test() { return 4; BREAK_HERE; }
     private:
             int m_c;