AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix usage of wince scope

Browse Source 
Fix style issues along the way.

Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-06-03 17:04:53 +02:00
parent 92b3397a89
commit d32f47b703
92 changed files with 115 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/corelib/ipc/ipc.pro
View File

@ -3,4 +3,4 @@ requires(qtHaveModule(widgets))
TEMPLATE = subdirs
# no QSharedMemory
!vxworks:SUBDIRS = sharedmemory
!wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient
!wince:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient

4
examples/network/bearermonitor/bearermonitor.pro
View File

@ -12,8 +12,8 @@ FORMS = bearermonitor_240_320.ui \
bearermonitor_640_480.ui \
sessionwidget.ui
win32:!wince*:LIBS += -lws2_32
wince*:LIBS += -lws2
win32:!wince: LIBS += -lws2_32
wince: LIBS += -lws2
CONFIG += console

7
examples/opengl/opengl.pro
View File

@ -10,7 +10,8 @@ qtHaveModule(widgets) {
2dpainting \
hellogl2
!wince*: SUBDIRS += qopenglwidget \
cube \
textures
!wince: SUBDIRS += \
qopenglwidget \
cube \
textures
}

2
examples/qtconcurrent/imagescaling/imagescaling.pro
View File

@ -6,4 +6,4 @@ HEADERS += imagescaling.h
target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
INSTALLS += target
wince*: DEPLOYMENT_PLUGIN += qgif qjpeg
wince: DEPLOYMENT_PLUGIN += qgif qjpeg

2
examples/sql/books/books.pro
View File

@ -12,7 +12,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/books
INSTALLS += target
wince*: {
wince {
CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll
CONFIG(release, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll
sqlPlugins.path = sqldrivers

4
examples/sql/sql.pro
View File

@ -8,9 +8,9 @@ SUBDIRS = books \
relationaltablemodel \
sqlwidgetmapper
!wince*: SUBDIRS += masterdetail
!wince: SUBDIRS += masterdetail
!wince*: SUBDIRS += \
!wince: SUBDIRS += \
querymodel \
tablemodel

2
examples/sql/sqlbrowser/sqlbrowser.pro
View File

@ -17,6 +17,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser
INSTALLS += target
wince*: {
wince {
DEPLOYMENT_PLUGIN += qsqlite
}

2
examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
View File

@ -7,6 +7,6 @@ QT += sql widgets
target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
INSTALLS += target
wince*: DEPLOYMENT_PLUGIN += qsqlite
wince: DEPLOYMENT_PLUGIN += qsqlite

11
examples/widgets/dialogs/dialogs.pro
View File

@ -5,10 +5,13 @@ SUBDIRS = classwizard \
tabdialog \
trivialwizard
!wince*: SUBDIRS += licensewizard \
extension \
findfiles
!wince {
SUBDIRS += \
licensewizard \
extension \
findfiles
}
!qtHaveModule(printsupport): SUBDIRS -= licensewizard
contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
wince*: SUBDIRS += sipdialog
wince: SUBDIRS += sipdialog

2
examples/widgets/draganddrop/draganddrop.pro
View File

@ -5,4 +5,4 @@ SUBDIRS = draggableicons \
fridgemagnets \
puzzle
wince*: SUBDIRS -= dropsite
wince: SUBDIRS -= dropsite

2
examples/widgets/draganddrop/puzzle/puzzle.pro
View File

@ -15,7 +15,7 @@ QMAKE_PROJECT_NAME = dndpuzzle
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle
INSTALLS += target
wince*: {
wince {
addFile.files = example.jpg
addFile.path = .
DEPLOYMENT += addFile

2
examples/widgets/graphicsview/boxes/boxes.pro
View File

@ -25,6 +25,6 @@ RESOURCES += boxes.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes
INSTALLS += target
wince*: {
wince {
DEPLOYMENT_PLUGIN += qjpeg
}

2
examples/widgets/painting/affine/affine.pro
View File

@ -17,6 +17,6 @@ RESOURCES += affine.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
INSTALLS += target
wince*: {
wince {
DEPLOYMENT_PLUGIN += qjpeg
}

2
examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
View File

@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter
INSTALLS += target
wince*: {
wince {
addFiles.files = main.cpp mainwindow.cpp
addFiles.path = .
DEPLOYMENT += addFiles

2
examples/widgets/widgets/icons/icons.pro
View File

@ -17,7 +17,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons
INSTALLS += target
wince*: {
wince {
imageFiles.files = images/*
wincewm*: {
imageFiles.path = "/My Documents/My Pictures"

2
examples/widgets/widgets/imageviewer/imageviewer.pro
View File

@ -10,6 +10,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer
INSTALLS += target
wince*: {
wince {
DEPLOYMENT_PLUGIN += qjpeg qgif
}

2
examples/widgets/widgets/movie/movie.pro
View File

@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie
INSTALLS += target
wince*: {
wince {
addFiles.files += *.gif
addFiles.path = .
DEPLOYMENT += addFiles

2
examples/xml/dombookmarks/dombookmarks.pro
View File

@ -11,7 +11,7 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel
target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks
INSTALLS += target
wince*: {
wince {
addFiles.files = frank.xbel jennifer.xbel
addFiles.path = "\\My Documents"
DEPLOYMENT += addFiles

2
examples/xml/htmlinfo/htmlinfo.pro
View File

@ -6,7 +6,7 @@ RESOURCES = resources.qrc
win32: CONFIG += console
wince*:{
wince {
htmlfiles.files = *.html
htmlfiles.path = .
DEPLOYMENT += htmlfiles

2
examples/xml/saxbookmarks/saxbookmarks.pro
View File

@ -13,7 +13,7 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel
target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks
INSTALLS += target
wince*: {
wince {
addFiles.files = frank.xbel jennifer.xbel
addFiles.path = "\\My Documents"
DEPLOYMENT += addFiles

2
mkspecs/features/qt.prf
View File

@ -67,7 +67,7 @@ qtAddModules(QT_PRIVATE, LIBS_PRIVATE)
}
qtAddRpathLink($$QT $$QT_PRIVATE)
wince*:static:gui {
wince:static:gui {
QTLIB += qmenu_wce.res
}

2
mkspecs/features/qt_module.prf
View File

@ -67,7 +67,7 @@ header_module {
TEMPLATE = lib
}
DESTDIR = $$MODULE_BASE_OUTDIR/lib
win32:!wince*:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
win32:!wince:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin
CONFIG += qmake_cache target_qt

2
mkspecs/features/qt_plugin.prf
View File

@ -89,5 +89,5 @@ CONFIG += create_cmake
load(qt_targets)
load(qt_common)
wince*:LIBS += $$QMAKE_LIBS_GUI
wince: LIBS += $$QMAKE_LIBS_GUI
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF

2
src/3rdparty/libjpeg.pri vendored
View File

@ -1,4 +1,4 @@
wince*: {
wince {
DEFINES += NO_GETENV
contains(CE_ARCH,x86):CONFIG -= stl exceptions
contains(CE_ARCH,x86):CONFIG += exceptions_off

2
src/3rdparty/zlib.pri vendored
View File

@ -1,4 +1,4 @@
wince*: DEFINES += NO_ERRNO_H
wince: DEFINES += NO_ERRNO_H
INCLUDEPATH = $$PWD/zlib $$INCLUDEPATH
SOURCES+= \
$$PWD/zlib/adler32.c \

2
src/corelib/kernel/kernel.pri
View File

@ -84,7 +84,7 @@ win32 {
}
}
wince*: {
wince {
SOURCES += \
kernel/qfunctions_wince.cpp
HEADERS += \

2
src/dbus/dbus.pro
View File

@ -16,7 +16,7 @@ contains(QT_CONFIG, dbus-linked) {
}
win32 {
wince*:LIBS_PRIVATE += -lws2
wince: LIBS_PRIVATE += -lws2
else:LIBS_PRIVATE += -lws2_32 \
-ladvapi32 \
-lnetapi32 \

4
src/network/socket/socket.pri
View File

@ -43,7 +43,7 @@ win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp \
socket/qlocalsocket_win.cpp \
socket/qlocalserver_win.cpp
win32:!wince*:!winrt:LIBS_PRIVATE += -ladvapi32
win32:!wince:!winrt:LIBS_PRIVATE += -ladvapi32
winrt {
SOURCES += socket/qnativesocketengine_winrt.cpp \
@ -54,7 +54,7 @@ winrt {
DEFINES += QT_LOCALSOCKET_TCP
}
wince*: {
wince {
SOURCES -= socket/qlocalsocket_win.cpp \
socket/qlocalserver_win.cpp
SOURCES += socket/qlocalsocket_tcp.cpp \

2
src/plugins/bearer/bearer.pro
View File

@ -8,7 +8,7 @@ TEMPLATE = subdirs
#win32:SUBDIRS += nla
win32:SUBDIRS += generic
blackberry:SUBDIRS += blackberry
win32:!wince*:SUBDIRS += nativewifi
win32:!wince: SUBDIRS += nativewifi
mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
mac:SUBDIRS += generic
android:!android-no-sdk:SUBDIRS += android

16
src/plugins/platforms/windows/windows.pri
View File

@ -1,14 +1,14 @@
# Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
LIBS *= -lole32
!wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
!wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
mingw: LIBS *= -luuid
# For the dialog helpers:
!wince*:LIBS *= -lshlwapi -lshell32
!wince*:LIBS *= -ladvapi32
wince*:DEFINES *= QT_LIBINFIX=L"\"\\\"$${QT_LIBINFIX}\\\"\""
!wince: LIBS *= -lshlwapi -lshell32
!wince: LIBS *= -ladvapi32
wince: DEFINES *= QT_LIBINFIX=L"\"\\\"$${QT_LIBINFIX}\\\"\""
DEFINES *= QT_NO_CAST_FROM_ASCII
@ -103,22 +103,22 @@ contains(QT_CONFIG,dynamicgl) {
}
}
!wince*:!contains( DEFINES, QT_NO_TABLETEVENT ) {
!wince:!contains( DEFINES, QT_NO_TABLETEVENT ) {
INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/wintab
HEADERS += $$PWD/qwindowstabletsupport.h
SOURCES += $$PWD/qwindowstabletsupport.cpp
}
!wince*:!contains( DEFINES, QT_NO_SESSIONMANAGER ) {
!wince:!contains( DEFINES, QT_NO_SESSIONMANAGER ) {
SOURCES += $$PWD/qwindowssessionmanager.cpp
HEADERS += $$PWD/qwindowssessionmanager.h
}
!wince*:!contains( DEFINES, QT_NO_IMAGEFORMAT_PNG ) {
!wince:!contains( DEFINES, QT_NO_IMAGEFORMAT_PNG ) {
RESOURCES += $$PWD/cursors.qrc
}
!wince*: RESOURCES += $$PWD/openglblacklists.qrc
!wince: RESOURCES += $$PWD/openglblacklists.qrc
contains(QT_CONFIG, freetype) {
DEFINES *= QT_NO_FONTCONFIG

2
src/plugins/plugins.pro
View File

@ -5,4 +5,4 @@ SUBDIRS *= sqldrivers
qtHaveModule(gui): SUBDIRS *= imageformats platforms platforminputcontexts platformthemes generic
qtHaveModule(widgets): SUBDIRS *= styles
!winrt:!wince*:qtHaveModule(widgets):SUBDIRS += printsupport
!winrt:!wince:qtHaveModule(widgets): SUBDIRS += printsupport

2
src/src.pro
View File

@ -176,7 +176,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
SUBDIRS += src_opengl
src_plugins.depends += src_opengl
}
!wince*:!winrt {
!wince:!winrt {
SUBDIRS += src_printsupport
src_plugins.depends += src_printsupport
}

2
src/widgets/dialogs/dialogs.pri
View File

@ -25,7 +25,7 @@ win32 {
SOURCES += dialogs/qwizard_win.cpp
}
wince*: FORMS += dialogs/qfiledialog_embedded.ui
wince: FORMS += dialogs/qfiledialog_embedded.ui
else: FORMS += dialogs/qfiledialog.ui
INCLUDEPATH += $$PWD

2
src/widgets/kernel/kernel.pri
View File

@ -69,7 +69,7 @@ macx: {
SOURCES += kernel/qmacgesturerecognizer.cpp
}
wince*: {
wince {
HEADERS += \
../corelib/kernel/qfunctions_wince.h \
kernel/qwidgetsfunctions_wince.h

2
src/widgets/kernel/win.pri
View File

@ -2,6 +2,6 @@
# --------------------------------------------------------------------
INCLUDEPATH += ../3rdparty/wintab
!wince*:!winrt {
!wince:!winrt {
LIBS_PRIVATE *= -lshell32
}

2
src/widgets/util/util.pri
View File

@ -27,7 +27,7 @@ SOURCES += \
util/qundostack.cpp \
util/qundoview.cpp
win32:!wince*:!winrt {
win32:!wince:!winrt {
SOURCES += util/qsystemtrayicon_win.cpp
} else:contains(QT_CONFIG, xcb) {
SOURCES += util/qsystemtrayicon_x11.cpp

2
src/widgets/widgets.pro
View File

@ -1,5 +1,5 @@
TARGET = QtWidgets
wince*:ORIG_TARGET = $$TARGET
wince: ORIG_TARGET = $$TARGET
QT = core-private gui-private
MODULE_CONFIG = uic

2
src/widgets/widgets/widgets.pri
View File

@ -154,7 +154,7 @@ macx {
widgets/qmaccocoaviewcontainer_mac.mm
}
wince*: {
wince {
SOURCES += widgets/qmenu_wince.cpp
HEADERS += widgets/qmenu_wince_resource_p.h
RC_FILE = widgets/qmenu_wince.rc

2
src/winmain/winmain.pro
View File

@ -32,4 +32,4 @@ load(qt_targets)
load(qt_build_paths)
load(qt_common)
wince*:QMAKE_POST_LINK =
wince: QMAKE_POST_LINK =

2
tests/auto/auto.pro
View File

@ -21,7 +21,7 @@ installed_cmake.depends = cmake
ios: SUBDIRS = corelib gui
wince*: SUBDIRS -= printsupport
wince: SUBDIRS -= printsupport
cross_compile: SUBDIRS -= tools
!qtHaveModule(opengl): SUBDIRS -= opengl
!qtHaveModule(gui): SUBDIRS -= gui cmake

2
tests/auto/corelib/codecs/qtextcodec/qtextcodec.pro
View File

@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS = test
!wince*:SUBDIRS += echo
!wince: SUBDIRS += echo

2
tests/auto/corelib/io/largefile/largefile.pro
View File

@ -3,5 +3,5 @@ TARGET = tst_largefile
QT = core testlib
SOURCES = tst_largefile.cpp
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
wince: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/corelib/io/qfile/test/test.pro
View File

@ -7,7 +7,7 @@ else: DEFINES += QT_NO_NETWORK
TARGET = ../tst_qfile
SOURCES = ../tst_qfile.cpp
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
wince: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc

2
tests/auto/corelib/io/qfileinfo/qfileinfo.pro
View File

@ -5,5 +5,5 @@ SOURCES = tst_qfileinfo.cpp
RESOURCES += qfileinfo.qrc \
testdata.qrc
win32*:!wince*:!winrt:LIBS += -ladvapi32 -lnetapi32
win32:!wince:!winrt:LIBS += -ladvapi32 -lnetapi32
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

2
tests/auto/corelib/io/qprocess/testSoftExit/testSoftExit.pro
View File

@ -1,6 +1,6 @@
win32 {
SOURCES = main_win.cpp
!wince*:LIBS += -luser32
!wince: LIBS += -luser32
}
unix {
SOURCES = main_unix.cpp

2
tests/auto/corelib/kernel/qeventloop/qeventloop.pro
View File

@ -4,7 +4,7 @@ TARGET = tst_qeventloop
QT = core network testlib core-private
SOURCES = $$PWD/tst_qeventloop.cpp
win32:!wince*:!winrt:LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
contains(QT_CONFIG, glib): DEFINES += HAVE_GLIB

2
tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro
View File

@ -2,7 +2,7 @@ CONFIG -= app_bundle debug_and_release
CONFIG += console
DESTDIR = ./
QT = core
wince*: {
wince {
LIBS += coredll.lib
}

2
tests/auto/corelib/plugin/qlibrary/lib/lib.pro
View File

@ -6,7 +6,7 @@ TARGET = mylib
DESTDIR = ../
QT = core
wince*: DEFINES += WIN32_MSVC
wince: DEFINES += WIN32_MSVC
win32-msvc: DEFINES += WIN32_MSVC
# This project is testdata for tst_qlibrary

2
tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
View File

@ -7,7 +7,7 @@ DESTDIR = ../
VERSION = 2
QT = core
wince*: DEFINES += WIN32_MSVC
wince: DEFINES += WIN32_MSVC
win32-msvc: DEFINES += WIN32_MSVC
# Force a copy of the library to have an extension that is non-standard.

2
tests/auto/corelib/tools/qsharedpointer/externaltests.pri
View File

@ -4,4 +4,4 @@ cleanedQMAKESPEC = $$replace(QMAKESPEC, \\\\, /)
DEFINES += DEFAULT_MAKESPEC=\\\"$$cleanedQMAKESPEC\\\"
cross_compile:DEFINES += QTEST_NO_RTTI QTEST_CROSS_COMPILED
wince*:DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI
wince: DEFINES += QTEST_CROSS_COMPILED QTEST_NO_RTTI

2
tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
View File

@ -4,7 +4,7 @@ TARGET = tst_qicoimageformat
SOURCES+= tst_qicoimageformat.cpp
QT += testlib
wince*: {
wince {
CONFIG(debug, debug|release):{
addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qico4d.dll
} else {

2
tests/auto/gui/image/qpixmap/qpixmap.pro
View File

@ -5,7 +5,7 @@ QT += core-private gui-private testlib
qtHaveModule(widgets): QT += widgets widgets-private
SOURCES += tst_qpixmap.cpp
!wince*:!winrt {
!wince:!winrt {
win32:LIBS += -lgdi32 -luser32
}

2
tests/auto/gui/kernel/qwindow/qwindow.pro
View File

@ -5,4 +5,4 @@ QT += core-private gui-private testlib
SOURCES += tst_qwindow.cpp
contains(QT_CONFIG,dynamicgl):win32:!wince*:!winrt: LIBS += -luser32
contains(QT_CONFIG,dynamicgl):win32:!wince:!winrt: LIBS += -luser32

2
tests/auto/network/access/qftp/qftp.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qftp.cpp
requires(contains(QT_CONFIG,private_tests))
QT = core network network-private testlib
wince*: {
wince {
addFiles.files = rfc3252.txt
addFiles.path = .
DEPLOYMENT += addFiles

2
tests/auto/network/access/qnetworkreply/qnetworkreply.pro
View File

@ -1,5 +1,5 @@
TEMPLATE = subdirs
!wince*:SUBDIRS += echo
!wince: SUBDIRS += echo
test.depends += $$SUBDIRS
SUBDIRS += test

2
tests/auto/network/kernel/qhostaddress/qhostaddress.pro
View File

@ -7,7 +7,7 @@ SOURCES += tst_qhostaddress.cpp
QT = core network testlib
win32: {
wince*: {
wince {
LIBS += -lws2
} else {
LIBS += -lws2_32

2
tests/auto/network/kernel/qhostinfo/qhostinfo.pro
View File

@ -6,7 +6,7 @@ SOURCES += tst_qhostinfo.cpp
requires(contains(QT_CONFIG,private_tests))
QT = core-private network-private testlib
wince*: {
wince {
LIBS += ws2.lib
} else {
win32:LIBS += -lws2_32

2
tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
View File

@ -5,7 +5,7 @@ QNETWORK_SRC = $$QT_SOURCE_TREE/src/network
INCLUDEPATH += $$QNETWORK_SRC
win32 {
wince*: {
wince {
LIBS += -lws2
} else {
LIBS += -lws2_32

2
tests/auto/network/socket/qtcpserver/test/test.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
SOURCES += ../tst_qtcpserver.cpp
win32: {
wince*: {
wince {
LIBS += -lws2
crashApp.files = ../crashingServer/crashingServer.exe
crashApp.path = crashingServer

5
tests/auto/network/socket/qtcpsocket/qtcpsocket.pro
View File

@ -1,7 +1,6 @@
TEMPLATE = subdirs
!wince*: SUBDIRS = test stressTest
wince*|vxworks* : SUBDIRS = test
SUBDIRS = test
!wince:!vxworks: SUBDIRS += stressTest
requires(contains(QT_CONFIG,private_tests))

2
tests/auto/network/socket/qtcpsocket/test/test.pro
View File

@ -3,7 +3,7 @@ CONFIG += testcase
QT = core-private network-private testlib
SOURCES += ../tst_qtcpsocket.cpp
win32: {
wince*: {
wince {
LIBS += -lws2
} else {
LIBS += -lws2_32

2
tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslcertificate.cpp
!wince*:win32:LIBS += -lws2_32
!wince:win32:LIBS += -lws2_32
QT = core network testlib
TARGET = tst_qsslcertificate

2
tests/auto/network/ssl/qsslcipher/qsslcipher.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslcipher.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core network testlib
TARGET = tst_qsslcipher

2
tests/auto/network/ssl/qsslellipticcurve/qsslellipticcurve.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslellipticcurve.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core network testlib
TARGET = tst_qsslellipticcurve

2
tests/auto/network/ssl/qsslerror/qsslerror.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslerror.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core network testlib
TARGET = tst_qsslerror

2
tests/auto/network/ssl/qsslkey/qsslkey.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslkey.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core network testlib
contains(QT_CONFIG, private_tests) {
QT += core-private network-private

2
tests/auto/network/ssl/qsslsocket/qsslsocket.pro
View File

@ -1,7 +1,7 @@
CONFIG += testcase
SOURCES += tst_qsslsocket.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core core-private network-private testlib
TARGET = tst_qsslsocket

2
tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
View File

@ -3,7 +3,7 @@ CONFIG += parallel_test
testcase.timeout = 300 # this test is slow
SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core core-private network-private testlib
TARGET = tst_qsslsocket_onDemandCertificates_member

2
tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
View File

@ -2,7 +2,7 @@ CONFIG += testcase
CONFIG += parallel_test
SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
QT = core core-private network-private testlib
TARGET = tst_qsslsocket_onDemandCertificates_static

2
tests/auto/other/other.pro
View File

@ -58,7 +58,7 @@ wince*|!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility
macplist \
qaccessibilitymac
!embedded|wince*: SUBDIRS -= \
!embedded|wince: SUBDIRS -= \
qdirectpainter
winrt: SUBDIRS -= \

2
tests/auto/other/qaccessibility/qaccessibility.pro
View File

@ -7,7 +7,7 @@ HEADERS += accessiblewidgets.h
unix:!mac:!haiku:LIBS+=-lm
wince*: {
wince {
accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
accessneeded.path = accessible
DEPLOYMENT += accessneeded

2
tests/auto/sql/kernel/qsql/qsql.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsql.cpp
QT = core-private sql-private testlib
wince*: {
wince {
DEPLOYMENT_PLUGIN += qsqlite
}
mingw: LIBS += -lws2_32

4
tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
View File

@ -5,11 +5,11 @@ SOURCES += tst_qsqldatabase.cpp
QT = core sql testlib core-private sql-private
win32: {
!wince*: LIBS += -lws2_32
!wince: LIBS += -lws2_32
else: LIBS += -lws2
}
wince*: {
wince {
DEPLOYMENT_PLUGIN += qsqlite
testData.files = testdata

2
tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsqldriver.cpp
QT = core sql testlib core-private sql-private
wince*: {
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles

4
tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
View File

@ -5,9 +5,9 @@ SOURCES += tst_qsqlquery.cpp
QT = core sql testlib core-private sql-private
!wince*:win32:LIBS += -lws2_32
win32:!wince: LIBS += -lws2_32
wince*: {
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles

2
tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsqlthread.cpp
QT = core sql testlib core-private sql-private
wince*: {
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles

2
tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsqlquerymodel.cpp
QT += widgets sql testlib core-private sql-private
wince*: {
wince {
DEPLOYMENT_PLUGIN += qsqlite
LIBS += -lws2
} else {

2
tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsqlrelationaltablemodel.cpp
QT = core sql testlib core-private sql-private
wince*: {
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles

2
tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
View File

@ -5,7 +5,7 @@ SOURCES += tst_qsqltablemodel.cpp
QT = core core-private sql sql-private testlib
wince*: {
wince {
plugFiles.files = ../../../plugins/sqldrivers
plugFiles.path = .
DEPLOYMENT += plugFiles

2
tests/auto/widgets/effects/qpixmapfilter/qpixmapfilter.pro
View File

@ -7,7 +7,7 @@ QT += gui-private
SOURCES += tst_qpixmapfilter.cpp
wince*: {
wince {
addFiles.files = noise.png
addFiles.path = .
DEPLOYMENT += addFiles

2
tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
View File

@ -5,5 +5,5 @@ QT += core-private gui-private
SOURCES += tst_qgraphicsitem.cpp
DEFINES += QT_NO_CAST_TO_ASCII
win32:!wince*:!winrt: LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
View File

@ -4,9 +4,9 @@ QT += widgets widgets-private testlib
QT += core-private gui-private
SOURCES += tst_qgraphicsscene.cpp
RESOURCES += images.qrc
win32:!wince*:!winrt: LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32
!wince*:DEFINES += SRCDIR=\\\"$$PWD\\\"
!wince: DEFINES += SRCDIR=\\\"$$PWD\\\"
DEFINES += QT_NO_CAST_TO_ASCII
wince* {

2
tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
View File

@ -13,7 +13,7 @@ wince* {
DEPLOYMENT += addit tests sourceFile
}
android|wince*: {
android|wince {
DEFINES += SRCDIR=\\\"./\\\"
} else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"

2
tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
View File

@ -3,4 +3,4 @@ TARGET = tst_qitemdelegate
QT += widgets testlib
SOURCES += tst_qitemdelegate.cpp
win32:!wince*:!winrt: LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32

2
tests/auto/widgets/itemviews/qlistview/qlistview.pro
View File

@ -2,4 +2,4 @@ CONFIG += testcase
TARGET = tst_qlistview
QT += widgets gui-private widgets-private core-private testlib
SOURCES += tst_qlistview.cpp
win32:!wince*:!winrt: LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32

2
tests/auto/widgets/kernel/qapplication/qapplication.pro
View File

@ -2,6 +2,6 @@ TEMPLATE = subdirs
SUBDIRS = desktopsettingsaware modal
win32:!wince*:SUBDIRS += wincmdline
win32:!wince: SUBDIRS += wincmdline
test.depends += $$SUBDIRS
SUBDIRS += test

2
tests/auto/widgets/kernel/qapplication/test/test.pro
View File

@ -10,6 +10,6 @@ TARGET = ../tst_qapplication
TESTDATA = ../test/test.pro ../tmp/README
SUBPROGRAMS = desktopsettingsaware modal
win32: !wince*: SUBPROGRAMS += wincmdline
win32:!wince: SUBPROGRAMS += wincmdline
for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"

2
tests/auto/widgets/kernel/qwidget/qwidget.pro
View File

@ -20,4 +20,4 @@ x11 {
LIBS += $$QMAKE_LIBS_X11
}
!wince*:win32:!winrt: LIBS += -luser32 -lgdi32
win32:!wince:!winrt: LIBS += -luser32 -lgdi32

2
tests/auto/widgets/styles/styles.pro
View File

@ -12,5 +12,5 @@ SUBDIRS=\
!mac:SUBDIRS -= \
qmacstyle \
ios|android|qnx|*wince*:SUBDIRS -= \
ios|android|qnx|wince: SUBDIRS -= \
qstylesheetstyle \

2
tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
View File

@ -8,4 +8,4 @@ INCLUDEPATH += ../
HEADERS +=
SOURCES += tst_qtabwidget.cpp
win32:!wince*:!winrt:LIBS += -luser32
win32:!wince:!winrt: LIBS += -luser32

2
tests/benchmarks/gui/image/qimagereader/qimagereader.pro
View File

@ -9,7 +9,7 @@ SOURCES += tst_qimagereader.cpp
!contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG
QT += network
wince*: {
wince {
addFiles.files = images
addFiles.path = .

2
tests/manual/manual.pro
View File

@ -58,7 +58,7 @@ contains(QT_CONFIG, opengl) {
win32 {
SUBDIRS -= network_remote_stresstest network_stresstest
# disable some tests on wince because of missing dependencies
wince*:SUBDIRS -= lance windowmodality
wince: SUBDIRS -= lance windowmodality
}
lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \