diff options
author | Oliver Wolff <oliver.wolff@digia.com> | 2013-09-17 09:43:58 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 13:54:08 +0200 |
commit | 5ffedd0495e341a14169458c31b2c9003f756dba (patch) | |
tree | 89477c9611f4973aa1427c6d39713aa724949ced /src/corelib | |
parent | 4260ed49c653487b85d6fa2d3e7e4c60b6e9e591 (diff) |
QT_NO_PROCESS for WinRT
As Windows Runtime does not really support the use
of spawning processes QT_NO_PROCESS is defined for
winrt builds and the corresponding sources are
excluded from build.
Change-Id: I79263417c985b23678c55ac44a5591a9a69d3c13
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
-rw-r--r-- | src/corelib/io/io.pri | 27 |
2 files changed, 19 insertions, 12 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 62ec25f003..f38672bdc1 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -540,6 +540,10 @@ class QDataStream; # define QT_NO_SYSTEMSEMAPHORE // not needed at all in a flat address space #endif +#if defined(Q_OS_WINRT) +# define QT_NO_PROCESS +#endif + inline void qt_noop(void) {} /* These wrap try/catch so we can switch off exceptions later. diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index dfaaad51ba..c00947dd97 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -95,22 +95,25 @@ win32 { SOURCES += io/qfilesystemwatcher_win.cpp HEADERS += io/qfilesystemwatcher_win_p.h - HEADERS += io/qwindowspipewriter_p.h - SOURCES += io/qwindowspipewriter.cpp SOURCES += io/qfilesystemengine_win.cpp SOURCES += io/qfilesystemiterator_win.cpp SOURCES += io/qstandardpaths_win.cpp - wince* { - SOURCES += io/qprocess_wince.cpp - } else { - HEADERS += \ - io/qwinoverlappedionotifier_p.h \ - io/qwindowspipereader_p.h - SOURCES += \ - io/qprocess_win.cpp \ - io/qwinoverlappedionotifier.cpp \ - io/qwindowspipereader.cpp + !winrt { + HEADERS += io/qwindowspipewriter_p.h + SOURCES += io/qwindowspipewriter.cpp + + wince* { + SOURCES += io/qprocess_wince.cpp + } else { + HEADERS += \ + io/qwinoverlappedionotifier_p.h \ + io/qwindowspipereader_p.h + SOURCES += \ + io/qprocess_win.cpp \ + io/qwinoverlappedionotifier.cpp \ + io/qwindowspipereader.cpp + } } } else:unix|integrity { SOURCES += \ |