Replace Q_WS_WINCE against Q_OS_WINCE.
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:
parent
adfca27ac0
commit
ef7fd67845
@ -59,7 +59,7 @@
|
|||||||
#include <qdebug.h>
|
#include <qdebug.h>
|
||||||
#include <qapplication.h>
|
#include <qapplication.h>
|
||||||
#include <qstylepainter.h>
|
#include <qstylepainter.h>
|
||||||
#if !defined(Q_WS_WINCE)
|
#if !defined(Q_OS_WINCE)
|
||||||
#include "ui_qfiledialog.h"
|
#include "ui_qfiledialog.h"
|
||||||
#else
|
#else
|
||||||
#define Q_EMBEDDED_SMALLSCREEN
|
#define Q_EMBEDDED_SMALLSCREEN
|
||||||
|
@ -429,7 +429,7 @@ QIcon QFileIconProvider::icon(const QFileInfo &info) const
|
|||||||
return icon;
|
return icon;
|
||||||
#endif
|
#endif
|
||||||
if (info.isRoot())
|
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());
|
UINT type = GetDriveType((wchar_t *)info.absoluteFilePath().utf16());
|
||||||
|
|
||||||
|
@ -5850,7 +5850,7 @@ void tst_QNetworkReply::getFromHttpIntoBuffer2()
|
|||||||
QFETCH(bool, useDownloadBuffer);
|
QFETCH(bool, useDownloadBuffer);
|
||||||
|
|
||||||
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
|
// 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
|
// Show some mercy to non-desktop platform/s
|
||||||
enum {UploadSize = 4*1024*1024}; // 4 MB
|
enum {UploadSize = 4*1024*1024}; // 4 MB
|
||||||
#else
|
#else
|
||||||
|
@ -440,7 +440,7 @@ public slots:
|
|||||||
|
|
||||||
void tst_QDialog::throwInExec()
|
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.");
|
QSKIP("Throwing exceptions in exec() is not supported on this platform.");
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
|
@ -152,7 +152,7 @@ void tst_QGraphicsLinearLayout::initTestCase()
|
|||||||
{
|
{
|
||||||
// since the style will influence the results, we have to ensure
|
// since the style will influence the results, we have to ensure
|
||||||
// that the tests are run using the same style on all platforms
|
// 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);
|
QApplication::setStyle(new QWindowsStyle);
|
||||||
#else
|
#else
|
||||||
QApplication::setStyle(new QPlastiqueStyle);
|
QApplication::setStyle(new QPlastiqueStyle);
|
||||||
|
@ -538,7 +538,7 @@ void tst_QMainWindow::menuBar()
|
|||||||
mw.setMenuBar(mb1);
|
mw.setMenuBar(mb1);
|
||||||
QVERIFY(mw.menuBar() != 0);
|
QVERIFY(mw.menuBar() != 0);
|
||||||
QCOMPARE(mw.menuBar(), (QMenuBar *)mb1);
|
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");
|
QSKIP("With native menubar integration the menubar is not a child");
|
||||||
#endif
|
#endif
|
||||||
QCOMPARE(mb1->parentWidget(), (QWidget *)&mw);
|
QCOMPARE(mb1->parentWidget(), (QWidget *)&mw);
|
||||||
|
@ -542,7 +542,7 @@ void tst_qfile::createSmallFiles()
|
|||||||
dir.cd("tst");
|
dir.cd("tst");
|
||||||
tmpDirName = dir.absolutePath();
|
tmpDirName = dir.absolutePath();
|
||||||
|
|
||||||
#if defined(Q_WS_WINCE)
|
#if defined(Q_OS_WINCE)
|
||||||
for (int i = 0; i < 100; ++i)
|
for (int i = 0; i < 100; ++i)
|
||||||
#else
|
#else
|
||||||
for (int i = 0; i < 1000; ++i)
|
for (int i = 0; i < 1000; ++i)
|
||||||
|
@ -133,7 +133,7 @@ struct Large { // A "large" item type
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Embedded devices typically have limited memory
|
// Embedded devices typically have limited memory
|
||||||
#if defined(Q_WS_WINCE)
|
#if defined(Q_OS_WINCE)
|
||||||
# define LARGE_MAX_SIZE 2000
|
# define LARGE_MAX_SIZE 2000
|
||||||
#else
|
#else
|
||||||
# define LARGE_MAX_SIZE 20000
|
# define LARGE_MAX_SIZE 20000
|
||||||
|
@ -414,7 +414,7 @@ void tst_QGraphicsView::chipTester_data()
|
|||||||
|
|
||||||
void tst_QGraphicsView::chipTester()
|
void tst_QGraphicsView::chipTester()
|
||||||
{
|
{
|
||||||
#ifdef Q_WS_WINCE_WM
|
#ifdef Q_OS_WINCE_WM
|
||||||
QSKIP("WinCE WM: Fails on Windows Mobile w/o OpenGL");
|
QSKIP("WinCE WM: Fails on Windows Mobile w/o OpenGL");
|
||||||
#endif
|
#endif
|
||||||
QFETCH(bool, antialias);
|
QFETCH(bool, antialias);
|
||||||
|
@ -565,7 +565,7 @@ void tst_qnetworkreply::uploadPerformance()
|
|||||||
|
|
||||||
void tst_qnetworkreply::httpUploadPerformance()
|
void tst_qnetworkreply::httpUploadPerformance()
|
||||||
{
|
{
|
||||||
#if defined(Q_WS_WINCE_WM)
|
#if defined(Q_OS_WINCE_WM)
|
||||||
// Show some mercy for non-desktop platform/s
|
// Show some mercy for non-desktop platform/s
|
||||||
enum {UploadSize = 4*1024*1024}; // 4 MB
|
enum {UploadSize = 4*1024*1024}; // 4 MB
|
||||||
#else
|
#else
|
||||||
@ -636,7 +636,7 @@ void tst_qnetworkreply::httpDownloadPerformance()
|
|||||||
{
|
{
|
||||||
QFETCH(bool, serverSendsContentLength);
|
QFETCH(bool, serverSendsContentLength);
|
||||||
QFETCH(bool, chunkedEncoding);
|
QFETCH(bool, chunkedEncoding);
|
||||||
#if defined(Q_WS_WINCE_WM)
|
#if defined(Q_OS_WINCE_WM)
|
||||||
// Show some mercy to non-desktop platform/s
|
// Show some mercy to non-desktop platform/s
|
||||||
enum {UploadSize = 4*1024*1024}; // 4 MB
|
enum {UploadSize = 4*1024*1024}; // 4 MB
|
||||||
#else
|
#else
|
||||||
@ -720,7 +720,7 @@ void tst_qnetworkreply::httpDownloadPerformanceDownloadBuffer()
|
|||||||
QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType);
|
QFETCH(HttpDownloadPerformanceDownloadBufferTestType, testType);
|
||||||
|
|
||||||
// On my Linux Desktop the results are already visible with 128 kB, however we use this to have good results.
|
// 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
|
// Show some mercy to non-desktop platform/s
|
||||||
enum {UploadSize = 4*1024*1024}; // 4 MB
|
enum {UploadSize = 4*1024*1024}; // 4 MB
|
||||||
#else
|
#else
|
||||||
|
@ -173,7 +173,7 @@ void tst_QTcpServer::ipv6LoopbackPerformanceTest()
|
|||||||
QFETCH_GLOBAL(bool, setProxy);
|
QFETCH_GLOBAL(bool, setProxy);
|
||||||
if (setProxy)
|
if (setProxy)
|
||||||
return;
|
return;
|
||||||
#if defined(Q_WS_WINCE_WM)
|
#if defined(Q_OS_WINCE_WM)
|
||||||
QSKIP("WinCE WM: Not yet supported");
|
QSKIP("WinCE WM: Not yet supported");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user