diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-06-20 14:10:17 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-07-03 05:32:51 +0000 |
| commit | 9656e972d194ab41bbb8aea82d77af62bcd647e8 (patch) | |
| tree | b9e2f1c05978456ed0e7df2773702dc289075c6b /src | |
| parent | eaee1209f0ead5be786e81db8aee604ccfea85b0 (diff) | |
Remove remains of wince in .pro files
Task-number: QTBUG-52590
Change-Id: I444fc9eedc8a8e4ad2ede224d66e7c410bedbb48
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libjpeg.pri | 6 | ||||
| -rw-r--r-- | src/3rdparty/zlib.pri | 1 | ||||
| -rw-r--r-- | src/dbus/dbus.pro | 4 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/kernel.pri | 9 |
5 files changed, 3 insertions, 19 deletions
diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri index 62077c99a9..118cc60bcc 100644 --- a/src/3rdparty/libjpeg.pri +++ b/src/3rdparty/libjpeg.pri @@ -1,9 +1,3 @@ -wince { - DEFINES += NO_GETENV - contains(CE_ARCH,x86):CONFIG -= stl exceptions - contains(CE_ARCH,x86):CONFIG += exceptions_off -} - winrt: DEFINES += NO_GETENV #Disable warnings in 3rdparty code due to unused arguments diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri index 363461220b..ccddb181e1 100644 --- a/src/3rdparty/zlib.pri +++ b/src/3rdparty/zlib.pri @@ -1,4 +1,3 @@ -wince: DEFINES += NO_ERRNO_H INCLUDEPATH = $$PWD/zlib $$INCLUDEPATH SOURCES+= \ $$PWD/zlib/adler32.c \ diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 3da35b1741..ce799e0951 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -9,8 +9,8 @@ qtConfig(dbus-linked) { } win32 { - wince: LIBS_PRIVATE += -lws2 - else:LIBS_PRIVATE += -lws2_32 \ + LIBS_PRIVATE += \ + -lws2_32 \ -ladvapi32 \ -lnetapi32 \ -luser32 diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 620d9cb8c9..6d62420bd6 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -9,5 +9,5 @@ qtHaveModule(gui) { !android:qtConfig(library): SUBDIRS *= generic } -!winrt:!wince:qtHaveModule(printsupport): \ +!winrt:qtHaveModule(printsupport): \ SUBDIRS += printsupport diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 3e3c795839..1bdcecbc81 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -67,15 +67,6 @@ macx: { SOURCES += kernel/qmacgesturerecognizer.cpp } -wince { - HEADERS += \ - ../corelib/kernel/qfunctions_wince.h \ - kernel/qwidgetsfunctions_wince.h - - SOURCES += \ - kernel/qwidgetsfunctions_wince.cpp -} - qtConfig(opengl) { HEADERS += kernel/qopenglwidget.h SOURCES += kernel/qopenglwidget.cpp |