From affba56094d972bb28a122c17e6a43373be5d1dd Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Fri, 12 Dec 2014 15:45:46 +0200 Subject: [PATCH] remove unsupported winrt mkspecs These mkspecs are not supported and no longer compile. Related support in qmake has also been removed. Change-Id: I7706dcfa5471e55e2ae3d580d65e9371e2c652d5 Reviewed-by: Joerg Bornemann Reviewed-by: Oliver Wolff --- .../winrt_winphone/assets/logo_medium.png | Bin 1907 -> 0 bytes .../assets/tile_iconic_medium.png | Bin 3166 -> 0 bytes .../assets/tile_iconic_small.png | Bin 1958 -> 0 bytes .../manifests/8.0/AppxManifest.xml.in | 37 ---------- .../manifests/8.0/WMAppManifest.xml.in | 38 ---------- mkspecs/common/winrt_winphone/qmake.conf | 2 +- mkspecs/winphone-arm-msvc2012/qmake.conf | 21 ------ mkspecs/winphone-arm-msvc2012/qplatformdefs.h | 34 --------- mkspecs/winphone-x86-msvc2012/qmake.conf | 21 ------ mkspecs/winphone-x86-msvc2012/qplatformdefs.h | 34 --------- mkspecs/winrt-arm-msvc2012/qmake.conf | 20 ------ mkspecs/winrt-arm-msvc2012/qplatformdefs.h | 34 --------- mkspecs/winrt-x64-msvc2012/qmake.conf | 20 ------ mkspecs/winrt-x64-msvc2012/qplatformdefs.h | 34 --------- mkspecs/winrt-x86-msvc2012/qmake.conf | 20 ------ mkspecs/winrt-x86-msvc2012/qplatformdefs.h | 34 --------- .../generators/win32/msbuild_objectmodel.cpp | 40 +++-------- qmake/generators/win32/msvc_nmake.cpp | 7 +- qmake/generators/win32/msvc_objectmodel.cpp | 1 - qmake/generators/win32/msvc_objectmodel.h | 2 +- qmake/generators/win32/msvc_vcproj.cpp | 68 ------------------ qmake/generators/win32/msvc_vcproj.h | 1 - 22 files changed, 11 insertions(+), 457 deletions(-) delete mode 100644 mkspecs/common/winrt_winphone/assets/logo_medium.png delete mode 100644 mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png delete mode 100644 mkspecs/common/winrt_winphone/assets/tile_iconic_small.png delete mode 100644 mkspecs/common/winrt_winphone/manifests/8.0/AppxManifest.xml.in delete mode 100644 mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in delete mode 100644 mkspecs/winphone-arm-msvc2012/qmake.conf delete mode 100644 mkspecs/winphone-arm-msvc2012/qplatformdefs.h delete mode 100644 mkspecs/winphone-x86-msvc2012/qmake.conf delete mode 100644 mkspecs/winphone-x86-msvc2012/qplatformdefs.h delete mode 100644 mkspecs/winrt-arm-msvc2012/qmake.conf delete mode 100644 mkspecs/winrt-arm-msvc2012/qplatformdefs.h delete mode 100644 mkspecs/winrt-x64-msvc2012/qmake.conf delete mode 100644 mkspecs/winrt-x64-msvc2012/qplatformdefs.h delete mode 100644 mkspecs/winrt-x86-msvc2012/qmake.conf delete mode 100644 mkspecs/winrt-x86-msvc2012/qplatformdefs.h diff --git a/mkspecs/common/winrt_winphone/assets/logo_medium.png b/mkspecs/common/winrt_winphone/assets/logo_medium.png deleted file mode 100644 index fa0d9fb64ad962db1a73560a8d7913096a093c28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1907 zcmV-(2aNcMP)IFKMj89|6Lf)Hf{A<76slo5m| zBM4DO5TcAAL>Y%{TI=~bxsisDr+~YBCu(6Uu$)R!Yk;~M&h{b21v>20G$Zp^Phj_z*dl7LH4Dt2> zHv*e1=>;JP%mIG4#F>DM89ff%3VaMKA-Ugnfgew}+a9e2aAWOw2+CGUJ#5oSP7~6_FB$n(7L430dF}=X^t00ja{0 zc)jHBA0YjfcYqHauA3Q}n!Pq51F`qQ&o+cDK_2c+z^m9>a+85$**~f8DBxksIW?n2 z$Y$idwTW?v6ceWxjpjnu5--Oin2T%N(Mr-R9Wo~amG8uX~5i>`^qgl`JqL~ za)&s>9Mc+W2(vXBaz{&*)zs;$h?BE;o^>ALtQ2=Rc+tI~arX%#HtUMENUMvIW4 z4sl$YojWbzLmbn|h5jhS)N#z6AVe8`QOJLm@K9wrkW~p83>@s3PA+H>;xaVhLx}3? z3iJqZDIqSMM+ic^(CiSW!!fN5hOiNiY2=0$AuSGZesD}{i6LyFV;Z@kMMyLD4F_6@ ze^*}0E@VY)5|>nysXWjk1Y~`OiM_zjmN-jE-ihHjs@s*Qvx>Oh&?MwShd8!s%M>10 zI!vG6CO;K43Aq;gi0(X+clU{amksB}2}zm-3Gh?dzdL|+hWK94BxEo!#S&*RGUG6g zc_dE@Z2&Hf`F~TZ>jh+D_cY*mq`LdglE2!CqR7WFGV;S>hif%QQM9J)y!I%Hh8WJ7 zX}D&i!!>)31%`A+R*_EPp{ay`Oa+~4iPH(3gj8|!k)>}f$n3{B8iD%_=}oIHi|OKP zual9;CM-VKgiOEj^=9um%#zn5f^DP3Ak&5>C4{Nk>%=Ebz#I74uklXoCGKcsZr138 zyj%m!MIP!&GQ6R&g!J$cQXTc?m1_a1rXIrmOSc#4RJH=!km_@673X^?A)1AN+@R^e z*HxS|3V4hRzRhLy*($4)7T^ou6{NH@SmMt`<_Tvl!yDR#faGxsun73n61S21_)Lk^ zTjs|jtD2H{E31se;L=L7Qg1>Ez?FvZMMw)RYqsI3nO<)~0Is%#Pe%F`cO%=KXMt@w zo-_3*K>X$bdE!mHrVmvO7vr`kN*1&tt9!kmWd&7l zco13dF&o*bArHEM+k7Udy{GQNCg5%4!MYNe2-gIhh^%c-b7I4Nz!N?b>8y{ zyf+%^xys6#E@Xp)HxUu5)3`_wQprAKnRZ+8Xf6Jk$xl}FXCd84f2FPLXvaSPD>eFq zkO-+>dcNtUH{P~%A#;2Q*@Jv=+xosViID99%fIo<@HFt31wMb!z6*y zLALxZUm(*-WplC(`@XvUhO~qLoCe&E)a^YtK9?Eg^+cLN0==MKhu`}wL5MPf5M=}* t$_PS~5rils2vJ55qKqI!89|6L{s-85;&PW0R@wjn002ovPDHLkV1gJbgIWLp diff --git a/mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png b/mkspecs/common/winrt_winphone/assets/tile_iconic_medium.png deleted file mode 100644 index e42f8255db63baa528640a21b8dee2ae100df9d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3166 zcmeHJ`8OMg7EbKaFm{nzVk?G{)KXhoMM$i%R8ce%G*zuFhSnBJW)Q|wMN_rbQmW`; zizSxWw<^tGP*J0{GL$OnnfJ^4AKsaJ&Ue3i@3}vH=iKw%B&?mK00;^K0006Qw7KIc zQ%*6!$9bBsA^TpR5@)C>#+i?gZ|0-@!fDGNgmw!(UH|Y8fTpUnh|{4I3FS(13iKm| zdx!V}!o$NgZ{58eO7ITy)eH=|N!v7r0stI~SQ}^5$-nWh0{_}fuWHx^0LVlQ!{gvg(b$y+Q!z-9_!%f(M>)B9k7-ZxpB5Ar z6_=DgD=V+4d|p-kqUL2?{j1k+-ZnHgHMh`P+uA!Aon75M%-+8Kfx)4X(XsJ&6YnRd zKCu3no|&DSU--DlUi!5B*UIPBwe^k7FI(Gx@9civ+y8d({qX4chg_@*F95*1fib`0 z95KD|b5ny?2lM2ht~g%k~8? z#W{oa&8_3C-#b&*2_IMG>btoWjHZN$1D7#(S;e_8<*Z6h_g7^RHw4Vl(d-3D`OQ1I z4mN>+#Yyb9!RcDY#){hPbKn~tRBsz-KPol8^E(t*)^cm@veY<6jOpLuzOUU@z&>tH z+F1^TrONu=O^RxuVW|*U%B26s*>S>SG%8f`gK-V3nX3uwve?(2Gblw&61m1W3wa`!^uwpn;T-O0gy>+ z@Y1N6m2YRoS6vTi6MFM4adW!0eZIywv4~$+WT63xrqillkGCKH6#$ozvJD@a5^Bz$ zR9>@zizF<09&X3n&ch%1s&REm6by6Z;^`_H0x}76$&b@C5cS)!<01YYj`0J6P0%dvI#mWVcUnXba+p`08$Im6I5>qXpVV2vpTNI|`D`DE^yJW=JU zo36M8&=6;&@y?Lbi9m@J0t6_*GwRU~f5v>b>cAupX3K?GUDA)Q$^ zk5tSf4$hS0#o$q~KDZMIT+NDt?00DYTEztsXTcL#7lpmj$7*}^N2Q{@?g^K>g#STU zXHwJ{w)bk;;7F=33vM4Yafh|d39!6&J_YRk8$#+VCH=cGS;k?ys^{qTk6yubmXMsx zK`=HSLS?9;)E!>{-`XhSux(D?iy#{qH5uu+d$qkQX?T)iQvl3bat|Vd1xr3y15D@0 zMS=s4BVqlYz-~i%g!lNL2KX|E^LK47bVtN{f6EH+Dy>YEx8SEB5`A_aAopDfvmNkD zV(@PjL3)q2K^u&v*o#p$qQ~k`UqIsMzcd!^`b`;zA%O2c3h2tI;2S6KIyg&& zred}hv47gG!4%8?C+q9$6c2T(kIfdeO9Pp$@F(a_KAI{*x)jKHC%$HlU-#*hsOq6} z8@=>WF-W9E+F0<|p!nd$OktTUeF6-`rtHvlwdv4;9~eABkZ@+#fDYn|TE|uWFh0pP zCsfFc7u|oj#_{sfRzdaDAl~1~=9mS*)^it?9Qc;p88v?wHSvX|ta^qZArGP0*bld*vbp9Brz{E`OOtU*0G0 z2~;_aqd7;>)qTiJ1wDU%y)`2(JsknSA8=@3dXf^~JPF{_LyY2LBeBUyKwsK+rqa+> zsj?`~SP) zn@2{k&o9~x2r3154&JfQD&CEEj+`Lal=lL%V_rj~mcej<{%1_0!^lYu?lTWA55w3*G`a~HGCX8m* z_C`ebv7b2P8%%VIu!EPE@0HjdNr0TF)Wh&x7KI(4hYf){$T^c{Md|F zgreB+wCn(znoPQWL1RRKeOg_$V}gpRWY#0D-A5~g>k>&E_)+V~;&b|Wp^gI@41mdS zcJz2$bSXE{Q3J6tIwPm;R&P%g76+n&!#-pY%F{2`D%N$rK4Z3e^g#W=od2*cjpJo` mH7NMi(*NxCAK!Ht9BWs5o`;z|NcTSdd;l1foq3HZF8)8a8aa0W diff --git a/mkspecs/common/winrt_winphone/assets/tile_iconic_small.png b/mkspecs/common/winrt_winphone/assets/tile_iconic_small.png deleted file mode 100644 index c7b7ee7893f5fdc0d0ce3c5d74308738cd3ed824..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1958 zcmah~`#Td18(vOx8kt2-U-z#M{XZxlkg~2a0002_`FaI!tIsz7 zR8-jBDVl0C+agEu^b1kko^(ZA-nLgt^2Lz0^ArE)4o~x{)a|2AvUhm$@kD$w<;RR>(0aLmFPzY??A=&ZtZ*W6m*5=VDwE6Gwjh=B^ozI?JUxf#2X_y^4xd&=}H36urk%$A0ERwHoO5gz)C)C ze27;1MJ`kj*?E#io@SR7tiqBWECI?54f*?4vL8PS&=On8 zJPK?h0BR7Q)}X$Zr58k|^Od;_RPE8of?28yhSj*_%We&v6Gqt=wSYATthu#z#6>Qvc6r9` z!vk%Jb>{F~meif=Ww!P7m86M=pfY_`T=VC-J$b23jGvq{5mW2&5(n>2ySgU|2<&R< zXT56DA4qbT&Z?EVN@=e>LDK9nsR}H%n+yyVAEq7)*n_4YBZlfFpzIp2p`i?=zLzT& z#RD^lLV^M4dzko;p5UhP6@-=+Q4PiX;DO7r&+kKKNMuQjrJ>&4LchV((VxMm&9=^T zsk;xf2W+YPGHdX9d87!7PRo1cM#Gt}rOlx(s!jxCu{S4RyPCWvGghh}IJk+__xZhQ zRM=Y5k*ykvE}iw~R8PJcmRiCL@;umLe@^64my_za8}RXOX2o|mOYpY?#-i9UxHijl zx&SCN?3(Y!-3_!qeL};1IurqN`fK9h_)n^q4;1#03bz=$m4_{uZNh?3Ow@oBBC*XZ zYK<#9S9WRhK6aPboah$JnJy$O!l!BWFDp=JDI~VxF&=i0{R+KM)N8Tt@~!^s&MeU1 zi(Dtp11qD8w_em+u2}G+5_l=B#(cQ8#4925`wl{-`Y+M>51&*shl4YVoc3RQG+GYe zHT#-A8ep>%o;+U|sn!y?n7Q9V5)7u7LGIq-KR6vsvsGOv?Ru$HNY9vGQ{d-IBb)Gj zhAKPXm<{u)fUJ07Hp3s8a{pPOf%x)Sf@Qt%+5Pn?vsj#rl=$Pk^uCpZgSXmG z^uJ&oVa~j79Wwbg8Fu18Gh!q0vIeQ`EzOWm#+4++V0p`%n=7_9-;`{!H^`KM|E%ycf zDnWg0*1Axeisq0l6aPuQR@Q^Ci#&O6cmTav%|SpYMTfCZ6wwFa5+mC}>lV zj%1*+r-cAq!)6YIa4bHfEqK*Z+%ir?y< X9;xDTg)*7#p9=8vMtQY(MqT - - - - $${WINRT_MANIFEST.name} - $${WINRT_MANIFEST.publisher} - $${WINRT_MANIFEST.logo_store} - - - 6.2.0 - 6.3.0 - - - - - - - - - - - $${WINRT_MANIFEST.capabilities}$${WINRT_MANIFEST.dependencies} - - diff --git a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in deleted file mode 100644 index 18d37cf7fce..00000000000 --- a/mkspecs/common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in +++ /dev/null @@ -1,38 +0,0 @@ - - - $${WINRT_MANIFEST.languages} - - $${WINRT_MANIFEST.logo_medium}$${WINRT_MANIFEST.capabilities} - - - - - - - $${WINRT_MANIFEST.tile_iconic_small} - $${WINRT_MANIFEST.tile_iconic_medium} - $${WINRT_MANIFEST.name} - $${WINRT_MANIFEST.background} - - - - - - - - - - - diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index d7296afe959..b86f1f92566 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -1,5 +1,5 @@ # -# qmake configuration for winrt and windows phone 8 +# qmake configuration for winrt and windows phone 8.1 # # Written for Microsoft Visual C++ # diff --git a/mkspecs/winphone-arm-msvc2012/qmake.conf b/mkspecs/winphone-arm-msvc2012/qmake.conf deleted file mode 100644 index ce95fdf0b99..00000000000 --- a/mkspecs/winphone-arm-msvc2012/qmake.conf +++ /dev/null @@ -1,21 +0,0 @@ -# -# qmake configuration for winphone-arm-msvc2012 -# -# Written for Microsoft Visual C++ 2012 -# - -include(../common/winrt_winphone/qmake.conf) -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 -QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM -CONFIG += font_deployment -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP ARM __ARM__ __arm__ - -QMAKE_LFLAGS += /MACHINE:ARM - -QMAKE_LIBS += WindowsPhoneCore.lib PhoneAppModelHost.lib - -VCPROJ_ARCH = ARM -MSVC_VER = 11.0 -WINSDK_VER = 8.0 -WINTARGET_VER = WP80 -WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in diff --git a/mkspecs/winphone-arm-msvc2012/qplatformdefs.h b/mkspecs/winphone-arm-msvc2012/qplatformdefs.h deleted file mode 100644 index 8caaa783d34..00000000000 --- a/mkspecs/winphone-arm-msvc2012/qplatformdefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/winrt_winphone/qplatformdefs.h" diff --git a/mkspecs/winphone-x86-msvc2012/qmake.conf b/mkspecs/winphone-x86-msvc2012/qmake.conf deleted file mode 100644 index ff3d714bc52..00000000000 --- a/mkspecs/winphone-x86-msvc2012/qmake.conf +++ /dev/null @@ -1,21 +0,0 @@ -# -# qmake configuration for winphone-x86-msvc2012 -# -# Written for Microsoft Visual C++ 2012 -# - -include(../common/winrt_winphone/qmake.conf) -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 -QMAKE_PLATFORM = winphone $$QMAKE_PLATFORM -CONFIG += font_deployment -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP X86 __X86__ __x86__ - -QMAKE_LFLAGS += /MACHINE:X86 - -QMAKE_LIBS += WindowsPhoneCore.lib PhoneAppModelHost.lib - -VCPROJ_ARCH = Win32 -MSVC_VER = 11.0 -WINSDK_VER = 8.0 -WINTARGET_VER = WP80 -WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/WMAppManifest.xml.in diff --git a/mkspecs/winphone-x86-msvc2012/qplatformdefs.h b/mkspecs/winphone-x86-msvc2012/qplatformdefs.h deleted file mode 100644 index 8caaa783d34..00000000000 --- a/mkspecs/winphone-x86-msvc2012/qplatformdefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/winrt_winphone/qplatformdefs.h" diff --git a/mkspecs/winrt-arm-msvc2012/qmake.conf b/mkspecs/winrt-arm-msvc2012/qmake.conf deleted file mode 100644 index b2603cfb2f0..00000000000 --- a/mkspecs/winrt-arm-msvc2012/qmake.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# qmake configuration for winrt-arm-msvc2012 -# -# Written for Microsoft Visual C++ 2012 -# - -include(../common/winrt_winphone/qmake.conf) -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__ - -QMAKE_LFLAGS += /MACHINE:ARM - -QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib - -VCPROJ_ARCH = ARM -MSVC_VER = 11.0 -WINSDK_VER = 8.0 -WINTARGET_VER = win8 -WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in -WINRT_MANIFEST.architecture = arm diff --git a/mkspecs/winrt-arm-msvc2012/qplatformdefs.h b/mkspecs/winrt-arm-msvc2012/qplatformdefs.h deleted file mode 100644 index 8caaa783d34..00000000000 --- a/mkspecs/winrt-arm-msvc2012/qplatformdefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/winrt_winphone/qplatformdefs.h" diff --git a/mkspecs/winrt-x64-msvc2012/qmake.conf b/mkspecs/winrt-x64-msvc2012/qmake.conf deleted file mode 100644 index a0c64c695ff..00000000000 --- a/mkspecs/winrt-x64-msvc2012/qmake.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# qmake configuration for winrt-x64-msvc2012 -# -# Written for Microsoft Visual C++ 2012 -# - -include(../common/winrt_winphone/qmake.conf) -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X64 __X64__ __x64__ - -QMAKE_LFLAGS += /MACHINE:X64 - -QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib - -VCPROJ_ARCH = x64 -MSVC_VER = 11.0 -WINSDK_VER = 8.0 -WINTARGET_VER = win8 -WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in -WINRT_MANIFEST.architecture = x64 diff --git a/mkspecs/winrt-x64-msvc2012/qplatformdefs.h b/mkspecs/winrt-x64-msvc2012/qplatformdefs.h deleted file mode 100644 index 8caaa783d34..00000000000 --- a/mkspecs/winrt-x64-msvc2012/qplatformdefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/winrt_winphone/qplatformdefs.h" diff --git a/mkspecs/winrt-x86-msvc2012/qmake.conf b/mkspecs/winrt-x86-msvc2012/qmake.conf deleted file mode 100644 index 6e6ea4664d2..00000000000 --- a/mkspecs/winrt-x86-msvc2012/qmake.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# qmake configuration for winrt-x86-msvc2012 -# -# Written for Microsoft Visual C++ 2012 -# - -include(../common/winrt_winphone/qmake.conf) -QMAKE_COMPILER_DEFINES += _MSC_VER=1700 -DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__ - -QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 - -QMAKE_LIBS += windowscodecs.lib kernel32.lib ole32.lib - -VCPROJ_ARCH = Win32 -MSVC_VER = 11.0 -WINSDK_VER = 8.0 -WINTARGET_VER = win8 -WINRT_MANIFEST = $$PWD/../common/winrt_winphone/manifests/8.0/AppxManifest.xml.in -WINRT_MANIFEST.architecture = x86 diff --git a/mkspecs/winrt-x86-msvc2012/qplatformdefs.h b/mkspecs/winrt-x86-msvc2012/qplatformdefs.h deleted file mode 100644 index 8caaa783d34..00000000000 --- a/mkspecs/winrt-x86-msvc2012/qplatformdefs.h +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/winrt_winphone/qplatformdefs.h" diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp index 4ddb76032e1..e9f0d17718b 100644 --- a/qmake/generators/win32/msbuild_objectmodel.cpp +++ b/qmake/generators/win32/msbuild_objectmodel.cpp @@ -615,7 +615,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) bool isWinRT = false; bool isWinPhone = false; - bool isWinPhone80 = false; // ### Windows Phone 8.0, remove in Qt 5.4 for (int i = 0; i < tool.SingleProjects.count(); ++i) { xml << tag("ProjectConfiguration") << attrTag("Include" , tool.SingleProjects.at(i).Configuration.Name) @@ -624,7 +623,6 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) << closetag(); isWinRT = isWinRT || tool.SingleProjects.at(i).Configuration.WinRT; isWinPhone = isWinPhone = tool.SingleProjects.at(i).Configuration.WinPhone; - isWinPhone80 = isWinPhone80 || tool.SingleProjects.at(i).Configuration.WinPhone80; } xml << closetag() @@ -636,18 +634,10 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) if (isWinRT) { xml << tagValue("MinimumVisualStudioVersion", tool.Version) - << tagValue("DefaultLanguage", "en"); - if (isWinPhone80) { - xml << tagValue("WinMDAssembly", "true"); - if (tool.SingleProjects.at(0).Configuration.ConfigurationType == typeApplication) { - xml << tagValue("XapOutputs", "true"); - xml << tagValue("XapFilename", "$(RootNamespace)_$(Configuration)_$(Platform).xap"); - } - } else { - xml << tagValue("AppContainerApplication", "true") - << tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store") - << tagValue("ApplicationTypeRevision", tool.SdkVersion); - } + << tagValue("DefaultLanguage", "en") + << tagValue("AppContainerApplication", "true") + << tagValue("ApplicationType", isWinPhone ? "Windows Phone" : "Windows Store") + << tagValue("ApplicationTypeRevision", tool.SdkVersion); } xml << closetag(); @@ -832,19 +822,9 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) } outputFilter(tool, xml, xmlFilter, "Root Files"); - if (isWinPhone80) { - xml << tag("ItemGroup") - << tag("Reference") - << attrTag("Include", "platform") - << attrTagS("IsWinMDFile", "true") - << attrTagS("Private", "false") - << closetag() - << closetag(); - } - // App manifest if (isWinRT) { - QString manifest = isWinPhone80 ? QStringLiteral("WMAppManifest.xml") : QStringLiteral("Package.appxmanifest"); + const QString manifest = QStringLiteral("Package.appxmanifest"); // Find all icons referenced in the manifest QSet icons; @@ -865,7 +845,7 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) // Write out manifest + icons as content items xml << tag(_ItemGroup) - << tag(isWinPhone80 ? "Xml" : "AppxManifest") + << tag("AppxManifest") << attrTag("Include", manifest) << closetag(); foreach (const QString &icon, icons) { @@ -876,12 +856,8 @@ void VCXProjectWriter::write(XmlOutput &xml, VCProject &tool) xml << closetag(); } - xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets"); - - if (isWinPhone80) - xml << import("Project", "$(MSBuildExtensionsPath)\\Microsoft\\WindowsPhone\\v8.0\\Microsoft.Cpp.WindowsPhone.8.0.targets"); - - xml << tag("ImportGroup") + xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets") + << tag("ImportGroup") << attrTag("Label", "ExtensionTargets") << closetag(); } diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 758db337ea8..9544ce83812 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -160,10 +160,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) QString windowsPath; if (isPhone) { - if (targetVer == "WP80") // ### Windows Phone 8.0, remove in Qt 5.4 - windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhone\\v"; - else - windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v"; + windowsPath = "Microsoft\\Microsoft SDKs\\WindowsPhoneApp\\v"; } else { windowsPath = "Microsoft\\Microsoft SDKs\\Windows\\v"; } @@ -184,8 +181,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t) QStringList binDirs; if (isPhone) { QString sdkDir = vcInstallDir; - if (targetVer == "WP80") - sdkDir += QStringLiteral("/WPSDK/") + targetVer; if (!QDir(sdkDir).exists()) { fprintf(stderr, "Failed to find the Windows Phone SDK in %s.\n" "Check that it is properly installed.\n", diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 596170b3438..26ba2a06aa0 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2137,7 +2137,6 @@ VCPreLinkEventTool::VCPreLinkEventTool() VCConfiguration::VCConfiguration() : WinRT(false), WinPhone(false), - WinPhone80(false), ATLMinimizesCRunTimeLibraryUsage(unset), BuildBrowserInformation(unset), CharacterSet(charSetNotSet), diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 4b70ca3d715..f16e5446bbe 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -873,7 +873,7 @@ public: bool suppressUnknownOptionWarnings; DotNET CompilerVersion; - bool WinRT, WinPhone, WinPhone80; + bool WinRT, WinPhone; // Variables triState ATLMinimizesCRunTimeLibraryUsage; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index f271eb06794..61c0cda89e4 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -908,11 +908,6 @@ void VcprojGenerator::initProject() initFormFiles(); initResourceFiles(); initExtraCompilerOutputs(); - if (vcProject.Configuration.WinRT) { - if (vcProject.Configuration.WinPhone80 - && vcProject.Configuration.ConfigurationType == typeApplication) - initWMAppManifest(); - } // Own elements ----------------------------- vcProject.Name = unescapeFilePath(project->first("QMAKE_ORIG_TARGET").toQString()); @@ -1020,7 +1015,6 @@ void VcprojGenerator::initConfiguration() conf.WinRT = project->isActiveConfig("winrt"); if (conf.WinRT) { conf.WinPhone = project->isActiveConfig("winphone"); - conf.WinPhone80 = project->first("WINTARGET_VER") == "WP80"; // Saner defaults conf.compiler.UsePrecompiledHeader = pchNone; conf.compiler.CompileAsWinRT = _False; @@ -1616,68 +1610,6 @@ void VcprojGenerator::initExtraCompilerOutputs() } } -void VcprojGenerator::initWMAppManifest() -{ - if (!project->isActiveConfig("autogen_wmappmanifest")) - return; - - // autogen_wmappmanifest - QFile file(Option::output_dir + "\\WMAppManifest.xml"); - if (!file.open(QFile::WriteOnly)) - return; - - QTextStream stream(&file); - - QString productID = project->first("PRODUCTID").toQString(); - QString target = project->first("TARGET").toQString(); - QString author = project->first("AUTHOR").toQString(); - QString publisher = project->first("PUBLISHER").toQString(); - QString publisherID = project->first("PUBLISHERID").toQString(); - QString description = project->first("DESCRIPTION").toQString(); - - if (author.isEmpty()) - author = "Qt"; - if (publisher.isEmpty()) - publisher = "Qt"; - if (productID.isEmpty()) - productID = QUuid::createUuid().toString(); - if (publisherID.isEmpty()) - publisherID = QUuid::createUuid().toString(); - - stream << "\n" - << "\n" - << " \n" - << " \n" - << " ApplicationIcon.png\n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " 0\n" - << " " << target << "\n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << " \n" - << "\n"; -} - void VcprojGenerator::initOld() { // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index f436b6da20f..f155fc2d5f5 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -113,7 +113,6 @@ protected: void initDeploymentFiles(); void initLexYaccFiles(); void initExtraCompilerOutputs(); - void initWMAppManifest(); void writeSubDirs(QTextStream &t); // Called from VCXProj backend QUuid getProjectUUID(const QString &filename=QString()); // Called from VCXProj backend