upgrade Qt to 5.12.12

MiskaDaeve · Dec 13, 2023 · e81adf5 · e81adf5
1 parent 1916935
commit e81adf5
Show file tree

Hide file tree

Showing 7 changed files with 293 additions and 293 deletions.
diff --git a/VMProtect/res.bat b/VMProtect/res.bat
@@ -8,7 +8,7 @@ if exist %rc_out% (
     set rc_out=%RC_DIR%resources.cc.tmp
     set check_rc=1
 )
-%QTDIR%/msvc2015_64/bin/rcc.exe %RC_DIR%application.qrc -o %rc_out%
+%QTDIR%/bin/rcc.exe %RC_DIR%application.qrc -o %rc_out%
 
 call :ReplaceOld %check_rc% %rc_out% %rc%
 goto :EOF

diff --git a/VMProtect/widgets.cc b/VMProtect/widgets.cc
@@ -1452,7 +1452,7 @@ TreeViewItemDelegate::TreeViewItemDelegate(QObject *parent)
 void TreeViewItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 	const QModelIndex &index) const
 {
-	QStyleOptionViewItemV4 opt = option;
+	QStyleOptionViewItem opt = option;
 	opt.state &= ~QStyle::State_HasFocus;
 	initStyleOption(&opt, index);
 	const QWidget *widget = opt.widget;
@@ -1499,7 +1499,7 @@ void TreeViewItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
 
 QSize TreeViewItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-	QStyleOptionViewItemV4 opt = option;
+	QStyleOptionViewItem opt = option;
 	const int border = (opt.widget->objectName().startsWith("grid") ? 1 : 0);
 	const int min_height = 18 * Application::stylesheetScaleFactor() + border;
 

diff --git a/vcproj/VMProtect.vcxproj b/vcproj/VMProtect.vcxproj
diff --git a/vcproj/qt-debug.props b/vcproj/qt-debug.props
@@ -9,10 +9,10 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(QTDIR)\msvc2015\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QTDIR)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%QTDIR%\msvc2015\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%QTDIR%\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>qtmaind.lib;Qt5Guid.lib;Qt5Cored.lib;Qt5Concurrentd.lib;Qt5Widgetsd.lib;Qt5WinExtrasd.lib;Qt5Helpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>

diff --git a/vcproj/qt-debug64.props b/vcproj/qt-debug64.props
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
+  <!-- <PropertyGroup Label="UserMacros">
     <PATH>%PATH%;C:\Qt\Qt5.6.0\5.6\msvc2015_64\bin</PATH>
     <QTDIR>C:\Qt\Qt5.6.0\5.6</QTDIR>
-  </PropertyGroup>
+  </PropertyGroup> -->
   <PropertyGroup>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
     <_PropertySheetDisplayName>qt-debug64</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(QTDIR)\msvc2015_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QTDIR)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%QTDIR%\msvc2015_64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>qtmaind.lib;Qt5Guid.lib;Qt5Cored.lib;Qt5Concurrentd.lib;Qt5Widgetsd.lib;Qt5WinExtrasd.lib;Qt5Helpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>

diff --git a/vcproj/qt-release.props b/vcproj/qt-release.props
@@ -9,11 +9,11 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(QTDIR)\msvc2015\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QTDIR)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%QTDIR%\msvc2015\lib;$(QTDIR)\msvc2015\plugins\platforms;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>QtMain.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Concurrent.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Help.lib;Qt5Sql.lib;Qt5Network.lib;Qt5CLucene.lib;Qt5PlatformSupport.lib;qtfreetype.lib;winmm.lib;imm32.lib;Opengl32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>%QTDIR%\lib;$(QTDIR)\plugins\platforms;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>qtmain.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Concurrent.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Help.lib;Qt5Sql.lib;Qt5Network.lib;qtfreetype.lib;winmm.lib;imm32.lib;Opengl32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>

diff --git a/vcproj/qt-release64.props b/vcproj/qt-release64.props
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros">
+  <!-- <PropertyGroup Label="UserMacros">
     <QTDIR>C:\Qt\Qt5.6.3\5.6.3</QTDIR>
     <PATH>%PATH%;C:\Qt\Qt5.6.3\5.6.3\msvc2015_64\bin</PATH>
-  </PropertyGroup>
+  </PropertyGroup> -->
   <PropertyGroup>
     <CustomBuildBeforeTargets>
     </CustomBuildBeforeTargets>
     <_PropertySheetDisplayName>qt-release64</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(QTDIR)\msvc2015_64\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(QTDIR)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%QTDIR%\msvc2015_64\lib;$(QTDIR)\msvc2015_64\plugins\platforms;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>QtMain.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Concurrent.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Help.lib;Qt5Sql.lib;Qt5Network.lib;Qt5CLucene.lib;Qt5PlatformSupport.lib;qtfreetype.lib;winmm.lib;imm32.lib;Opengl32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins\platforms;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>qtmain.lib;Qt5Gui.lib;Qt5Core.lib;Qt5Concurrent.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Help.lib;Qt5Sql.lib;Qt5Network.lib;qtfreetype.lib;winmm.lib;imm32.lib;Opengl32.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <CustomBuildStep>
       <Command>