Commit 65317dea authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Joerg Bornemann

move qtcbuildhelper where it belongs and rename it accordingly

this is not a creator tool, but a helper of qtcprocess, just like the
existing stub.

Change-Id: Ice7c60a1dee0b132c6063747f82ea35699f4127d
Reviewed-on: http://codereview.qt.nokia.com/2918Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@nokia.com>
parent 9e20d6df
......@@ -81,6 +81,7 @@ doc/pluginhowto/html/*
bin/*.dll
bin/qtcreator
bin/qtcreator_process_stub*
bin/qtcreator_ctrlc_stub*
bin/qtcreator.exe
bin/qmlpuppet
bin/qmlpuppet.exe
......
......@@ -17,6 +17,7 @@ SUBDIRS = \
glsl \
qmleditorwidgets \
qtcomponents/styleitem
win32:SUBDIRS += utils/process_ctrlc_stub.pro
# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected.
win32 {
......
!win32: error("process_ctrlc_stub is Windows only")
include(../../../qtcreator.pri)
TEMPLATE = app
TARGET = qtcreator_ctrlc_stub
DESTDIR = $$IDE_LIBEXEC_PATH
QT =
CONFIG += console warn_on
SOURCES += process_ctrlc_stub.cpp
LIBS += -luser32 -lshell32
build_all:!build_pass {
CONFIG -= build_all
CONFIG += release
}
target.path = /bin # FIXME: libexec, more or less
INSTALLS += target
......@@ -671,7 +671,7 @@ void QtcProcess::start()
setNativeArguments(arguments);
if (m_useCtrlCStub) {
argList << command;
command = QCoreApplication::applicationDirPath() + QLatin1String("/qtcbuildhelper.exe"));
command = QCoreApplication::applicationDirPath() + QLatin1String("/qtcreator_ctrlc_stub.exe"));
}
QProcess::start(command, argList);
#else
......
!win32: error("qtcbuildhelper is Windows only")
include(../../../qtcreator.pri)
TEMPLATE = app
TARGET = qtcbuildhelper
DESTDIR = $$IDE_BIN_PATH
QT -= qt core gui
CONFIG += console warn_on
SOURCES += main.cpp
LIBS += -luser32 -lshell32
TEMPLATE = subdirs
win32:SUBDIRS = qtcdebugger
win32:SUBDIRS += qtcbuildhelper
SUBDIRS += qtpromaker
SUBDIRS += qmlpuppet
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment