Merge remote-tracking branch 'origin/2.3'

9 files changed, 41 insertions, 1 deletions

diff --git a/src/libs/utils/process_stub_win.c b/src/libs/utils/process_stub_win.c
index f9cffbab7a..f309689b67 100644
--- a/src/libs/utils/process_stub_win.c
+++ b/src/libs/utils/process_stub_win.c
@@ -118,6 +118,7 @@ int main()
     PROCESS_INFORMATION pi;
     DEBUG_EVENT dbev;
     enum RunMode mode = Run;
+    HANDLE image = NULL;
 
     argv = CommandLineToArgvW(GetCommandLine(), &argc);
 
@@ -196,6 +197,8 @@ int main()
         do {
             if (!WaitForDebugEvent (&dbev, INFINITE))
                 systemError("Cannot fetch debug event, error %d\n");
+            if (dbev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT)
+                image = dbev.u.CreateProcessInfo.hFile;
             if (dbev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT) {
                 /* The first exception to be delivered is a trap
                    which indicates completion of startup. */
@@ -207,6 +210,8 @@ int main()
         } while (dbev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT);
         if (!DebugActiveProcessStop(dbev.dwProcessId))
             systemError("Cannot detach from debugee, error %d\n");
+        if (image)
+            CloseHandle(image);
     }
 
     SetConsoleCtrlHandler(ctrlHandler, TRUE);
@@ -216,6 +221,8 @@ int main()
 
     if (WaitForSingleObject(pi.hProcess, INFINITE) == WAIT_FAILED)
         systemError("Wait for debugee failed, error %d\n");
+    CloseHandle(pi.hProcess);
+    CloseHandle(pi.hThread);
     doExit(0);
     return 0;
 }
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 7f7e4b8e36..0981fd9b7a 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -173,6 +173,7 @@ plugin_bookmarks.depends += plugin_texteditor
 plugin_debugger.subdir = debugger
 plugin_debugger.depends = plugin_projectexplorer
 plugin_debugger.depends += plugin_coreplugin
+plugin_debugger.depends += plugin_cpptools
 
 plugin_fakevim.subdir = fakevim
 plugin_fakevim.depends = plugin_coreplugin
diff --git a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
index d0b68ece2a..e624bcc5e8 100644
--- a/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
+++ b/src/plugins/qmldesigner/customstyleplugin/customstyleplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/customstyleplugin.h  $$PWD/../designercore/include/iwidgetplugi
 RESOURCES += $$PWD/customstyleplugin.qrc
 
 OTHER_FILES += $$PWD/customstyle.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
index 302272967e..22e7883586 100644
--- a/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
+++ b/src/plugins/qmldesigner/desktopplugin/desktopplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/desktopplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 RESOURCES += $$PWD/desktopplugin.qrc
 
 OTHER_FILES += $$PWD/desktop.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
index 12f923cb1e..8110260be9 100644
--- a/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
+++ b/src/plugins/qmldesigner/extrasplugin/extrasplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/extrasplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 RESOURCES += $$PWD/extrasplugin.qrc
 
 OTHER_FILES += $$PWD/extras.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
index 04abc89874..659122a2f9 100644
--- a/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
+++ b/src/plugins/qmldesigner/meegoplugin/meegoplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/meegoplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 RESOURCES += $$PWD/meegoplugin.qrc
 
 OTHER_FILES += $$PWD/meego.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
index 5870c37872..98fc9c7f1a 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/qtquickplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 RESOURCES += $$PWD/qtquickplugin.qrc
 
 OTHER_FILES += $$PWD/quick.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
index 28d6323c68..a874ef08b4 100644
--- a/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
+++ b/src/plugins/qmldesigner/symbianplugin/symbianplugin.pri
@@ -15,3 +15,8 @@ HEADERS += $$PWD/symbianplugin.h  $$PWD/../designercore/include/iwidgetplugin.h
 RESOURCES += $$PWD/symbianplugin.qrc
 
 OTHER_FILES += $$PWD/symbian.metainfo
+
+!macx {
+    target.path  = /$$IDE_LIBRARY_BASENAME/qmldesigner
+    INSTALLS    += target
+}
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
index f43934473f..1a46836ac6 100644
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -1143,7 +1143,9 @@ QString Qt4HarmattanTarget::aegisManifestFileName()
 void Qt4HarmattanTarget::handleTargetAddedSpecial()
 {
     AbstractDebBasedQt4MaemoTarget::handleTargetAddedSpecial();
-    QFile(debianDirPath() + QLatin1Char('/') + aegisManifestFileName()).open(QIODevice::WriteOnly);
+    QFile aegisFile(debianDirPath() + QLatin1Char('/') + aegisManifestFileName());
+    if (!aegisFile.exists())
+        aegisFile.open(QIODevice::WriteOnly);
 }
 
 void Qt4HarmattanTarget::addAdditionalControlFileFields(QByteArray &controlContents)