From 45b0f1be686cfba8dcecb9be5c875cae59c69276 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Fri, 5 Jun 2020 09:24:37 +0200 Subject: Remove winrt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø --- .../common/winrt_winphone/assets/logo_150x150.png | Bin 2638 -> 0 bytes .../common/winrt_winphone/assets/logo_30x30.png | Bin 737 -> 0 bytes .../common/winrt_winphone/assets/logo_310x150.png | Bin 2655 -> 0 bytes .../common/winrt_winphone/assets/logo_310x310.png | Bin 2903 -> 0 bytes .../common/winrt_winphone/assets/logo_44x44.png | Bin 1066 -> 0 bytes .../common/winrt_winphone/assets/logo_480x800.png | Bin 6820 -> 0 bytes .../common/winrt_winphone/assets/logo_620x300.png | Bin 5752 -> 0 bytes .../common/winrt_winphone/assets/logo_70x70.png | Bin 2024 -> 0 bytes .../common/winrt_winphone/assets/logo_71x71.png | Bin 1060 -> 0 bytes .../common/winrt_winphone/assets/logo_store.png | Bin 1159 -> 0 bytes .../manifests/10.0/AppxManifest.xml.in | 52 -------- mkspecs/common/winrt_winphone/qmake.conf | 103 --------------- mkspecs/common/winrt_winphone/qplatformdefs.h | 139 --------------------- 13 files changed, 294 deletions(-) delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_150x150.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_30x30.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x150.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_310x310.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_44x44.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_480x800.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_620x300.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_70x70.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_71x71.png delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_store.png delete mode 100644 mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in delete mode 100644 mkspecs/common/winrt_winphone/qmake.conf delete mode 100644 mkspecs/common/winrt_winphone/qplatformdefs.h (limited to 'mkspecs/common/winrt_winphone') diff --git a/mkspecs/common/winrt_winphone/assets/logo_150x150.png b/mkspecs/common/winrt_winphone/assets/logo_150x150.png deleted file mode 100644 index 069171ca4d..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_150x150.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_30x30.png b/mkspecs/common/winrt_winphone/assets/logo_30x30.png deleted file mode 100644 index 2acac59e73..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_30x30.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_310x150.png b/mkspecs/common/winrt_winphone/assets/logo_310x150.png deleted file mode 100644 index 1a79482947..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_310x150.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_310x310.png b/mkspecs/common/winrt_winphone/assets/logo_310x310.png deleted file mode 100644 index 02144a9f39..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_310x310.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_44x44.png b/mkspecs/common/winrt_winphone/assets/logo_44x44.png deleted file mode 100644 index 3cc5bec19f..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_44x44.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_480x800.png b/mkspecs/common/winrt_winphone/assets/logo_480x800.png deleted file mode 100644 index 39a37dac5b..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_480x800.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_620x300.png b/mkspecs/common/winrt_winphone/assets/logo_620x300.png deleted file mode 100644 index a2be79f5d7..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_620x300.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_70x70.png b/mkspecs/common/winrt_winphone/assets/logo_70x70.png deleted file mode 100644 index 334b2722b5..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_70x70.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_71x71.png b/mkspecs/common/winrt_winphone/assets/logo_71x71.png deleted file mode 100644 index 16d0808759..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_71x71.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/assets/logo_store.png b/mkspecs/common/winrt_winphone/assets/logo_store.png deleted file mode 100644 index 417ccdcb5f..0000000000 Binary files a/mkspecs/common/winrt_winphone/assets/logo_store.png and /dev/null differ diff --git a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in deleted file mode 100644 index fe9ddaf8f1..0000000000 --- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - $${WINRT_MANIFEST.name} - $${WINRT_MANIFEST.publisher} - $${WINRT_MANIFEST.logo_store} - - - - $${WINRT_MANIFEST.dependencies} - - - - - - - - - - - - - - - $${WINRT_MANIFEST.capabilities} - diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf deleted file mode 100644 index 55fcbe5ab3..0000000000 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ /dev/null @@ -1,103 +0,0 @@ -# -# qmake configuration for winrt and windows phone 8.1 -# -# Written for Microsoft Visual C++ -# - -MAKEFILE_GENERATOR = MSBUILD -QMAKE_COMPILER = msvc -QMAKE_PLATFORM = winrt win32 -CONFIG = package_manifest $$CONFIG incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target rtti -# MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without -# _ENABLE_EXTENDED_ALIGNED_STORAGE flag since the fix breaks binary compatibility. -DEFINES += UNICODE WIN32 QT_LARGEFILE_SUPPORT Q_BYTE_ORDER=Q_LITTLE_ENDIAN _ENABLE_EXTENDED_ALIGNED_STORAGE -DEFINES_RELEASE += NDEBUG -QMAKE_COMPILER_DEFINES += _WIN32 - -DEPLOYMENT_PLUGIN += qwinrt - -QMAKE_CC = cl -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = bison -y -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -QMAKE_CFLAGS_WARN_ON = -W3 -QMAKE_CFLAGS_WARN_OFF = -W0 -QMAKE_CFLAGS_RELEASE = -O2 -MD -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi -QMAKE_CFLAGS_DEBUG = -Zi -MDd -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_LTCG = -GL -QMAKE_CFLAGS_MP = -MP -QMAKE_CFLAGS_SSE2 = -arch:SSE2 -QMAKE_CFLAGS_SSE3 = -arch:SSE2 -QMAKE_CFLAGS_SSSE3 = -arch:SSE2 -QMAKE_CFLAGS_SSE4_1 = -arch:SSE2 -QMAKE_CFLAGS_SSE4_2 = -arch:SSE2 -QMAKE_CFLAGS_AVX = -arch:AVX -QMAKE_CFLAGS_AVX2 = -arch:AVX -QMAKE_CFLAGS_AESNI = -arch:SSE2 -QMAKE_CFLAGS_SHANI = -arch:SSE2 - -QMAKE_CXX = $$QMAKE_CC -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -w34100 -w34189 -w44996 -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG -QMAKE_CXXFLAGS_MP = $$QMAKE_CFLAGS_MP -QMAKE_CXXFLAGS_STL_ON = -EHsc -QMAKE_CXXFLAGS_STL_OFF = -QMAKE_CXXFLAGS_RTTI_ON = -GR -QMAKE_CXXFLAGS_RTTI_OFF = -QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHsc -QMAKE_CXXFLAGS_EXCEPTIONS_OFF = /wd4530 /wd4577 - -QMAKE_INCDIR = - -QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$obj $src -QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ $< -QMAKE_RUN_CC_IMP_BATCH = $(CC) -c $(CFLAGS) $(INCPATH) -Fo$@ @<< -QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$obj $src -QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ $< -QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<< - -QMAKE_LINK = link -QMAKE_LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /NODEFAULTLIB:ole32.lib /APPCONTAINER -QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO -QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF /INCREMENTAL:NO -QMAKE_LFLAGS_DEBUG = /DEBUG -QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS -QMAKE_LFLAGS_EXE = /MANIFEST:NO -QMAKE_LFLAGS_DLL = /MANIFEST:NO /DLL -QMAKE_LFLAGS_LTCG = /LTCG -QMAKE_PREFIX_SHLIB = -QMAKE_EXTENSION_SHLIB = dll -QMAKE_PREFIX_STATICLIB = -QMAKE_EXTENSION_STATICLIB = lib - -QMAKE_LIBS += runtimeobject.lib -QMAKE_LIBS_GUI = -QMAKE_LIBS_NETWORK += ws2_32.lib - -QMAKE_LIBS_QT_ENTRY = -lqtmain - -QMAKE_IDL = midl -QMAKE_LIB = lib /NOLOGO -QMAKE_RC = rc - -VCPROJ_EXTENSION = .vcxproj -VCSOLUTION_EXTENSION = .sln -VCPROJ_KEYWORD = Qt4VSv1.0 -WINRT_ASSETS_PATH = $$PWD/assets - -WINRT_MANIFEST.capabilities = defaults -WINRT_MANIFEST.capabilities_device = defaults - -WINDOWS_TARGET_PLATFORM_VERSION = $$(UCRTVERSION) - -load(qt_config) diff --git a/mkspecs/common/winrt_winphone/qplatformdefs.h b/mkspecs/common/winrt_winphone/qplatformdefs.h deleted file mode 100644 index c561e41668..0000000000 --- a/mkspecs/common/winrt_winphone/qplatformdefs.h +++ /dev/null @@ -1,139 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -#ifdef UNICODE -#ifndef _UNICODE -#define _UNICODE -#endif -#endif - -// Get Qt defines/settings - -#include "qglobal.h" -#include "qfunctions_winrt.h" - -#define _POSIX_ -#include -#undef _POSIX_ - -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct _stati64 // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stati64 // non-ANSI defs -#define QT_STAT ::_stati64 -#define QT_FSTAT ::_fstati64 -#else -#define QT_STATBUF struct _stat // non-ANSI defs -#define QT_STATBUF4TSTAT struct _stat // non-ANSI defs -#define QT_STAT ::_stat -#define QT_FSTAT ::_fstat -#endif -#define QT_STAT_REG _S_IFREG -#define QT_STAT_DIR _S_IFDIR -#define QT_STAT_MASK _S_IFMT -#if defined(_S_IFLNK) -# define QT_STAT_LNK _S_IFLNK -#endif -#define QT_FILENO _fileno -#define QT_OPEN ::_open -#define QT_CLOSE ::_close -#ifdef QT_LARGEFILE_SUPPORT -#define QT_LSEEK ::_lseeki64 -#define QT_TSTAT ::_tstati64 -#else -#define QT_LSEEK ::_lseek -#define QT_TSTAT ::_tstat -#endif -#define QT_READ ::_read -#define QT_WRITE ::_write -#define QT_ACCESS ::_access -#define QT_GETCWD ::_getcwd -#define QT_CHDIR ::_chdir -#define QT_MKDIR ::_mkdir -#define QT_RMDIR ::_rmdir -#define QT_OPEN_LARGEFILE 0 -#define QT_OPEN_RDONLY _O_RDONLY -#define QT_OPEN_WRONLY _O_WRONLY -#define QT_OPEN_RDWR _O_RDWR -#define QT_OPEN_CREAT _O_CREAT -#define QT_OPEN_TRUNC _O_TRUNC -#define QT_OPEN_APPEND _O_APPEND -#if defined(O_TEXT) -# define QT_OPEN_TEXT _O_TEXT -# define QT_OPEN_BINARY _O_BINARY -#endif - -#include "../common/c89/qplatformdefs.h" - -#ifdef QT_LARGEFILE_SUPPORT -#undef QT_FSEEK -#undef QT_FTELL -#undef QT_OFF_T - -#define QT_FSEEK ::_fseeki64 -#define QT_FTELL ::_ftelli64 -#define QT_OFF_T __int64 -#endif - -#define QT_SIGNAL_ARGS int - -#define QT_VSNPRINTF(buffer, count, format, arg) \ - vsnprintf_s(buffer, count, count-1, format, arg) - -#define QT_SNPRINTF ::_snprintf - -# define F_OK 0 -# define X_OK 1 -# define W_OK 2 -# define R_OK 4 - -typedef int mode_t; - -#endif // QPLATFORMDEFS_H -- cgit v1.2.3