Remove Windows CE.

Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses.

Task-number: QTBUG-51673
Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>

11 files changed, 13 insertions, 90 deletions

diff --git a/config.tests/directshow/directshow.pro b/config.tests/directshow/directshow.pro
index 6dfc54a01..6493e54ab 100644
--- a/config.tests/directshow/directshow.pro
+++ b/config.tests/directshow/directshow.pro
@@ -3,4 +3,4 @@ CONFIG += console
 
 SOURCES += main.cpp
 
-!wince: LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
+LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
diff --git a/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp
index bb9a304ec..25e36f966 100644
--- a/config.tests/directshow/main.cpp
+++ b/config.tests/directshow/main.cpp
@@ -27,10 +27,8 @@
 ****************************************************************************/
 
 #include <dshow.h>
-#ifndef _WIN32_WCE
 #include <d3d9.h>
 #include <vmr9.h>
-#endif
 
 int main(int, char**)
 {
diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h
index 602116976..0a65b9f53 100644
--- a/src/multimedia/qmediaopenglhelper_p.h
+++ b/src/multimedia/qmediaopenglhelper_p.h
@@ -72,7 +72,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
 #else
     bool isANGLE = false;
 
-# if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
+# if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
         // Although unlikely, technically LibGLES could mean a non-ANGLE EGL/GLES2 implementation too.
         // Verify that it is indeed ANGLE.
@@ -104,7 +104,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
 #  endif // QT_OPENGL_ES_2_ANGLE_STATIC
 
     }
-# endif // Q_OS_WIN && !Q_OS_WINCE && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
+# endif // Q_OS_WIN && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
 
     return isANGLE;
 #endif // Q_OS_WINRT
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 117b02ade..280b52619 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -13,7 +13,7 @@ SOURCES += dsserviceplugin.cpp
 mingw: DEFINES += NO_DSHOW_STRSAFE
 
 !config_wmf: include(player/player.pri)
-!wince: include(camera/camera.pri)
+include(camera/camera.pri)
 
 OTHER_FILES += \
     directshow.json \
diff --git a/src/plugins/directshow/player/directshowplayerservice.cpp b/src/plugins/directshow/player/directshowplayerservice.cpp
index 7c2cd8a9a..f5691012c 100644
--- a/src/plugins/directshow/player/directshowplayerservice.cpp
+++ b/src/plugins/directshow/player/directshowplayerservice.cpp
@@ -47,11 +47,9 @@
 
 #include "directshowplayerservice.h"
 
-#ifndef Q_OS_WINCE
 #include "directshowaudioendpointcontrol.h"
 #include "directshowmetadatacontrol.h"
 #include "vmr9videowindowcontrol.h"
-#endif
 #include "directshowiosource.h"
 #include "directshowplayercontrol.h"
 #include "directshowvideorenderercontrol.h"
@@ -96,14 +94,10 @@ private:
 DirectShowPlayerService::DirectShowPlayerService(QObject *parent)
     : QMediaService(parent)
     , m_playerControl(0)
-#ifndef Q_OS_WINCE
     , m_metaDataControl(0)
-#endif
     , m_videoRendererControl(0)
-#ifndef Q_OS_WINCE
     , m_videoWindowControl(0)
     , m_audioEndpointControl(0)
-#endif
     , m_taskThread(0)
     , m_loop(qt_directShowEventLoop())
     , m_pendingTasks(0)
@@ -127,10 +121,8 @@ DirectShowPlayerService::DirectShowPlayerService(QObject *parent)
     , m_dontCacheNextSeekResult(false)
 {
     m_playerControl = new DirectShowPlayerControl(this);
-#ifndef Q_OS_WINCE
     m_metaDataControl = new DirectShowMetaDataControl(this);
     m_audioEndpointControl = new DirectShowAudioEndpointControl(this);
-#endif
 
     m_taskThread = new DirectShowPlayerServiceThread(this);
     m_taskThread->start();
@@ -161,14 +153,10 @@ DirectShowPlayerService::~DirectShowPlayerService()
     }
 
     delete m_playerControl;
-#ifndef Q_OS_WINCE
     delete m_audioEndpointControl;
     delete m_metaDataControl;
-#endif
     delete m_videoRendererControl;
-#ifndef Q_OS_WINCE
     delete m_videoWindowControl;
-#endif
 
     ::CloseHandle(m_taskHandle);
 }
@@ -177,18 +165,12 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 {
     if (qstrcmp(name, QMediaPlayerControl_iid) == 0) {
         return m_playerControl;
-#ifndef Q_OS_WINCE
     } else if (qstrcmp(name, QAudioOutputSelectorControl_iid) == 0) {
         return m_audioEndpointControl;
     } else if (qstrcmp(name, QMetaDataReaderControl_iid) == 0) {
         return m_metaDataControl;
-#endif
     } else if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
-        if (!m_videoRendererControl
-#ifndef Q_OS_WINCE
-            && !m_videoWindowControl
-#endif
-            ){
+        if (!m_videoRendererControl && !m_videoWindowControl) {
             m_videoRendererControl = new DirectShowVideoRendererControl(m_loop);
 
             connect(m_videoRendererControl, SIGNAL(filterChanged()),
@@ -196,7 +178,6 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 
             return m_videoRendererControl;
         }
-#ifndef Q_OS_WINCE
     } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
         if (!m_videoRendererControl && !m_videoWindowControl) {
             IBaseFilter *filter;
@@ -219,7 +200,6 @@ QMediaControl *DirectShowPlayerService::requestControl(const char *name)
 
             return m_videoWindowControl;
         }
-#endif
     }
     return 0;
 }
@@ -235,14 +215,12 @@ void DirectShowPlayerService::releaseControl(QMediaControl *control)
         delete m_videoRendererControl;
 
         m_videoRendererControl = 0;
-#ifndef Q_OS_WINCE
     } else if (control == m_videoWindowControl) {
         setVideoOutput(0);
 
         delete m_videoWindowControl;
 
         m_videoWindowControl = 0;
-#endif
     }
 }
 
@@ -268,9 +246,7 @@ void DirectShowPlayerService::load(const QMediaContent &media, QIODevice *stream
     m_seekable = false;
     m_atEnd = false;
     m_dontCacheNextSeekResult = false;
-#ifndef Q_OS_WINCE
     m_metaDataControl->reset();
-#endif
 
     if (m_resources.isEmpty() && !stream) {
         m_pendingTasks = 0;
@@ -1174,9 +1150,7 @@ void DirectShowPlayerService::customEvent(QEvent *event)
         QMutexLocker locker(&m_mutex);
 
         m_playerControl->updateMediaInfo(m_duration, m_streamTypes, m_seekable);
-#ifndef Q_OS_WINCE
         m_metaDataControl->updateMetadata(m_graph, m_source, m_url.toString());
-#endif
 
         updateStatus();
     } else if (event->type() == QEvent::Type(Error)) {
diff --git a/src/plugins/directshow/player/directshowplayerservice.h b/src/plugins/directshow/player/directshowplayerservice.h
index 9419a8a99..b8d30e79a 100644
--- a/src/plugins/directshow/player/directshowplayerservice.h
+++ b/src/plugins/directshow/player/directshowplayerservice.h
@@ -176,14 +176,10 @@ private:
     };
 
     DirectShowPlayerControl *m_playerControl;
-#ifndef Q_OS_WINCE
     DirectShowMetaDataControl *m_metaDataControl;
-#endif
     DirectShowVideoRendererControl *m_videoRendererControl;
-#ifndef Q_OS_WINCE
     QVideoWindowControl *m_videoWindowControl;
     DirectShowAudioEndpointControl *m_audioEndpointControl;
-#endif
 
     QThread *m_taskThread;
     DirectShowEventLoop *m_loop;
diff --git a/src/plugins/directshow/player/player.pri b/src/plugins/directshow/player/player.pri
index c5fb8442a..0bc9c6d0a 100644
--- a/src/plugins/directshow/player/player.pri
+++ b/src/plugins/directshow/player/player.pri
@@ -1,7 +1,6 @@
 INCLUDEPATH += $$PWD
 
-LIBS += -lstrmiids -ldmoguids -luuid -lole32 -loleaut32
-!wince: LIBS += -lmsdmo -lgdi32
+LIBS += -lstrmiids -ldmoguids -luuid -lole32 -loleaut32 -lmsdmo -lgdi32
 
 
 qtHaveModule(widgets): QT += widgets
@@ -21,7 +20,10 @@ HEADERS += \
         $$PWD/directshowsamplescheduler.h \
         $$PWD/directshowvideorenderercontrol.h \
         $$PWD/mediasamplevideobuffer.h \
-        $$PWD/videosurfacefilter.h
+        $$PWD/videosurfacefilter.h \
+        $$PWD/directshowaudioendpointcontrol.h \
+        $$PWD/directshowmetadatacontrol.h \
+        $$PWD/vmr9videowindowcontrol.h
 
 SOURCES += \
         $$PWD/directshoweventloop.cpp \
@@ -35,19 +37,10 @@ SOURCES += \
         $$PWD/directshowsamplescheduler.cpp \
         $$PWD/directshowvideorenderercontrol.cpp \
         $$PWD/mediasamplevideobuffer.cpp \
-        $$PWD/videosurfacefilter.cpp
-
-!wince {
-HEADERS += \
-        $$PWD/directshowaudioendpointcontrol.h \
-        $$PWD/directshowmetadatacontrol.h \
-        $$PWD/vmr9videowindowcontrol.h
-
-SOURCES += \
+        $$PWD/videosurfacefilter.cpp \
         $$PWD/directshowaudioendpointcontrol.cpp \
         $$PWD/directshowmetadatacontrol.cpp \
         $$PWD/vmr9videowindowcontrol.cpp
-}
 
 config_evr {
     DEFINES += HAVE_EVR
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 67b06a61b..8cc925bc2 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -25,7 +25,7 @@ qnx:!blackberry {
     SUBDIRS += qnx-audio
 }
 
-win32:!winrt:!wince {
+win32:!winrt {
     SUBDIRS += audiocapture \
                windowsaudio
 
diff --git a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
index 9aa4487ab..ca79ebbec 100644
--- a/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
@@ -400,7 +400,6 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode)
     Q_UNUSED(mode)
 
     QList<QByteArray> devices;
-#ifndef Q_OS_WINCE
     //enumerate device fullnames through directshow api
     CoInitialize(NULL);
     ICreateDevEnum *pDevEnum = NULL;
@@ -454,35 +453,6 @@ QList<QByteArray> QWindowsAudioDeviceInfo::availableDevices(QAudio::Mode mode)
         pDevEnum->Release();
     }
     CoUninitialize();
-#else // Q_OS_WINCE
-    if (mode == QAudio::AudioOutput) {
-        WAVEOUTCAPS woc;
-        unsigned long iNumDevs,i;
-        iNumDevs = waveOutGetNumDevs();
-        for (i=0;i<iNumDevs;i++) {
-            if (waveOutGetDevCaps(i, &woc, sizeof(WAVEOUTCAPS))
-                == MMSYSERR_NOERROR) {
-                QByteArray  device;
-                QDataStream ds(&device, QIODevice::WriteOnly);
-                ds << quint32(i) << QString::fromWCharArray(woc.szPname);
-                devices.append(device);
-            }
-        }
-    } else {
-        WAVEINCAPS woc;
-        unsigned long iNumDevs,i;
-        iNumDevs = waveInGetNumDevs();
-        for (i=0;i<iNumDevs;i++) {
-            if (waveInGetDevCaps(i, &woc, sizeof(WAVEINCAPS))
-                == MMSYSERR_NOERROR) {
-                QByteArray  device;
-                QDataStream ds(&device, QIODevice::WriteOnly);
-                ds << quint32(i) << QString::fromWCharArray(woc.szPname);
-                devices.append(device);
-            }
-        }
-    }
-#endif // !Q_OS_WINCE
 
     return devices;
 }
diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro
index ce64847dc..6d5fe9495 100644
--- a/src/plugins/windowsaudio/windowsaudio.pro
+++ b/src/plugins/windowsaudio/windowsaudio.pro
@@ -1,8 +1,7 @@
 TARGET = qtaudio_windows
 QT += multimedia-private
 
-LIBS += -lstrmiids -lole32 -loleaut32
-!wince*:LIBS += -lwinmm
+LIBS += -lstrmiids -lole32 -loleaut32 -lwinmm
 
 HEADERS += \
     qwindowsaudioplugin.h \
diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
index 26f232010..90b02ac59 100644
--- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+++ b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
@@ -4,10 +4,3 @@ TARGET = tst_qmediapluginloader
 QT += multimedia-private testlib
 
 SOURCES += tst_qmediapluginloader.cpp
-
-wince* {
-    PLUGIN_DEPLOY.sources = $$OUTPUT_DIR/plugins/mediaservice/*.dll
-    PLUGIN_DEPLOY.path = mediaservice
-    DEPLOYMENT += PLUGIN_DEPLOY
-}
-