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

Replace Q_WS_WINCE against Q_OS_WINCE.

Browse Source 
Window system Macros where deprecated so use
Q_OS_WINCE for now. This code will need
some refactoring, but this is the first
step to it.

Change-Id: I5876b80ee45d4b38ac63fc7d51e775dc70bbd485
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Andreas Holzammer 2012-02-09 09:55:09 +01:00 committed by Qt by Nokia
parent adfca27ac0
commit ef7fd67845
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qfiledialog.cpp
View File

@ -59,7 +59,7 @@
#include <qdebug.h>
#include <qapplication.h>
#include <qstylepainter.h>
#if !defined(Q_WS_WINCE)
#if !defined(Q_OS_WINCE)
#include "ui_qfiledialog.h"
#else
#define Q_EMBEDDED_SMALLSCREEN

2
src/widgets/itemviews/qfileiconprovider.cpp
View File

@ -429,7 +429,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
return icon;
#endif
if (info.isRoot())
#if defined (Q_OS_WIN) && !defined(Q_WS_WINCE)
#if defined (Q_OS_WIN) && !defined(Q_OS_WINCE)
{
UINT type = GetDriveType((wchar_t *)info.absoluteFilePath().utf16());

2
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -5850,7 +5850,7 @@ void tst_QNetworkReply::getFromHttpIntoBuffer2()
QFETCH(bool, useDownloadBuffer);
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
#if defined(Q_WS_WINCE_WM)
#if defined(Q_OS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else

2
tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
View File

@ -440,7 +440,7 @@ public slots:
void tst_QDialog::throwInExec()
{
#if defined(Q_OS_MAC) || (defined(Q_WS_WINCE) && defined(_ARM_))
#if defined(Q_OS_MAC) || (defined(Q_OS_WINCE) && defined(_ARM_))
QSKIP("Throwing exceptions in exec() is not supported on this platform.");
#endif
#if defined(Q_OS_LINUX)

2
tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
View File

@ -152,7 +152,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
{
// since the style will influence the results, we have to ensure
// that the tests are run using the same style on all platforms
#if defined (Q_WS_WINCE)
#if defined (Q_OS_WINCE)
QApplication::setStyle(new QWindowsStyle);
#else
QApplication::setStyle(new QPlastiqueStyle);

2
tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
View File

@ -538,7 +538,7 @@ void tst_QMainWindow::menuBar()
mw.setMenuBar(mb1);
QVERIFY(mw.menuBar() != 0);
QCOMPARE(mw.menuBar(), (QMenuBar *)mb1);
#ifdef Q_WS_WINCE_WM
#ifdef Q_OS_WINCE_WM
QSKIP("With native menubar integration the menubar is not a child");
#endif
QCOMPARE(mb1->parentWidget(), (QWidget *)&mw);

2
tests/benchmarks/corelib/io/qfile/main.cpp
View File

@ -542,7 +542,7 @@ void tst_qfile::createSmallFiles()
dir.cd("tst");
tmpDirName = dir.absolutePath();
#if defined(Q_WS_WINCE)
#if defined(Q_OS_WINCE)
for (int i = 0; i < 100; ++i)
#else
for (int i = 0; i < 1000; ++i)

2
tests/benchmarks/corelib/tools/containers-sequential/main.cpp
View File

@ -133,7 +133,7 @@ struct Large { // A "large" item type
};
// Embedded devices typically have limited memory
#if defined(Q_WS_WINCE)
#if defined(Q_OS_WINCE)
# define LARGE_MAX_SIZE 2000
#else
# define LARGE_MAX_SIZE 20000

2
tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
View File

@ -414,7 +414,7 @@ void tst_QGraphicsView::chipTester_data()
void tst_QGraphicsView::chipTester()
{
#ifdef Q_WS_WINCE_WM
#ifdef Q_OS_WINCE_WM
QSKIP("WinCE WM: Fails on Windows Mobile w/o OpenGL");
#endif
QFETCH(bool, antialias);

6
tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -565,7 +565,7 @@ void tst_qnetworkreply::uploadPerformance()
void tst_qnetworkreply::httpUploadPerformance()
{
#if defined(Q_WS_WINCE_WM)
#if defined(Q_OS_WINCE_WM)
// Show some mercy for non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
@ -636,7 +636,7 @@ void tst_qnetworkreply::httpDownloadPerformance()
{
QFETCH(bool, serverSendsContentLength);
QFETCH(bool, chunkedEncoding);
#if defined(Q_WS_WINCE_WM)
#if defined(Q_OS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else
@ -720,7 +720,7 @@ void tst_qnetworkreply::httpDownloadPerformanceDownloadBuffer()
QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType);
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
#if defined(Q_WS_WINCE_WM)
#if defined(Q_OS_WINCE_WM)
// Show some mercy to non-desktop platform/s
enum {UploadSize = 4*1024*1024}; // 4 MB
#else

2
tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
View File

@ -173,7 +173,7 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
return;
#if defined(Q_WS_WINCE_WM)
#if defined(Q_OS_WINCE_WM)
QSKIP("WinCE WM: Not yet supported");
#endif