diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-05-15 10:21:47 +0200 |
| commit | 6fb94a7b10216cb03544acfca1ea5e7e121dd50e (patch) | |
| tree | 2e5aba50125b1bda1ccb1739b5a6c39336e6333a /src/libs/utils/qtcprocess.h | |
| parent | c6bee7e20eff2cefe3300d2d5a9fc23508402e98 (diff) | |
| parent | 8ca5b55a0bafd744cf62c20de379a7738cb76138 (diff) | |
Merge branch '2.7'
Conflicts:
doc/src/qtquick/qtquick-components.qdoc
doc/src/qtquick/qtquick-designer.qdoc
qtcreator.pri
qtcreator.qbs
src/plugins/cppeditor/cppinsertdecldef.cpp
src/plugins/qnx/qnxruncontrolfactory.cpp
Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
Diffstat (limited to 'src/libs/utils/qtcprocess.h')
| -rw-r--r-- | src/libs/utils/qtcprocess.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 2da53dacde..e516c7dd70 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -58,6 +58,9 @@ public: #endif void start(); void terminate(); +#ifdef Q_OS_WIN + void interrupt(); +#endif enum SplitError { SplitOk = 0, //! All went just fine |