diff options
| -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 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfileinfo/qfileinfo.pro | 2 | ||||
| -rw-r--r-- | tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro | 10 |
9 files changed, 5 insertions, 32 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 diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f4ab0d8464..0f8129cb74 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -21,7 +21,6 @@ installed_cmake.depends = cmake uikit: SUBDIRS = corelib gui -wince: SUBDIRS -= printsupport cross_compile: SUBDIRS -= tools cmake installed_cmake else:!qtConfig(process): SUBDIRS -= tools !qtHaveModule(opengl): SUBDIRS -= opengl diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro index 48673b20a9..496729f9f1 100644 --- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro @@ -5,4 +5,4 @@ SOURCES = tst_qfileinfo.cpp RESOURCES += qfileinfo.qrc \ testdata.qrc -win32:!wince:!winrt:LIBS += -ladvapi32 -lnetapi32 +win32:!winrt: LIBS += -ladvapi32 -lnetapi32 diff --git a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro b/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro index b8053f9eb3..dee95886e0 100644 --- a/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro +++ b/tests/auto/network/ssl/qssldiffiehellmanparameters/qssldiffiehellmanparameters.pro @@ -2,7 +2,7 @@ CONFIG += testcase CONFIG += parallel_test SOURCES += tst_qssldiffiehellmanparameters.cpp -!wince*:win32:LIBS += -lws2_32 +win32: LIBS += -lws2_32 QT = core network testlib TARGET = tst_qssldiffiehellmanparameters diff --git a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro index 61939983e6..3527b424c1 100644 --- a/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro +++ b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro @@ -6,16 +6,6 @@ SOURCES += tst_qdirmodel.cpp INCLUDEPATH += ../../../../shared/ HEADERS += ../../../../shared/emulationdetector.h -wince* { - addit.files = dirtest\\test1\\* - addit.path = dirtest\\test1 - tests.files = test\\* - tests.path = test - sourceFile.files = tst_qdirmodel.cpp - sourceFile.path = . - DEPLOYMENT += addit tests sourceFile -} - android { DEFINES += SRCDIR=\\\"./\\\" } else { |