summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-04-09 16:17:37 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2016-01-29 10:55:04 +0000
commit0ec1e13234684feb632fc980ba2a90db9a2dd936 (patch)
tree47c665e980da8a51b6156a8701b484cfafc81fc2
parente536523dbd882e63363dd2a7eaac3870b35a9b54 (diff)
Do not build QWindowsPipeWriter on Windows CE
QWindowsPipeWriter is not used in the Windows CE port. Change-Id: I068dd2408bb21a7e2a86886e0692b1636016ff6a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
-rw-r--r--src/corelib/io/io.pri6
-rw-r--r--src/corelib/io/qprocess_wince.cpp3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index b2bcbdf727..8d9908cd90 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -107,8 +107,6 @@ win32 {
!winrt {
SOURCES += io/qsettings_win.cpp
- HEADERS += io/qwindowspipewriter_p.h
- SOURCES += io/qwindowspipewriter.cpp
SOURCES += io/qstandardpaths_win.cpp
wince* {
@@ -117,11 +115,13 @@ win32 {
} else {
HEADERS += \
io/qwinoverlappedionotifier_p.h \
- io/qwindowspipereader_p.h
+ io/qwindowspipereader_p.h \
+ io/qwindowspipewriter_p.h
SOURCES += \
io/qprocess_win.cpp \
io/qwinoverlappedionotifier.cpp \
io/qwindowspipereader.cpp \
+ io/qwindowspipewriter.cpp \
io/qstorageinfo_win.cpp
LIBS += -lmpr
}
diff --git a/src/corelib/io/qprocess_wince.cpp b/src/corelib/io/qprocess_wince.cpp
index acacdb8540..050d6879db 100644
--- a/src/corelib/io/qprocess_wince.cpp
+++ b/src/corelib/io/qprocess_wince.cpp
@@ -33,7 +33,6 @@
#include "qprocess.h"
#include "qprocess_p.h"
-#include "qwindowspipewriter_p.h"
#include <qdir.h>
#include <qfileinfo.h>
@@ -156,7 +155,7 @@ void QProcessPrivate::startProcess()
}
// give the process a chance to start ...
- Sleep(SLEEPMIN * 2);
+ Sleep(20);
_q_startupNotification();
}