diff options
Diffstat (limited to 'src')
24 files changed, 18 insertions, 457 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri index 87c356870b..8f50454064 100644 --- a/src/3rdparty/sqlite.pri +++ b/src/3rdparty/sqlite.pri @@ -3,7 +3,6 @@ DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQ !contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1 winrt: DEFINES += SQLITE_OS_WINRT -winphone: DEFINES += SQLITE_WIN32_FILEMAPPING_API=1 qnx: DEFINES += _QNX_SOURCE integrity: QMAKE_CFLAGS += -include qplatformdefs.h INCLUDEPATH += $$PWD/sqlite diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 1170fff16a..b34e8ec659 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1339,13 +1339,6 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! - \macro Q_OS_WINPHONE - \relates <QtGlobal> - - Defined on Windows Phone 8. -*/ - -/*! \macro Q_OS_CYGWIN \relates <QtGlobal> @@ -2622,8 +2615,8 @@ QString QSysInfo::kernelVersion() \b{FreeBSD note}: this function returns "debian" for Debian/kFreeBSD and "unknown" otherwise. - \b{Windows note}: this function returns "winphone" for builds for Windows - Phone, "winrt" for WinRT builds, and "windows" for normal desktop builds. + \b{Windows note}: this function "winrt" for WinRT builds, and "windows" + for normal desktop builds. For other Unix-type systems, this function usually returns "unknown". @@ -2632,9 +2625,7 @@ QString QSysInfo::kernelVersion() QString QSysInfo::productType() { // similar, but not identical to QFileSelectorPrivate::platformSelectors -#if defined(Q_OS_WINPHONE) - return QStringLiteral("winphone"); -#elif defined(Q_OS_WINRT) +#if defined(Q_OS_WINRT) return QStringLiteral("winrt"); #elif defined(Q_OS_WIN) return QStringLiteral("windows"); @@ -2746,9 +2737,7 @@ QString QSysInfo::productVersion() */ QString QSysInfo::prettyProductName() { -#if defined(Q_OS_WINPHONE) - return QLatin1String("Windows Phone ") + QLatin1String(osVer_helper()); -#elif defined(Q_OS_ANDROID) || defined(Q_OS_DARWIN) || defined(Q_OS_WIN) +#if defined(Q_OS_ANDROID) || defined(Q_OS_DARWIN) || defined(Q_OS_WIN) const auto version = QOperatingSystemVersion::current(); const char *name = osVer_helper(version); if (name) diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 3b486b8f6f..3133b4a719 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -134,7 +134,6 @@ # define WINAPI_FAMILY_PC_APP WINAPI_FAMILY_APP # endif # if defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP -# define Q_OS_WINPHONE # define Q_OS_WINRT # elif WINAPI_FAMILY==WINAPI_FAMILY_PC_APP # define Q_OS_WINRT diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index 920281cef7..a34af72dfd 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -368,14 +368,10 @@ QStringList QFileSelectorPrivate::platformSelectors() // similar, but not identical to QSysInfo::osType QStringList ret; #if defined(Q_OS_WIN) - // can't fall back to QSysInfo because we need both "winphone" and "winrt" for the Windows Phone case ret << QStringLiteral("windows"); ret << QSysInfo::kernelType(); // "winnt" # if defined(Q_OS_WINRT) ret << QStringLiteral("winrt"); -# if defined(Q_OS_WINPHONE) - ret << QStringLiteral("winphone"); -# endif # endif #elif defined(Q_OS_UNIX) ret << QStringLiteral("unix"); diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index ee54c5fd3a..90708b0473 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -81,11 +81,6 @@ using namespace Microsoft::WRL::Wrappers; using namespace ABI::Windows::Foundation; using namespace ABI::Windows::Storage; using namespace ABI::Windows::ApplicationModel; - -#if _MSC_VER < 1900 -#define Q_OS_WINRT_WIN81 -#endif - #endif // Q_OS_WINRT #ifndef SPI_GETPLATFORMTYPE @@ -157,7 +152,6 @@ QT_BEGIN_NAMESPACE Q_CORE_EXPORT int qt_ntfs_permission_lookup = 0; #if defined(Q_OS_WINRT) -static QString qfsPrivateCurrentDir = QLatin1String(""); // As none of the functions we try to resolve do exist on WinRT // we use QT_NO_LIBRARY to shorten everything up a little bit. # ifndef QT_NO_LIBRARY @@ -503,7 +497,6 @@ QString QFileSystemEngine::nativeAbsoluteFilePath(const QString &path) { // can be //server or //server/share QString absPath; -#if !defined(Q_OS_WINRT_WIN81) QVarLengthArray<wchar_t, MAX_PATH> buf(qMax(MAX_PATH, path.size() + 1)); wchar_t *fileName = 0; DWORD retLen = GetFullPathName((wchar_t*)path.utf16(), buf.size(), buf.data(), &fileName); @@ -523,12 +516,7 @@ QString QFileSystemEngine::nativeAbsoluteFilePath(const QString &path) if (absPath.size() < rootPath.size() && rootPath.startsWith(absPath)) absPath = rootPath; # endif // Q_OS_WINRT -#else // !Q_OS_WINRT_WIN81 - if (QDir::isRelativePath(path)) - absPath = QDir::toNativeSeparators(QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + path)); - else - absPath = QDir::toNativeSeparators(QDir::cleanPath(path)); -#endif // Q_OS_WINRT_WIN81 + // This is really ugly, but GetFullPathName strips off whitespace at the end. // If you for instance write ". " in the lineedit of QFileDialog, // (which is an invalid filename) this function will strip the space off and viola, @@ -550,14 +538,7 @@ QFileSystemEntry QFileSystemEngine::absoluteName(const QFileSystemEntry &entry) else ret = QDir::fromNativeSeparators(nativeAbsoluteFilePath(entry.filePath())); } else { -#ifndef Q_OS_WINRT_WIN81 ret = QDir::cleanPath(QDir::currentPath() + QLatin1Char('/') + entry.filePath()); -#else - // Some WinRT APIs do not support absolute paths (due to sandboxing). - // Thus the port uses the executable's directory as its root directory - // and treats paths relative to that as absolute paths. - ret = QDir::cleanPath(QDir::current().relativeFilePath(entry.filePath())); -#endif } #ifndef Q_OS_WINRT @@ -1218,9 +1199,6 @@ QString QFileSystemEngine::tempPath() ret = QDir::fromNativeSeparators(ret); } #else // !Q_OS_WINRT - // According to http://msdn.microsoft.com/en-us/library/windows/apps/windows.storage.applicationdata.temporaryfolder.aspx - // the API is not available on winphone which should cause one of the functions - // below to fail ComPtr<IApplicationDataStatics> applicationDataStatics; if (FAILED(GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Storage_ApplicationData).Get(), &applicationDataStatics))) return ret; @@ -1252,20 +1230,14 @@ bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &entry) if(!(meta.exists() && meta.isDirectory())) return false; -#if !defined(Q_OS_WINRT_WIN81) //TODO: this should really be using nativeFilePath(), but that returns a path in long format \\?\c:\foo //which causes many problems later on when it's returned through currentPath() return ::SetCurrentDirectory(reinterpret_cast<const wchar_t*>(QDir::toNativeSeparators(entry.filePath()).utf16())) != 0; -#else - qfsPrivateCurrentDir = entry.filePath(); - return true; -#endif } QFileSystemEntry QFileSystemEngine::currentPath() { QString ret; -#if !defined(Q_OS_WINRT_WIN81) DWORD size = 0; wchar_t currentName[PATH_MAX]; size = ::GetCurrentDirectory(PATH_MAX, currentName); @@ -1281,13 +1253,6 @@ QFileSystemEntry QFileSystemEngine::currentPath() } if (ret.length() >= 2 && ret[1] == QLatin1Char(':')) ret[0] = ret.at(0).toUpper(); // Force uppercase drive letters. -#else // !Q_OS_WINRT_WIN81 - //TODO - a race condition exists when using currentPath / setCurrentPath from multiple threads - if (qfsPrivateCurrentDir.isEmpty()) - qfsPrivateCurrentDir = QDir::rootPath(); - - ret = qfsPrivateCurrentDir; -#endif // Q_OS_WINRT_WIN81 return QFileSystemEntry(ret, QFileSystemEntry::FromNativePath()); } diff --git a/src/corelib/io/qfilesystementry.cpp b/src/corelib/io/qfilesystementry.cpp index 2e92f8fbba..de4c852068 100644 --- a/src/corelib/io/qfilesystementry.cpp +++ b/src/corelib/io/qfilesystementry.cpp @@ -175,10 +175,8 @@ void QFileSystemEntry::resolveNativeFilePath() const // WinRT/MSVC2015 allows a maximum of 256 characters for a filepath // unless //?/ is prepended which extends the rule to have a maximum // of 256 characters in the filename plus the preprending path -#if _MSC_VER >= 1900 m_nativeFilePath.prepend("\\\\?\\"); #endif -#endif } } diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 9140118872..2905a8e54e 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -69,10 +69,6 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi nativePath.append(QLatin1Char('\\')); nativePath.append(QLatin1Char('*')); // In MSVC2015+ case we prepend //?/ for longer file-name support -#if defined(Q_OS_WINRT) && _MSC_VER < 1900 - if (nativePath.startsWith(QLatin1Char('\\'))) - nativePath.remove(0, 1); -#endif if (!dirPath.endsWith(QLatin1Char('/'))) dirPath.append(QLatin1Char('/')); if ((filters & (QDir::Dirs|QDir::Drives)) && (!(filters & (QDir::Files)))) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 117c224318..a7fd50df83 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -850,7 +850,6 @@ QDateTime QFSFileEngine::fileTime(FileTime time) const uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFlags flags) { -#ifndef Q_OS_WINPHONE Q_Q(QFSFileEngine); Q_UNUSED(flags); if (openMode == QFile::NotOpen) { @@ -960,18 +959,11 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, ::CloseHandle(mapHandle); mapHandle = NULL; -#else // !Q_OS_WINPHONE - Q_UNUSED(offset); - Q_UNUSED(size); - Q_UNUSED(flags); - Q_UNIMPLEMENTED(); -#endif // Q_OS_WINPHONE return 0; } bool QFSFileEnginePrivate::unmap(uchar *ptr) { -#ifndef Q_OS_WINPHONE Q_Q(QFSFileEngine); if (!maps.contains(ptr)) { q->setError(QFile::PermissionsError, qt_error_string(ERROR_ACCESS_DENIED)); @@ -990,11 +982,6 @@ bool QFSFileEnginePrivate::unmap(uchar *ptr) } return true; -#else // !Q_OS_WINPHONE - Q_UNUSED(ptr); - Q_UNIMPLEMENTED(); - return false; -#endif // Q_OS_WINPHONE } QT_END_NAMESPACE diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 4057c03b84..856d2a2101 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -65,23 +65,6 @@ QT_BEGIN_NAMESPACE int appCmdShow = 0; -// GetModuleFileName only exists for MSVC2015 and upwards for WinRT, meaning -// Windows 10 (Mobile). Hence take the first argument passed to the -// QCoreApplication contructor for older versions as a fallback on older platforms. -#if defined(Q_OS_WINRT) && _MSC_VER < 1900 - -Q_CORE_EXPORT QString qAppFileName() -{ - return QFileInfo(QCoreApplication::arguments().constFirst()).filePath(); -} - -QString QCoreApplicationPrivate::appName() const -{ - return QFileInfo(QCoreApplication::arguments().constFirst()).baseName(); -} - -#else // !(defined(Q_OS_WINRT) && _MSC_VER < 1900) - Q_CORE_EXPORT QString qAppFileName() // get application file name { // We do MAX_PATH + 2 here, and request with MAX_PATH + 1, so we can handle all paths @@ -186,8 +169,6 @@ QString QCoreApplicationPrivate::appVersion() const return applicationVersion; } -#endif // !(defined(Q_OS_WINRT) && _MSC_VER < 1900) - #ifndef Q_OS_WINRT #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index 07d4930332..be42a369c2 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -64,11 +64,6 @@ void QSharedMemoryPrivate::setErrorString(QLatin1String function) errorString = QSharedMemory::tr("%1: already exists").arg(function); break; case ERROR_FILE_NOT_FOUND: -#if defined(Q_OS_WINRT) && _MSC_VER < 1900 - // This happens on WinRT only if no file is present as CreateFileMappingW - // bails out with this error code - case ERROR_INVALID_PARAMETER: -#endif error = QSharedMemory::NotFound; errorString = QSharedMemory::tr("%1: doesn't exist").arg(function); break; @@ -103,16 +98,9 @@ HANDLE QSharedMemoryPrivate::handle() errorString = QSharedMemory::tr("%1: unable to make key").arg(function); return 0; } -#if defined(Q_OS_WINPHONE) - Q_UNIMPLEMENTED(); - hand = 0; -#elif defined(Q_OS_WINRT) -#if _MSC_VER >= 1900 +#if defined(Q_OS_WINRT) hand = OpenFileMappingFromApp(FILE_MAP_ALL_ACCESS, FALSE, reinterpret_cast<PCWSTR>(nativeKey.utf16())); #else - hand = CreateFileMappingFromApp(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, (PCWSTR)nativeKey.utf16()); -#endif -#else hand = OpenFileMapping(FILE_MAP_ALL_ACCESS, false, (wchar_t*)nativeKey.utf16()); #endif if (!hand) { @@ -144,11 +132,7 @@ bool QSharedMemoryPrivate::create(int size) } // Create the file mapping. -#if defined(Q_OS_WINPHONE) - Q_UNIMPLEMENTED(); - Q_UNUSED(size) - hand = 0; -#elif defined(Q_OS_WINRT) +#if defined(Q_OS_WINRT) hand = CreateFileMappingFromApp(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, size, (PCWSTR)nativeKey.utf16()); #else hand = CreateFileMapping(INVALID_HANDLE_VALUE, 0, PAGE_READWRITE, 0, size, (wchar_t*)nativeKey.utf16()); @@ -166,12 +150,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) { // Grab a pointer to the memory block int permissions = (mode == QSharedMemory::ReadOnly ? FILE_MAP_READ : FILE_MAP_ALL_ACCESS); -#if defined(Q_OS_WINPHONE) - Q_UNIMPLEMENTED(); - Q_UNUSED(mode) - Q_UNUSED(permissions) - memory = 0; -#elif defined(Q_OS_WINRT) +#if defined(Q_OS_WINRT) memory = (void *)MapViewOfFileFromApp(handle(), permissions, 0, 0); #else memory = (void *)MapViewOfFile(handle(), permissions, 0, 0, 0); @@ -199,15 +178,10 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) bool QSharedMemoryPrivate::detach() { // umap memory -#if defined(Q_OS_WINPHONE) - Q_UNIMPLEMENTED(); - return false; -#else if (!UnmapViewOfFile(memory)) { setErrorString(QLatin1String("QSharedMemory::detach")); return false; } -#endif memory = 0; size = 0; diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index ab5997635a..4c215474fa 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -126,7 +126,6 @@ else:unix { } else:win32 { SOURCES += tools/qlocale_win.cpp - winphone: LIBS_PRIVATE += -lWindowsPhoneGlobalizationUtil winrt-*-msvc2013: LIBS += advapi32.lib } else:integrity { SOURCES += tools/qlocale_unix.cpp diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 568b010792..3438fc0dcd 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -108,9 +108,6 @@ #elif defined(Q_OS_WIN) # include <QtCore/qt_windows.h> # include <QtCore/QLibraryInfo> -# if defined(Q_OS_WINPHONE) -# include <Objbase.h> -# endif #endif // Q_OS_WIN #include <ctype.h> diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp index 8b36406c67..7b20b47aa9 100644 --- a/src/network/socket/qnativesocketengine_winrt.cpp +++ b/src/network/socket/qnativesocketengine_winrt.cpp @@ -779,7 +779,6 @@ void QNativeSocketEngine::close() } } -#if _MSC_VER >= 1900 if (d->socketType == QAbstractSocket::TcpSocket) { hr = QEventDispatcherWinRT::runOnXamlThread([d]() { HRESULT hr; @@ -803,7 +802,6 @@ void QNativeSocketEngine::close() }); Q_ASSERT_SUCCEEDED(hr); } -#endif // _MSC_VER >= 1900 if (d->socketDescriptor != -1) { ComPtr<IClosable> socket; diff --git a/src/plugins/platforms/winrt/qwinrtclipboard.cpp b/src/plugins/platforms/winrt/qwinrtclipboard.cpp index 0a38b3df34..117cb515df 100644 --- a/src/plugins/platforms/winrt/qwinrtclipboard.cpp +++ b/src/plugins/platforms/winrt/qwinrtclipboard.cpp @@ -61,7 +61,6 @@ QT_BEGIN_NAMESPACE QWinRTClipboard::QWinRTClipboard() : m_mimeData(Q_NULLPTR) { -#ifndef Q_OS_WINPHONE QEventDispatcherWinRT::runOnXamlThread([this]() { HRESULT hr; hr = GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_ApplicationModel_DataTransfer_Clipboard).Get(), @@ -74,7 +73,6 @@ QWinRTClipboard::QWinRTClipboard() return hr; }); -#endif // !Q_OS_WINPHONE } QMimeData *QWinRTClipboard::mimeData(QClipboard::Mode mode) @@ -82,7 +80,6 @@ QMimeData *QWinRTClipboard::mimeData(QClipboard::Mode mode) if (!supportsMode(mode)) return nullptr; -#ifndef Q_OS_WINPHONE ComPtr<IDataPackageView> view; HRESULT hr; hr = m_nativeClipBoard->GetContent(&view); @@ -114,9 +111,6 @@ QMimeData *QWinRTClipboard::mimeData(QClipboard::Mode mode) m_mimeData->setText(text); return m_mimeData; -#else // Q_OS_WINPHONE - return QPlatformClipboard::mimeData(mode); -#endif // Q_OS_WINPHONE } // Inspired by QWindowsMimeText::convertFromMime @@ -153,7 +147,6 @@ void QWinRTClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) if (!supportsMode(mode)) return; -#ifndef Q_OS_WINPHONE const bool newData = !m_mimeData || m_mimeData != data; if (newData) { if (m_mimeData) @@ -178,18 +171,11 @@ void QWinRTClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) return S_OK; }); RETURN_VOID_IF_FAILED("Could not set clipboard text."); -#else // Q_OS_WINPHONE - QPlatformClipboard::setMimeData(data, mode); -#endif // Q_OS_WINPHONE } bool QWinRTClipboard::supportsMode(QClipboard::Mode mode) const { -#ifndef Q_OS_WINPHONE return mode == QClipboard::Clipboard; -#else - return QPlatformClipboard::supportsMode(mode); -#endif } HRESULT QWinRTClipboard::onContentChanged(IInspectable *, IInspectable *) diff --git a/src/plugins/platforms/winrt/qwinrtclipboard.h b/src/plugins/platforms/winrt/qwinrtclipboard.h index 2e3e2b834d..899fcbe730 100644 --- a/src/plugins/platforms/winrt/qwinrtclipboard.h +++ b/src/plugins/platforms/winrt/qwinrtclipboard.h @@ -45,7 +45,6 @@ #include <wrl.h> -#ifndef Q_OS_WINPHONE namespace ABI { namespace Windows { namespace ApplicationModel { @@ -55,7 +54,6 @@ namespace ABI { } } } -#endif // !Q_OS_WINPHONE QT_BEGIN_NAMESPACE @@ -70,9 +68,7 @@ public: HRESULT onContentChanged(IInspectable *, IInspectable *); private: -#ifndef Q_OS_WINPHONE Microsoft::WRL::ComPtr<ABI::Windows::ApplicationModel::DataTransfer::IClipboardStatics> m_nativeClipBoard; -#endif QMimeData *m_mimeData; }; diff --git a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp index 417dbdc1db..62eacba89b 100644 --- a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp +++ b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.cpp @@ -61,11 +61,9 @@ using namespace ABI::Windows::Foundation::Collections; using namespace ABI::Windows::Storage; using namespace ABI::Windows::Storage::Pickers; -#ifndef Q_OS_WINPHONE typedef IAsyncOperationCompletedHandler<StorageFile *> SingleFileHandler; typedef IAsyncOperationCompletedHandler<IVectorView<StorageFile *> *> MultipleFileHandler; typedef IAsyncOperationCompletedHandler<StorageFolder *> SingleFolderHandler; -#endif QT_BEGIN_NAMESPACE @@ -152,16 +150,6 @@ private: QVector<HSTRING> impl; }; -#ifdef Q_OS_WINPHONE -class QActivationEvent : public QEvent -{ -public: - IInspectable *args() const { - return reinterpret_cast<IInspectable *>(d); - } -}; -#endif - template<typename T> static bool initializePicker(HSTRING runtimeId, T **picker, const QSharedPointer<QFileDialogOptions> &options) { @@ -225,23 +213,6 @@ static bool pickFiles(IFileOpenPicker *picker, QWinRTFileDialogHelper *helper, b Q_ASSERT(picker); Q_ASSERT(helper); HRESULT hr; -#ifdef Q_OS_WINPHONE - hr = QEventDispatcherWinRT::runOnXamlThread([picker, singleFile]() { - HRESULT hr; - ComPtr<IFileOpenPicker2> picker2; - hr = picker->QueryInterface(IID_PPV_ARGS(picker2.GetAddressOf())); - RETURN_HR_IF_FAILED("Failed to cast file picker"); - if (singleFile) - return picker2->PickSingleFileAndContinue(); - else - return picker2->PickMultipleFilesAndContinue(); - }); - RETURN_FALSE_IF_FAILED("Failed to open file picker"); - QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher(); - Q_ASSERT(eventDispatcher); - eventDispatcher->installEventFilter(helper); - return true; -#else hr = QEventDispatcherWinRT::runOnXamlThread([picker, helper, singleFile]() { HRESULT hr; if (singleFile) { @@ -260,7 +231,6 @@ static bool pickFiles(IFileOpenPicker *picker, QWinRTFileDialogHelper *helper, b return S_OK; }); return SUCCEEDED(hr); -#endif } static bool pickFolder(IFolderPicker *picker, QWinRTFileDialogHelper *helper) @@ -268,19 +238,6 @@ static bool pickFolder(IFolderPicker *picker, QWinRTFileDialogHelper *helper) Q_ASSERT(picker); Q_ASSERT(helper); HRESULT hr; -#ifdef Q_OS_WINPHONE - hr = QEventDispatcherWinRT::runOnXamlThread([picker]() { - HRESULT hr; - ComPtr<IFolderPicker2> picker2; - hr = picker->QueryInterface(IID_PPV_ARGS(picker2.GetAddressOf())); - RETURN_HR_IF_FAILED("Failed to cast folder picker"); - return picker2->PickFolderAndContinue(); - }); - RETURN_FALSE_IF_FAILED("Failed to open folder picker"); - QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher(); - Q_ASSERT(eventDispatcher); - eventDispatcher->installEventFilter(helper); -#else hr = QEventDispatcherWinRT::runOnXamlThread([picker, helper]() { HRESULT hr; ComPtr<IAsyncOperation<StorageFolder *>> op; @@ -290,7 +247,6 @@ static bool pickFolder(IFolderPicker *picker, QWinRTFileDialogHelper *helper) RETURN_HR_IF_FAILED("Failed to attach folder picker callback"); return S_OK; }); -#endif return SUCCEEDED(hr); } @@ -299,19 +255,6 @@ static bool pickSaveFile(IFileSavePicker *picker, QWinRTFileDialogHelper *helper Q_ASSERT(picker); Q_ASSERT(helper); HRESULT hr; -#ifdef Q_OS_WINPHONE - hr = QEventDispatcherWinRT::runOnXamlThread([picker]() { - HRESULT hr; - ComPtr<IFileSavePicker2> picker2; - hr = picker->QueryInterface(IID_PPV_ARGS(picker2.GetAddressOf())); - RETURN_HR_IF_FAILED("Failed to cast save file picker"); - return picker2->PickSaveFileAndContinue(); - }); - RETURN_FALSE_IF_FAILED("Failed to open single file picker"); - QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher(); - Q_ASSERT(eventDispatcher); - eventDispatcher->installEventFilter(helper); -#else hr = QEventDispatcherWinRT::runOnXamlThread([picker, helper]() { HRESULT hr; ComPtr<IAsyncOperation<StorageFile *>> op; @@ -321,7 +264,6 @@ static bool pickSaveFile(IFileSavePicker *picker, QWinRTFileDialogHelper *helper RETURN_HR_IF_FAILED("Failed to attach save file picker callback"); return S_OK; }); -#endif return SUCCEEDED(hr); } @@ -488,68 +430,6 @@ void QWinRTFileDialogHelper::hide() d->shown = false; } -#ifdef Q_OS_WINPHONE -bool QWinRTFileDialogHelper::eventFilter(QObject *, QEvent *e) -{ - if (e->type() != QEvent::WinEventAct) - return false; - - HRESULT hr; - QActivationEvent *event = static_cast<QActivationEvent *>(e); - ComPtr<IInspectable> inspectable = event->args(); - ComPtr<IActivatedEventArgs> arguments; - hr = inspectable.As(&arguments); - Q_ASSERT_SUCCEEDED(hr); - - ActivationKind activationKind; - hr = arguments->get_Kind(&activationKind); - Q_ASSERT_SUCCEEDED(hr); - - // Handle only File, Folder and Save file pick continuation here. - if (activationKind != ActivationKind_PickFileContinuation - && activationKind != ActivationKind_PickFolderContinuation - && activationKind != ActivationKind_PickSaveFileContinuation) { - return false; - } - - QAbstractEventDispatcher *eventDispatcher = QCoreApplication::eventDispatcher(); - Q_ASSERT(eventDispatcher); - eventDispatcher->removeEventFilter(this); - e->accept(); - - if (activationKind == ActivationKind_PickFileContinuation) { - ComPtr<IFileOpenPickerContinuationEventArgs> fileContinuationArgs; - hr = arguments.As(&fileContinuationArgs); - Q_ASSERT_SUCCEEDED(hr); - ComPtr<IVectorView<StorageFile *>> files; - hr = fileContinuationArgs->get_Files(&files); - Q_ASSERT_SUCCEEDED(hr); - hr = onFilesPicked(files.Get()); - Q_ASSERT_SUCCEEDED(hr); - } else if (activationKind == ActivationKind_PickFolderContinuation) { - ComPtr<IFolderPickerContinuationEventArgs> folderContinuationArgs; - hr = arguments.As(&folderContinuationArgs); - Q_ASSERT_SUCCEEDED(hr); - ComPtr<IStorageFolder> folder; - hr = folderContinuationArgs->get_Folder(&folder); - Q_ASSERT_SUCCEEDED(hr); - hr = onFolderPicked(folder.Get()); - Q_ASSERT_SUCCEEDED(hr); - } else { - ComPtr<IFileSavePickerContinuationEventArgs> saveFileContinuationArgs; - hr = arguments.As(&saveFileContinuationArgs); - Q_ASSERT_SUCCEEDED(hr); - ComPtr<IStorageFile> file; - hr = saveFileContinuationArgs->get_File(&file); - Q_ASSERT_SUCCEEDED(hr); - hr = onFilePicked(file.Get()); - Q_ASSERT_SUCCEEDED(hr); - } - - return true; -} -#endif - void QWinRTFileDialogHelper::setDirectory(const QUrl &directory) { Q_D(QWinRTFileDialogHelper); @@ -586,7 +466,6 @@ QString QWinRTFileDialogHelper::selectedNameFilter() const return d->selectedNameFilter; } -#ifndef Q_OS_WINPHONE HRESULT QWinRTFileDialogHelper::onSingleFilePicked(IAsyncOperation<StorageFile *> *args, AsyncStatus status) { Q_D(QWinRTFileDialogHelper); @@ -643,17 +522,9 @@ HRESULT QWinRTFileDialogHelper::onSingleFolderPicked(IAsyncOperation<StorageFold Q_ASSERT_SUCCEEDED(hr); return onFolderPicked(folder.Get()); } -#endif //Q_OS_WINPHONE HRESULT QWinRTFileDialogHelper::onFilesPicked(IVectorView<StorageFile *> *files) { -#ifdef Q_OS_WINPHONE - Q_D(QWinRTFileDialogHelper); - QEventLoopLocker locker(&d->loop); - d->shown = false; - d->selectedFiles.clear(); -#endif - HRESULT hr; quint32 size; hr = files->get_Size(&size); @@ -676,13 +547,6 @@ HRESULT QWinRTFileDialogHelper::onFilesPicked(IVectorView<StorageFile *> *files) HRESULT QWinRTFileDialogHelper::onFolderPicked(IStorageFolder *folder) { -#ifdef Q_OS_WINPHONE - Q_D(QWinRTFileDialogHelper); - QEventLoopLocker locker(&d->loop); - d->shown = false; - d->selectedFiles.clear(); -#endif - if (!folder) { emit reject(); return S_OK; @@ -695,13 +559,6 @@ HRESULT QWinRTFileDialogHelper::onFolderPicked(IStorageFolder *folder) HRESULT QWinRTFileDialogHelper::onFilePicked(IStorageFile *file) { -#ifdef Q_OS_WINPHONE - Q_D(QWinRTFileDialogHelper); - QEventLoopLocker locker(&d->loop); - d->shown = false; - d->selectedFiles.clear(); -#endif - if (!file) { emit reject(); return S_OK; diff --git a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h index 413dee7459..99239aad3a 100644 --- a/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h +++ b/src/plugins/platforms/winrt/qwinrtfiledialoghelper.h @@ -75,9 +75,6 @@ public: void exec() override; bool show(Qt::WindowFlags, Qt::WindowModality, QWindow *) override; void hide() override; -#ifdef Q_OS_WINPHONE - bool eventFilter(QObject *o, QEvent *e) override; -#endif bool defaultNameFilterDisables() const override { return false; } void setDirectory(const QUrl &directory) override; @@ -88,14 +85,12 @@ public: void selectNameFilter(const QString &selectedNameFilter) override; QString selectedNameFilter() const override; -#ifndef Q_OS_WINPHONE HRESULT onSingleFilePicked(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Storage::StorageFile *> *, ABI::Windows::Foundation::AsyncStatus); HRESULT onMultipleFilesPicked(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Foundation::Collections::IVectorView<ABI::Windows::Storage::StorageFile *> *> *, ABI::Windows::Foundation::AsyncStatus); HRESULT onSingleFolderPicked(ABI::Windows::Foundation::IAsyncOperation<ABI::Windows::Storage::StorageFolder *> *, ABI::Windows::Foundation::AsyncStatus); -#endif private: HRESULT onFilesPicked(ABI::Windows::Foundation::Collections::IVectorView<ABI::Windows::Storage::StorageFile *> *files); diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.cpp b/src/plugins/platforms/winrt/qwinrtfileengine.cpp index 557c13cf63..dab2482ab3 100644 --- a/src/plugins/platforms/winrt/qwinrtfileengine.cpp +++ b/src/plugins/platforms/winrt/qwinrtfileengine.cpp @@ -153,7 +153,6 @@ static HRESULT getDestinationFolder(const QString &fileName, const QString &newF HRESULT hr; ComPtr<IAsyncOperation<StorageFolder *>> op; QFileInfo newFileInfo(newFileName); -#ifndef Q_OS_WINPHONE QFileInfo fileInfo(fileName); if (fileInfo.dir() == newFileInfo.dir()) { ComPtr<IStorageItem2> item; @@ -161,12 +160,7 @@ static HRESULT getDestinationFolder(const QString &fileName, const QString &newF Q_ASSERT_SUCCEEDED(hr); hr = item->GetParentAsync(&op); - } else -#else - Q_UNUSED(fileName); - Q_UNUSED(file) -#endif - { + } else { ComPtr<IStorageFolderStatics> folderFactory; hr = RoGetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Storage_StorageFolder).Get(), IID_PPV_ARGS(&folderFactory)); diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp index ffc3bbf077..7a30c8d98b 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.cpp +++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp @@ -74,10 +74,8 @@ #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) # include <windows.phone.ui.input.h> -# if _MSC_VER >= 1900 -# include <windows.foundation.metadata.h> - using namespace ABI::Windows::Foundation::Metadata; -# endif +# include <windows.foundation.metadata.h> + using namespace ABI::Windows::Foundation::Metadata; #endif @@ -153,7 +151,6 @@ QWinRTIntegration::QWinRTIntegration() : d_ptr(new QWinRTIntegrationPrivate) Q_ASSERT_SUCCEEDED(hr); #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) -#if _MSC_VER >= 1900 d->hasHardwareButtons = false; ComPtr<IApiInformationStatics> apiInformationStatics; hr = RoGetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Foundation_Metadata_ApiInformation).Get(), @@ -163,9 +160,6 @@ QWinRTIntegration::QWinRTIntegration() : d_ptr(new QWinRTIntegrationPrivate) const HStringReference valueRef(L"Windows.Phone.UI.Input.HardwareButtons"); hr = apiInformationStatics->IsTypePresent(valueRef.Get(), &d->hasHardwareButtons); } -#else - d->hasHardwareButtons = true; -#endif // _MSC_VER >= 1900 if (d->hasHardwareButtons) { hr = RoGetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Phone_UI_Input_HardwareButtons).Get(), @@ -226,12 +220,11 @@ QWinRTIntegration::~QWinRTIntegration() // Do not execute this on Windows Phone as the application is already // shutting down and trying to unregister suspending/resume handler will // cause exceptions and assert in debug mode -#ifndef Q_OS_WINPHONE for (QHash<CoreApplicationCallbackRemover, EventRegistrationToken>::const_iterator i = d->applicationTokens.begin(); i != d->applicationTokens.end(); ++i) { hr = (d->application.Get()->*i.key())(i.value()); Q_ASSERT_SUCCEEDED(hr); } -#endif + destroyScreen(d->mainScreen); Windows::Foundation::Uninitialize(); } @@ -318,11 +311,7 @@ QPlatformClipboard *QWinRTIntegration::clipboard() const #ifndef QT_NO_DRAGANDDROP QPlatformDrag *QWinRTIntegration::drag() const { -#if _MSC_VER >= 1900 return QWinRTDrag::instance(); -#else - return QPlatformIntegration::drag(); -#endif } #endif // QT_NO_DRAGANDDROP diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index f87ae9fd24..060f1839cf 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -562,7 +562,7 @@ QWinRTScreen::QWinRTScreen() ComPtr<Xaml::IUIElement> uiElement; hr = canvas.As(&uiElement); Q_ASSERT_SUCCEEDED(hr); -#if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP) +#ifndef QT_NO_DRAGANDDROP QWinRTDrag::instance()->setUiElement(uiElement); #endif hr = window->put_Content(uiElement.Get()); @@ -833,7 +833,7 @@ void QWinRTScreen::addWindow(QWindow *window) handleExpose(); QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); -#if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP) +#ifndef QT_NO_DRAGANDDROP QWinRTDrag::instance()->setDropTarget(window); #endif } @@ -852,7 +852,7 @@ void QWinRTScreen::removeWindow(QWindow *window) QWindowSystemInterface::handleWindowActivated(Q_NULLPTR, Qt::OtherFocusReason); handleExpose(); QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); -#if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP) +#ifndef QT_NO_DRAGANDDROP if (wasTopWindow) QWinRTDrag::instance()->setDropTarget(topWindow()); #endif @@ -1221,11 +1221,7 @@ HRESULT QWinRTScreen::onPointerUpdated(ICoreWindow *, IPointerEventArgs *args) properties->get_Pressure(&pressure); boolean isPressed; -#ifndef Q_OS_WINPHONE pointerPoint->get_IsInContact(&isPressed); -#else - properties->get_IsLeftButtonPressed(&isPressed); // IsInContact not reliable on phone -#endif // Devices like the Hololens set a static pressure of 0.5 independent // of the pressed state. In those cases we need to synthesize the @@ -1356,16 +1352,10 @@ HRESULT QWinRTScreen::onDpiChanged(IDisplayInformation *, IInspectable *) Q_D(QWinRTScreen); HRESULT hr; -#ifdef Q_OS_WINPHONE - ComPtr<IDisplayInformation2> displayInformation; - hr = d->displayInformation.As(&displayInformation); - RETURN_OK_IF_FAILED("Failed to cast display information."); - hr = displayInformation->get_RawPixelsPerViewPixel(&d->scaleFactor); -#else ResolutionScale resolutionScale; hr = d->displayInformation->get_ResolutionScale(&resolutionScale); d->scaleFactor = qreal(resolutionScale) / 100; -#endif + qCDebug(lcQpaWindows) << __FUNCTION__ << "Scale Factor:" << d->scaleFactor; RETURN_OK_IF_FAILED("Failed to get scale factor"); diff --git a/src/plugins/platforms/winrt/qwinrttheme.cpp b/src/plugins/platforms/winrt/qwinrttheme.cpp index f84688f045..6b35bde83e 100644 --- a/src/plugins/platforms/winrt/qwinrttheme.cpp +++ b/src/plugins/platforms/winrt/qwinrttheme.cpp @@ -84,7 +84,6 @@ static inline QColor fromColor(const Color &color) return QColor(color.R, color.G, color.B, color.A); } -#if _MSC_VER >= 1900 static bool uiColorSettings(const wchar_t *value, UIElementType type, Color *color) { static ComPtr<IApiInformationStatics> apiInformationStatics; @@ -189,103 +188,6 @@ static void nativeColorSettings(QPalette &p) p.setColor(QPalette::BrightText, fromColor(color)); } -#else // _MSC_VER >= 1900 - -static void nativeColorSettings(QPalette &p) -{ - HRESULT hr; - Color color; - -#ifdef Q_OS_WINPHONE - hr = uiSettings()->UIElementColor(UIElementType_PopupBackground, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ToolTipBase, fromColor(color)); - p.setColor(QPalette::AlternateBase, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_NonTextMedium, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Button, fromColor(color)); - hr = uiSettings()->UIElementColor(UIElementType_NonTextMediumHigh, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Midlight, fromColor(color)); - hr = uiSettings()->UIElementColor(UIElementType_NonTextHigh, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Light, fromColor(color)); - hr = uiSettings()->UIElementColor(UIElementType_NonTextMediumLow, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Mid, fromColor(color)); - hr = uiSettings()->UIElementColor(UIElementType_NonTextLow, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Dark, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_TextHigh, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ButtonText, fromColor(color)); - p.setColor(QPalette::Text, fromColor(color)); - p.setColor(QPalette::WindowText, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_TextMedium, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ToolTipText, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_AccentColor, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Highlight, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_PageBackground, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Window, fromColor(color)); - p.setColor(QPalette::Base, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_TextContrastWithHigh, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::BrightText, fromColor(color)); -#else - hr = uiSettings()->UIElementColor(UIElementType_ActiveCaption, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ToolTipBase, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_Background, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::AlternateBase, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_ButtonFace, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Button, fromColor(color)); - p.setColor(QPalette::Midlight, fromColor(color).lighter(110)); - p.setColor(QPalette::Light, fromColor(color).lighter(150)); - p.setColor(QPalette::Mid, fromColor(color).dark(130)); - p.setColor(QPalette::Dark, fromColor(color).dark(150)); - - hr = uiSettings()->UIElementColor(UIElementType_ButtonText, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ButtonText, fromColor(color)); - p.setColor(QPalette::Text, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_CaptionText, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::ToolTipText, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_Highlight, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Highlight, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_HighlightText, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::HighlightedText, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_Window, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::Window, fromColor(color)); - p.setColor(QPalette::Base, fromColor(color)); - - hr = uiSettings()->UIElementColor(UIElementType_Hotlight, &color); - Q_ASSERT_SUCCEEDED(hr); - p.setColor(QPalette::BrightText, fromColor(color)); -#endif -} -#endif // _MSC_VER < 1900 - QWinRTTheme::QWinRTTheme() : d_ptr(new QWinRTThemePrivate) { diff --git a/src/plugins/platforms/winrt/qwinrtwindow.cpp b/src/plugins/platforms/winrt/qwinrtwindow.cpp index 8f3b86ff3b..c40a1b8c45 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.cpp +++ b/src/plugins/platforms/winrt/qwinrtwindow.cpp @@ -331,7 +331,6 @@ void QWinRTWindow::setWindowState(Qt::WindowState state) if (d->state == state) return; -#if _MSC_VER >= 1900 if (state == Qt::WindowFullScreen) { HRESULT hr; boolean success; @@ -378,7 +377,6 @@ void QWinRTWindow::setWindowState(Qt::WindowState state) return; } } -#endif // _MSC_VER >= 1900 if (state == Qt::WindowMinimized) setUIElementVisibility(d->uiElement.Get(), false); diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index be2f5ca7e2..35801fdacc 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -52,7 +52,7 @@ WINRT_SDK_VERSION_STRING = $$(UCRTVersion) WINRT_SDK_VERSION = $$member($$list($$split(WINRT_SDK_VERSION_STRING, .)), 2) lessThan(WINRT_SDK_VERSION, 14322): DEFINES += QT_WINRT_LIMITED_DRAGANDDROP -*-msvc2013|contains(DEFINES, QT_NO_DRAGANDDROP) { +contains(DEFINES, QT_NO_DRAGANDDROP) { SOURCES -= qwinrtdrag.cpp HEADERS -= qwinrtdrag.h } diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index b0e70608f9..13ca561d35 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -59,19 +59,7 @@ entry point within the newly created GUI thread. */ -#if _MSC_VER < 1900 -#include <new.h> - -typedef struct -{ - int newmode; -} _startupinfo; -#endif // _MSC_VER < 1900 - extern "C" { -#if _MSC_VER < 1900 - int __getmainargs(int *argc, char ***argv, char ***env, int expandWildcards, _startupinfo *info); -#endif int main(int, char **); } @@ -102,7 +90,6 @@ typedef ITypedEventHandler<CoreApplicationView *, Activation::IActivatedEventArg static QtMessageHandler defaultMessageHandler; static void devMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message) { -#ifndef Q_OS_WINPHONE static HANDLE shmem = 0; static HANDLE event = 0; if (!shmem) @@ -121,7 +108,6 @@ static void devMessageHandler(QtMsgType type, const QMessageLogContext &context, message.data(), (message.length() + 1) * sizeof(wchar_t)); UnmapViewOfFile(data); SetEvent(event); -#endif // !Q_OS_WINPHONE defaultMessageHandler(type, context, message); } @@ -216,7 +202,6 @@ private: // Check whether the app already runs if (!app) { -#if _MSC_VER >= 1900 // I*EventArgs have no launch arguments, hence we // need to prepend the application binary manually wchar_t fn[513]; @@ -224,7 +209,6 @@ private: if (SUCCEEDED(res)) args.prepend(QString::fromWCharArray(fn, res).toUtf8().data()); -#endif _MSC_VER >= 1900 ResumeThread(mainThread); @@ -252,7 +236,6 @@ private: HRESULT __stdcall OnLaunched(ILaunchActivatedEventArgs *launchArgs) Q_DECL_OVERRIDE { -#if _MSC_VER >= 1900 ComPtr<IPrelaunchActivatedEventArgs> preArgs; HRESULT hr = launchArgs->QueryInterface(preArgs.GetAddressOf()); if (SUCCEEDED(hr)) { @@ -263,7 +246,7 @@ private: } commandLine = QString::fromWCharArray(GetCommandLine()).toUtf8(); -#endif + HString launchCommandLine; launchArgs->get_Arguments(launchCommandLine.GetAddressOf()); if (launchCommandLine.IsValid()) { @@ -329,9 +312,7 @@ private: pidFile = CreateFile2(reinterpret_cast<LPCWSTR>(pidFileName.utf16()), GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, ¶ms); // Install the develMode message handler -#ifndef Q_OS_WINPHONE defaultMessageHandler = qInstallMessageHandler(devMessageHandler); -#endif } // Wait for debugger before continuing if (debugWait) { @@ -396,11 +377,6 @@ int __stdcall WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { int argc = 0; char **argv = 0, **env = 0; -#if _MSC_VER < 1900 - _startupinfo info = { _query_new_mode() }; - if (int init = __getmainargs(&argc, &argv, &env, false, &info)) - return init; -#endif // _MSC_VER >= 1900 for (int i = 0; env && env[i]; ++i) { QByteArray var(env[i]); int split = var.indexOf('='); |