r24072 by jghali - Move msvc projects to Qt 5.15.1

scribus-commit scribus-commit at lists.scribus.net
Fri Oct 9 21:24:27 UTC 2020 

Author: jghali
Date: Fri Oct  9 21:24:27 2020
New Revision: 24072

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24072
Log:
Move msvc projects to Qt 5.15.1

Modified:
    trunk/Scribus/win32/msvc2015/Scribus-build-props.props
    trunk/Scribus/win32/msvc2015/Scribus.sln
    trunk/Scribus/win32/msvc2017/Scribus-build-props.props
    trunk/Scribus/win32/msvc2017/Scribus.sln
    trunk/Scribus/win32/msvc2019/Scribus-build-props.props

Modified: trunk/Scribus/win32/msvc2015/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24072&path=/trunk/Scribus/win32/msvc2015/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-props.props	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-props.props	Fri Oct  9 21:24:27 2020
@@ -10,8 +10,8 @@
   <!-- Import Qt5 -->
   <PropertyGroup Label="UserMacros">
 	<!-- Qt5 -->
-	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v140'"   >F:\Libraries\Qt-5.12.9\msvc2015</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v140'"   >F:\Libraries\Qt-5.12.9\msvc2015_64</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v140'"   >F:\Libraries\Qt-5.15.1\msvc2015</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v140'"   >F:\Libraries\Qt-5.15.1\msvc2015_64</QT5_DIR>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Cored.lib</QT5CORE_LIB>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Release'">Qt5Core.lib</QT5CORE_LIB>
 	<QT5GUI_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Guid.lib</QT5GUI_LIB>

Modified: trunk/Scribus/win32/msvc2015/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24072&path=/trunk/Scribus/win32/msvc2015/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus.sln	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus.sln	Fri Oct  9 21:24:27 2020
@@ -356,6 +356,11 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxpimport", "qxpimport\qxpimport.vcxproj", "{630E2D8B-919E-4C52-9894-75D3873B4A7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettext-markdownim", "gettext-markdownim\gettext-markdownim.vcxproj", "{918AFADC-9F6A-4286-AF39-32F889DABCC1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -944,6 +949,14 @@
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|Win32.Build.0 = Release|Win32
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.ActiveCfg = Release|x64
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.Build.0 = Release|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.Build.0 = Debug|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.ActiveCfg = Debug|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.Build.0 = Debug|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.ActiveCfg = Release|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.Build.0 = Release|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.ActiveCfg = Release|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/msvc2017/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24072&path=/trunk/Scribus/win32/msvc2017/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2017/Scribus-build-props.props	(original)
+++ trunk/Scribus/win32/msvc2017/Scribus-build-props.props	Fri Oct  9 21:24:27 2020
@@ -10,8 +10,8 @@
   <!-- Import Qt5 -->
   <PropertyGroup Label="UserMacros">
 	<!-- Qt5 -->
-	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v141'"   >F:\Libraries\Qt-5.12.9\msvc2017</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v141'"   >F:\Libraries\Qt-5.12.9\msvc2017_64</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v141'"   >F:\Libraries\Qt-5.15.1\msvc2017</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v141'"   >F:\Libraries\Qt-5.15.1\msvc2017_64</QT5_DIR>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Cored.lib</QT5CORE_LIB>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Release'">Qt5Core.lib</QT5CORE_LIB>
 	<QT5GUI_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Guid.lib</QT5GUI_LIB>

Modified: trunk/Scribus/win32/msvc2017/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24072&path=/trunk/Scribus/win32/msvc2017/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/msvc2017/Scribus.sln	(original)
+++ trunk/Scribus/win32/msvc2017/Scribus.sln	Fri Oct  9 21:24:27 2020
@@ -356,6 +356,11 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxpimport", "qxpimport\qxpimport.vcxproj", "{630E2D8B-919E-4C52-9894-75D3873B4A7A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettext-markdownim", "gettext-markdownim\gettext-markdownim.vcxproj", "{918AFADC-9F6A-4286-AF39-32F889DABCC1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
@@ -944,6 +949,14 @@
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|Win32.Build.0 = Release|Win32
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.ActiveCfg = Release|x64
 		{630E2D8B-919E-4C52-9894-75D3873B4A7A}.Release|x64.Build.0 = Release|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|Win32.Build.0 = Debug|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.ActiveCfg = Debug|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Debug|x64.Build.0 = Debug|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.ActiveCfg = Release|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|Win32.Build.0 = Release|Win32
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.ActiveCfg = Release|x64
+		{918AFADC-9F6A-4286-AF39-32F889DABCC1}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Scribus/win32/msvc2019/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24072&path=/trunk/Scribus/win32/msvc2019/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2019/Scribus-build-props.props	(original)
+++ trunk/Scribus/win32/msvc2019/Scribus-build-props.props	Fri Oct  9 21:24:27 2020
@@ -10,8 +10,8 @@
   <!-- Import Qt5 -->
   <PropertyGroup Label="UserMacros">
 	<!-- Qt5 -->
-	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v142'"   >F:\Libraries\Qt\5.15.0\msvc2019</QT5_DIR>
-	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v142'"   >F:\Libraries\Qt\5.15.0\msvc2019_64</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'Win32' and '$(PlatformToolset)' == 'v142'"   >F:\Libraries\Qt\5.15.1\msvc2019</QT5_DIR>
+	<QT5_DIR Condition="'$(Platform)' == 'x64'   and '$(PlatformToolset)' == 'v142'"   >F:\Libraries\Qt\5.15.1\msvc2019_64</QT5_DIR>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Cored.lib</QT5CORE_LIB>
 	<QT5CORE_LIB Condition="'$(Configuration)' == 'Release'">Qt5Core.lib</QT5CORE_LIB>
 	<QT5GUI_LIB Condition="'$(Configuration)' == 'Debug'">Qt5Guid.lib</QT5GUI_LIB>

More information about the scribus-commit mailing list