diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-02 13:57:39 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-04 15:51:51 +0200 |
| commit | 9cefaca1ea908df39edee03ef888a40690d355af (patch) | |
| tree | 4b9b70afc4215c45130a96c01e4d056b0ae362d1 /src/qml/qml | |
| parent | d0c177f0ee42d7c9454f0093635a5f68362f2283 (diff) | |
Remove winrt
Task-number: QTBUG-84434
Change-Id: If8f57f00726868a3540c877d07fca761618e4f08
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 11 | ||||
| -rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 6 |
3 files changed, 4 insertions, 15 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index fec4f2ba65..0692124dfe 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -91,9 +91,7 @@ #ifdef Q_OS_WIN // for %APPDATA% # include <qt_windows.h> -# ifndef Q_OS_WINRT -# include <shlobj.h> -# endif +# include <shlobj.h> # include <qlibrary.h> # ifndef CSIDL_APPDATA # define CSIDL_APPDATA 0x001a // <username>\Application Data @@ -390,7 +388,6 @@ The following functions are also on the Qt object. \li \c "qnx" - QNX (since Qt 5.9.3) \li \c "unix" - Other Unix-based OS \li \c "windows" - Windows - \li \c "winrt" - WinRT / UWP \li \c "wasm" - WebAssembly \endlist @@ -2506,7 +2503,7 @@ bool QQmlEnginePrivate::isScriptLoaded(const QUrl &url) const return typeLoader.isScriptLoaded(url); } -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) +#if defined(Q_OS_WIN) // Normalize a file name using Shell API. As opposed to converting it // to a short 8.3 name and back, this also works for drives where 8.3 notation // is disabled (see 8dot3name options of fsutil.exe). @@ -2538,7 +2535,7 @@ static inline QString shellNormalizeFileName(const QString &name) canonicalName[0] = canonicalName.at(0).toUpper(); return QDir::cleanPath(canonicalName); } -#endif // Q_OS_WIN && !Q_OS_WINRT +#endif // Q_OS_WIN bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) { @@ -2546,7 +2543,7 @@ bool QQml_isFileCaseCorrect(const QString &fileName, int lengthIn /* = -1 */) QFileInfo info(fileName); const QString absolute = info.absoluteFilePath(); -#if defined(Q_OS_DARWIN) || defined(Q_OS_WINRT) +#if defined(Q_OS_DARWIN) const QString canonical = info.canonicalFilePath(); #elif defined(Q_OS_WIN) // No difference if the path is qrc based diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index dcd7ca2d46..077b9f0698 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -66,8 +66,6 @@ QString QQmlPlatform::os() return QStringLiteral("tvos"); #elif defined(Q_OS_MAC) return QStringLiteral("osx"); -#elif defined(Q_OS_WINRT) - return QStringLiteral("winrt"); #elif defined(Q_OS_WIN) return QStringLiteral("windows"); #elif defined(Q_OS_LINUX) diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 856dda1663..9af7e539e3 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -672,9 +672,6 @@ QRectF QQmlVMEMetaObject::readPropertyAsRectF(int id) const return v->d()->data().value<QRectF>(); } -#if defined(Q_OS_WINRT) && defined(_M_ARM) -#pragma optimize("", off) -#endif int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void **a) { Q_ASSERT(o == object); @@ -1049,9 +1046,6 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * else return object->qt_metacall(c, _id, a); } -#if defined(Q_OS_WINRT) && defined(_M_ARM) -#pragma optimize("", on) -#endif QV4::ReturnedValue QQmlVMEMetaObject::method(int index) const { |