Remove usages of Q_OS_WINCE
This platform is history. Change-Id: Iddfab008a509f4828c321730414c8204055cf7af Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
parent
b6c7defd6c
commit
c9b7cc349a
@ -255,11 +255,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
|
|
||||||
void resizeEvent(QResizeEvent*) {
|
void resizeEvent(QResizeEvent*) {
|
||||||
#if defined(Q_OS_WINCE_WM)
|
|
||||||
touchDevice = true;
|
|
||||||
#else
|
|
||||||
touchDevice = false;
|
touchDevice = false;
|
||||||
#endif
|
|
||||||
if (touchDevice) {
|
if (touchDevice) {
|
||||||
if (width() < height()) {
|
if (width() < height()) {
|
||||||
trackPad = QRect(0, height() / 2, width(), height() / 2);
|
trackPad = QRect(0, height() / 2, width(), height() / 2);
|
||||||
|
@ -84,7 +84,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion()
|
|||||||
#define pGetModuleHandle GetModuleHandleW
|
#define pGetModuleHandle GetModuleHandleW
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef Q_OS_WINCE
|
|
||||||
HMODULE ntdll = pGetModuleHandle(L"ntdll.dll");
|
HMODULE ntdll = pGetModuleHandle(L"ntdll.dll");
|
||||||
if (Q_UNLIKELY(!ntdll))
|
if (Q_UNLIKELY(!ntdll))
|
||||||
return result;
|
return result;
|
||||||
@ -104,9 +103,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion()
|
|||||||
// GetVersionEx() has been deprecated in Windows 8.1 and will return
|
// GetVersionEx() has been deprecated in Windows 8.1 and will return
|
||||||
// only Windows 8 from that version on, so use the kernel API function.
|
// only Windows 8 from that version on, so use the kernel API function.
|
||||||
pRtlGetVersion(reinterpret_cast<LPOSVERSIONINFO>(&result)); // always returns STATUS_SUCCESS
|
pRtlGetVersion(reinterpret_cast<LPOSVERSIONINFO>(&result)); // always returns STATUS_SUCCESS
|
||||||
#else // !Q_OS_WINCE
|
|
||||||
GetVersionEx(&result);
|
|
||||||
#endif
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,8 +64,6 @@ using namespace Microsoft::WRL::Wrappers;
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
int appCmdShow = 0;
|
|
||||||
|
|
||||||
Q_CORE_EXPORT QString qAppFileName() // get application file name
|
Q_CORE_EXPORT QString qAppFileName() // get application file name
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -175,16 +173,12 @@ Q_CORE_EXPORT HINSTANCE qWinAppPrevInst() // get Windows prev app
|
|||||||
|
|
||||||
Q_CORE_EXPORT int qWinAppCmdShow() // get main window show command
|
Q_CORE_EXPORT int qWinAppCmdShow() // get main window show command
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_WINCE)
|
|
||||||
return appCmdShow;
|
|
||||||
#else
|
|
||||||
STARTUPINFO startupInfo;
|
STARTUPINFO startupInfo;
|
||||||
GetStartupInfo(&startupInfo);
|
GetStartupInfo(&startupInfo);
|
||||||
|
|
||||||
return (startupInfo.dwFlags & STARTF_USESHOWWINDOW)
|
return (startupInfo.dwFlags & STARTF_USESHOWWINDOW)
|
||||||
? startupInfo.wShowWindow
|
? startupInfo.wShowWindow
|
||||||
: SW_SHOWDEFAULT;
|
: SW_SHOWDEFAULT;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -524,7 +524,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera
|
|||||||
# if (defined __apple_build_version__ && __clang_major__ >= 7) || (Q_CC_CLANG >= 307)
|
# if (defined __apple_build_version__ && __clang_major__ >= 7) || (Q_CC_CLANG >= 307)
|
||||||
# define QT_HAS_CONSTEXPR_BUILTINS
|
# define QT_HAS_CONSTEXPR_BUILTINS
|
||||||
# endif
|
# endif
|
||||||
#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM)
|
#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_PROCESSOR_ARM)
|
||||||
# define QT_HAS_CONSTEXPR_BUILTINS
|
# define QT_HAS_CONSTEXPR_BUILTINS
|
||||||
#elif defined(Q_CC_GNU)
|
#elif defined(Q_CC_GNU)
|
||||||
# define QT_HAS_CONSTEXPR_BUILTINS
|
# define QT_HAS_CONSTEXPR_BUILTINS
|
||||||
@ -588,7 +588,7 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) noexcept
|
|||||||
{
|
{
|
||||||
return __builtin_popcountll(v);
|
return __builtin_popcountll(v);
|
||||||
}
|
}
|
||||||
#elif defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM)
|
#elif defined(Q_CC_MSVC) && !defined(Q_PROCESSOR_ARM)
|
||||||
#define QT_POPCOUNT_CONSTEXPR
|
#define QT_POPCOUNT_CONSTEXPR
|
||||||
#define QT_POPCOUNT_RELAXED_CONSTEXPR
|
#define QT_POPCOUNT_RELAXED_CONSTEXPR
|
||||||
#define QT_HAS_BUILTIN_CTZ
|
#define QT_HAS_BUILTIN_CTZ
|
||||||
|
@ -119,9 +119,6 @@ static void printBlob(NLA_BLOB *blob)
|
|||||||
|
|
||||||
static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface)
|
static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interface)
|
||||||
{
|
{
|
||||||
#ifdef Q_OS_WINCE
|
|
||||||
Q_UNUSED(interface)
|
|
||||||
#else
|
|
||||||
unsigned long oid;
|
unsigned long oid;
|
||||||
DWORD bytesWritten;
|
DWORD bytesWritten;
|
||||||
|
|
||||||
@ -175,8 +172,6 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf
|
|||||||
|
|
||||||
#ifdef BEARER_MANAGEMENT_DEBUG
|
#ifdef BEARER_MANAGEMENT_DEBUG
|
||||||
qDebug() << medium << physicalMedium;
|
qDebug() << medium << physicalMedium;
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return QNetworkConfiguration::BearerUnknown;
|
return QNetworkConfiguration::BearerUnknown;
|
||||||
@ -307,16 +302,12 @@ void QNlaThread::run()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef Q_OS_WINCE
|
|
||||||
// Not interested in unrelated IO completion events
|
// Not interested in unrelated IO completion events
|
||||||
// although we also don't want to block them
|
// although we also don't want to block them
|
||||||
while (WaitForSingleObjectEx(changeEvent, WSA_INFINITE, true) != WAIT_IO_COMPLETION &&
|
while (WaitForSingleObjectEx(changeEvent, WSA_INFINITE, true) != WAIT_IO_COMPLETION &&
|
||||||
handle)
|
handle)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
WaitForSingleObject(changeEvent, WSA_INFINITE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
mutex.lock();
|
mutex.lock();
|
||||||
if (handle) {
|
if (handle) {
|
||||||
|
@ -170,15 +170,9 @@ public:
|
|||||||
if (m_params) {
|
if (m_params) {
|
||||||
const QString fileName = m_params->fileName;
|
const QString fileName = m_params->fileName;
|
||||||
SHFILEINFO info;
|
SHFILEINFO info;
|
||||||
#ifndef Q_OS_WINCE
|
|
||||||
const UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
|
|
||||||
#endif
|
|
||||||
const bool result = SHGetFileInfo(reinterpret_cast<const wchar_t *>(fileName.utf16()),
|
const bool result = SHGetFileInfo(reinterpret_cast<const wchar_t *>(fileName.utf16()),
|
||||||
m_params->attributes, &info, sizeof(SHFILEINFO),
|
m_params->attributes, &info, sizeof(SHFILEINFO),
|
||||||
m_params->flags);
|
m_params->flags);
|
||||||
#ifndef Q_OS_WINCE
|
|
||||||
SetErrorMode(oldErrorMode);
|
|
||||||
#endif
|
|
||||||
m_doneMutex.lock();
|
m_doneMutex.lock();
|
||||||
if (!m_cancelled.load()) {
|
if (!m_cancelled.load()) {
|
||||||
*m_params->result = result;
|
*m_params->result = result;
|
||||||
|
@ -1621,7 +1621,7 @@ void QColorDialogPrivate::_q_pickScreenColor()
|
|||||||
q->grabMouse();
|
q->grabMouse();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef Q_OS_WIN32 // excludes WinCE and WinRT
|
#ifdef Q_OS_WIN32 // excludes WinRT
|
||||||
// On Windows mouse tracking doesn't work over other processes's windows
|
// On Windows mouse tracking doesn't work over other processes's windows
|
||||||
updateTimer->start(30);
|
updateTimer->start(30);
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
#include <qfileinfo.h>
|
#include <qfileinfo.h>
|
||||||
#include <qsysinfo.h>
|
#include <qsysinfo.h>
|
||||||
#include <qregexp.h>
|
#include <qregexp.h>
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !defined(Q_OS_WINCE)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
|
||||||
# include <qt_windows.h>
|
# include <qt_windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -131,7 +131,7 @@ static const char * const enumNames[MaxStandardLocation + 1 - int(QStandardPaths
|
|||||||
|
|
||||||
void tst_qstandardpaths::initTestCase()
|
void tst_qstandardpaths::initTestCase()
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && !defined(Q_OS_WINCE)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
|
||||||
// Disable WOW64 redirection, see testFindExecutable()
|
// Disable WOW64 redirection, see testFindExecutable()
|
||||||
if (QSysInfo::buildCpuArchitecture() != QSysInfo::currentCpuArchitecture()) {
|
if (QSysInfo::buildCpuArchitecture() != QSysInfo::currentCpuArchitecture()) {
|
||||||
void *oldMode;
|
void *oldMode;
|
||||||
@ -140,7 +140,7 @@ void tst_qstandardpaths::initTestCase()
|
|||||||
qErrnoWarning("Wow64DisableWow64FsRedirection() failed");
|
qErrnoWarning("Wow64DisableWow64FsRedirection() failed");
|
||||||
QVERIFY(disabledDisableWow64FsRedirection);
|
QVERIFY(disabledDisableWow64FsRedirection);
|
||||||
}
|
}
|
||||||
#endif // Q_OS_WIN && !Q_OS_WINRT && !Q_OS_WINCE
|
#endif // Q_OS_WIN && !Q_OS_WINRT
|
||||||
QVERIFY2(m_localConfigTempDir.isValid(), qPrintable(m_localConfigTempDir.errorString()));
|
QVERIFY2(m_localConfigTempDir.isValid(), qPrintable(m_localConfigTempDir.errorString()));
|
||||||
QVERIFY2(m_globalConfigTempDir.isValid(), qPrintable(m_globalConfigTempDir.errorString()));
|
QVERIFY2(m_globalConfigTempDir.isValid(), qPrintable(m_globalConfigTempDir.errorString()));
|
||||||
QVERIFY2(m_localAppTempDir.isValid(), qPrintable(m_localAppTempDir.errorString()));
|
QVERIFY2(m_localAppTempDir.isValid(), qPrintable(m_localAppTempDir.errorString()));
|
||||||
|
@ -29,14 +29,14 @@
|
|||||||
|
|
||||||
#include <QtCore>
|
#include <QtCore>
|
||||||
#include <QtNetwork>
|
#include <QtNetwork>
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
|
||||||
# include <crtdbg.h>
|
# include <crtdbg.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
// Windows: Suppress crash notification dialog.
|
// Windows: Suppress crash notification dialog.
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC)
|
||||||
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
|
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
|
||||||
#endif
|
#endif
|
||||||
QCoreApplication app(argc, argv);
|
QCoreApplication app(argc, argv);
|
||||||
|
@ -113,10 +113,7 @@ private slots:
|
|||||||
|
|
||||||
void check_escKey();
|
void check_escKey();
|
||||||
#endif
|
#endif
|
||||||
#ifndef Q_OS_WINCE
|
|
||||||
void allowActiveAndDisabled();
|
void allowActiveAndDisabled();
|
||||||
#endif
|
|
||||||
|
|
||||||
void taskQTBUG56860_focus();
|
void taskQTBUG56860_focus();
|
||||||
void check_endKey();
|
void check_endKey();
|
||||||
void check_homeKey();
|
void check_homeKey();
|
||||||
|
@ -79,7 +79,7 @@ public:
|
|||||||
return file.isNull() ? qint64(-1) : file->write(relativeFileName.toUtf8());
|
return file.isNull() ? qint64(-1) : file->write(relativeFileName.toUtf8());
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && !defined(Q_OS_WINRT)
|
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
|
||||||
static DWORD createNtfsJunction(QString target, QString linkName, QString *errorMessage)
|
static DWORD createNtfsJunction(QString target, QString linkName, QString *errorMessage)
|
||||||
{
|
{
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user