integrated costomexecutableconfig into qtctools plugin

qtcreator.pri

@@ -1,7 +1,7 @@
 !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included")
 QTCREATOR_PRI_INCLUDED = 1
 
-QTCREATOR_VERSION = 3.6.2
+QTCREATOR_VERSION = 3.6.3
 QTCREATOR_COMPAT_VERSION = 3.6.0
 BINARY_ARTIFACTS_BRANCH = 3.6
 QTC_VERILOG = yes

src/plugins/qtctools/QtcTools.json.in

@@ -1,7 +1,7 @@
 {
     \"Name\" : \"QtcTools\",
-    \"Version\" : \"3.6.1\",
-    \"CompatVersion\" : \"3.6.1\",
+    \"Version\" : \"$$QTCREATOR_VERSION\",
+    \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
     \"Vendor\" : \"Rochus Keller\",
     \"Copyright\" : \"The Qt Company Ltd, Rochus Keller\",
     \"License\" : \"LGPL\",

src/plugins/qtctools/customexecutableconfigurationwidget.cpp

@@ -49,7 +49,7 @@
 
 using namespace ProjectExplorer;
 
-namespace QtSupport {
+namespace QtcTools {
 namespace Internal {
 
 CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomExecutableRunConfiguration *rc, ApplyMode mode)
@@ -189,4 +189,4 @@ bool CustomExecutableConfigurationWidget::isValid() const
 }
 
 } // namespace Internal
-} // namespace QtSupport
+} // namespace QtcTools

src/plugins/qtctools/customexecutableconfigurationwidget.h

@@ -51,7 +51,7 @@ class ArgumentsAspect;
 class TerminalAspect;
 }
 
-namespace QtSupport {
+namespace QtcTools {
 class CustomExecutableRunConfiguration;
 
 namespace Internal {
@@ -89,6 +89,6 @@ private slots:
 };
 
 } // namespace Internal
-} // namespace QtSupport
+} // namespace QtcTools
 
 #endif // CUSTOMEXECUTABLECONFIGURATIONWIDGET_H

src/plugins/qtctools/customexecutablerunconfiguration.cpp

@@ -30,7 +30,7 @@
 
 #include "customexecutablerunconfiguration.h"
 #include "customexecutableconfigurationwidget.h"
-#include "qtkitinformation.h"
+//#include "qtkitinformation.h"
 
 #include <projectexplorer/buildconfiguration.h>
 #include <projectexplorer/localenvironmentaspect.h>
@@ -49,11 +49,12 @@
 #include <QPushButton>
 #include <QLabel>
 #include <QVBoxLayout>
+#include <QKeyEvent>
 
 #include <QDir>
 
-using namespace QtSupport;
-using namespace QtSupport::Internal;
+using namespace QtcTools;
+using namespace QtcTools::Internal;
 using namespace ProjectExplorer;
 
 namespace {

src/plugins/qtctools/customexecutablerunconfiguration.h

@@ -31,20 +31,20 @@
 #ifndef CUSTOMEXECUTABLERUNCONFIGURATION_H
 #define CUSTOMEXECUTABLERUNCONFIGURATION_H
 
-#include "qtsupport_global.h"
+#include "qtctools_global.h"
 
 #include <projectexplorer/localapplicationrunconfiguration.h>
 
 #include <QVariantMap>
 
 namespace ProjectExplorer { class Target; }
 
-namespace QtSupport {
+namespace QtcTools {
 namespace Internal { class CustomExecutableConfigurationWidget; }
 
 class CustomExecutableRunConfigurationFactory;
 
-class QTSUPPORT_EXPORT CustomExecutableRunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
+class CustomExecutableRunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
 {
     Q_OBJECT
     // the configuration widget needs to setExecutable setWorkingDirectory and setCommandLineArguments
@@ -131,6 +131,6 @@ class CustomExecutableRunConfigurationFactory : public ProjectExplorer::IRunConf
                                                  const QVariantMap &map);
 };
 
-} // namespace QtSupport
+} // namespace QtcTools
 
 #endif // CUSTOMEXECUTABLERUNCONFIGURATION_H

src/plugins/qtctools/qtctools.pro

@@ -1,10 +1,14 @@
 DEFINES += QTCTOOLS_LIBRARY
 
-SOURCES += qtctoolsplugin.cpp
+SOURCES += qtctoolsplugin.cpp \
+    customexecutableconfigurationwidget.cpp \
+    customexecutablerunconfiguration.cpp
 
 HEADERS += qtctoolsplugin.h \
         qtctools_global.h \
-        qtctoolsconstants.h
+        qtctoolsconstants.h \
+    customexecutableconfigurationwidget.h \
+    customexecutablerunconfiguration.h
 
 include(../../qtcreatorplugin.pri)
 

src/plugins/qtctools/qtctools_dependencies.pri

@@ -3,5 +3,6 @@ QTC_LIB_DEPENDS += \
     # nothing here at this time
 
 QTC_PLUGIN_DEPENDS += \
-    coreplugin
+    coreplugin \
+    projectexplorer
 

src/plugins/qtctools/qtctoolsplugin.cpp

@@ -1,5 +1,6 @@
 #include "qtctoolsplugin.h"
 #include "qtctoolsconstants.h"
+#include "customexecutablerunconfiguration.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/icontext.h>
@@ -40,16 +41,7 @@ bool QtcToolsPlugin::initialize(const QStringList &arguments, QString *errorStri
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
-    QAction *action = new QAction(tr("QtcTools action"), this);
-    Core::Command *cmd = Core::ActionManager::registerAction(action, Constants::ACTION_ID,
-                                                             Core::Context(Core::Constants::C_GLOBAL));
-    cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+Meta+A")));
-    connect(action, SIGNAL(triggered()), this, SLOT(triggerAction()));
-
-    Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID);
-    menu->menu()->setTitle(tr("QtcTools"));
-    menu->addAction(cmd);
-    Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu);
+    addAutoReleasedObject(new QtcTools::CustomExecutableRunConfigurationFactory);
 
     return true;
 }
@@ -69,10 +61,5 @@ ExtensionSystem::IPlugin::ShutdownFlag QtcToolsPlugin::aboutToShutdown()
     return SynchronousShutdown;
 }
 
-void QtcToolsPlugin::triggerAction()
-{
-    QMessageBox::information(Core::ICore::mainWindow(),
-                             tr("Action triggered"),
-                             tr("This is an action from QtcTools."));
-}
+
 

src/plugins/qtctools/qtctoolsplugin.h

@@ -20,9 +20,6 @@ class QtcToolsPlugin : public ExtensionSystem::IPlugin
     bool initialize(const QStringList &arguments, QString *errorString);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
-
-private slots:
-    void triggerAction();
 };
 
 } // namespace Internal