From 255b21ab2c318f9754582eff8bc03a2eff2f4111 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Wed, 11 Apr 2012 03:08:31 +0200 Subject: [PATCH] Added yet another configuration to build LameXP with *static* Qt5 libraries. Still experimental! --- LameXP_VS2010.sln | 3 + LameXP_VS2010.vcxproj | 257 +++++++++++++++++++++++++++++++++++++++++- src/Config.h | 2 +- src/Global.cpp | 9 ++ 4 files changed, 269 insertions(+), 2 deletions(-) diff --git a/LameXP_VS2010.sln b/LameXP_VS2010.sln index 172ce7d0..01ab3f19 100644 --- a/LameXP_VS2010.sln +++ b/LameXP_VS2010.sln @@ -7,6 +7,7 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_Qt5|Win32 = Debug_Qt5|Win32 Debug|Win32 = Debug|Win32 + Release_Static_Qt5|Win32 = Release_Static_Qt5|Win32 Release_Static|Win32 = Release_Static|Win32 Release|Win32 = Release|Win32 EndGlobalSection @@ -15,6 +16,8 @@ Global {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug_Qt5|Win32.Build.0 = Debug_Qt5|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug|Win32.ActiveCfg = Debug|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug|Win32.Build.0 = Debug|Win32 + {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static_Qt5|Win32.ActiveCfg = Release_Static_Qt5|Win32 + {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static_Qt5|Win32.Build.0 = Release_Static_Qt5|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static|Win32.ActiveCfg = Release_Static|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release_Static|Win32.Build.0 = Release_Static|Win32 {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index d70b118b..f754a8da 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -9,6 +9,10 @@ Debug Win32 + + Release_Static_Qt5 + Win32 + Release_Static Win32 @@ -31,6 +35,12 @@ true Windows7.1SDK + + Application + Unicode + true + Windows7.1SDK + Application Unicode @@ -52,6 +62,9 @@ + + + @@ -74,10 +87,14 @@ $(SolutionDir)obj\$(Configuration)\ false $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)obj\$(Configuration)\ + $(SolutionDir)obj\$(Configuration)\ false + false false false + false @@ -134,7 +151,7 @@ copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifes Disabled $(QTDIR5)\qtbase\include;$(QTDIR5)\qtbase\include\QtCore;$(QTDIR5)\qtbase\include\QtGui;$(QTDIR5)\qtbase\include\QtWidgets;$(QTDIR5)\qtbase\include\QtConcurrent;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories) - _CONFIG_NAME=$(ConfigurationName);WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions) + _CONFIG_NAME=$(ConfigurationName);WIN32;_DEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_WIDGETS_LIB;QT_THREAD_SUPPORT;QT_DLL;QT_DEBUG;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -304,6 +321,71 @@ del "$(TargetDir)imageformats\q???d4.dll" _CONFIG_NAME=$(ConfigurationName);%(PreprocessorDefinitions) + + + "$(ProjectDir)\etc\Utilities\AutoInc.exe" "VER_LAMEXP_BUILD" "$(ProjectDir)\src\Config.h" + + + + + %(Outputs) + + + Full + AnySuitable + true + Speed + true + true + $(QTDIR5)\qtbase\include;$(QTDIR5)\qtbase\include\QtCore;$(QTDIR5)\qtbase\include\QtGui;$(QTDIR5)\qtbase\include\QtWidgets;$(QTDIR5)\qtbase\include\QtConcurrent;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\include;%(AdditionalIncludeDirectories) + _CONFIG_NAME=$(ConfigurationName);WIN32;NDEBUG;_CONSOLE;QT_LARGEFILE_SUPPORT;QT_GUI_LIB;QT_CORE_LIB;QT_WIDGETS_LIB;QT_THREAD_SUPPORT;QT_NO_DEBUG;QT_NODLL;%(PreprocessorDefinitions) + false + Default + MultiThreaded + true + NotSet + Fast + NotUsing + Level3 + + + false + true + false + false + true + + + "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) + qtmain.lib;QtCore.lib;QtGui.lib;QtWidgets.lib;QtConcurrent.lib;QtPlatformSupport.lib;windows.lib;qico.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Wininet.lib;PowrProf.lib;RpcRT4.lib;OpenGL32.lib;EncodePointer.lib;%(AdditionalDependencies) + LinkVerboseLib + $(SolutionDir)\etc\Prerequisites\qt5_static\lib;$(SolutionDir)\etc\Prerequisites\qt5_static\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\qt5_static\plugins\platforms;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories) + %(IgnoreSpecificDefaultLibraries) + false + + + Windows + true + true + UseLinkTimeCodeGeneration + true + MachineX86 + 5.0 + lamexp_crt_startup + false + + + true + false + + + + + + + _CONFIG_NAME=$(ConfigurationName);%(PreprocessorDefinitions) + + @@ -433,53 +515,65 @@ del "$(TargetDir)imageformats\q???d4.dll" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -487,42 +581,51 @@ del "$(TargetDir)imageformats\q???d4.dll" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -532,25 +635,31 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -558,14 +667,17 @@ del "$(TargetDir)imageformats\q???d4.dll" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -587,9 +699,13 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -618,9 +734,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -635,9 +754,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -652,9 +774,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -669,9 +794,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -686,9 +814,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -703,9 +834,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -720,9 +854,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -737,9 +874,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -754,9 +894,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -771,9 +914,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -788,9 +934,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -805,9 +954,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -822,9 +974,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -839,9 +994,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -856,9 +1014,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -873,9 +1034,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -898,9 +1062,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -915,9 +1082,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -933,9 +1103,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -950,9 +1123,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -969,9 +1145,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -987,9 +1166,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"orming Custom Build Step + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"orming Custom Build Step "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"orming Custom Build Step "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1004,8 +1186,11 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -1019,9 +1204,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1036,9 +1224,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1053,9 +1244,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1070,9 +1264,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1087,9 +1284,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1104,9 +1304,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" + MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" "$(QTDIR)\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" @@ -1124,9 +1327,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" @@ -1141,9 +1347,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" @@ -1158,9 +1367,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" @@ -1176,9 +1388,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" @@ -1196,10 +1411,14 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" $(ProjectDir)\res\localization\LameXP_DE.qm;%(AdditionalInputs) + $(ProjectDir)\res\localization\LameXP_DE.qm;%(AdditionalInputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" @@ -1211,14 +1430,17 @@ del "$(TargetDir)imageformats\q???d4.dll" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" UIC "$(SolutionDir)tmp\UIC_%(Filename).h" UIC "$(SolutionDir)tmp\UIC_%(Filename).h" UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" UIC "$(SolutionDir)tmp\UIC_%(Filename).h" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) @@ -1231,9 +1453,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1248,9 +1473,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1265,9 +1493,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1282,9 +1513,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1299,9 +1533,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1316,9 +1553,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1333,9 +1573,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1350,9 +1593,12 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" + UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) UIC "$(SolutionDir)tmp\UIC_%(Filename).h" "$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)" @@ -1362,8 +1608,11 @@ del "$(TargetDir)imageformats\q???d4.dll" Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) @@ -1377,8 +1626,11 @@ del "$(TargetDir)imageformats\q???d4.dll" Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) @@ -1392,8 +1644,11 @@ del "$(TargetDir)imageformats\q???d4.dll" Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR5)\qtbase\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) diff --git a/src/Config.h b/src/Config.h index 2e31388c..70197398 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 15 -#define VER_LAMEXP_BUILD 969 +#define VER_LAMEXP_BUILD 970 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Global.cpp b/src/Global.cpp index 462bdf8c..722e196a 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -71,8 +71,13 @@ //Initialize static Qt plugins #ifdef QT_NODLL +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) Q_IMPORT_PLUGIN(qico) Q_IMPORT_PLUGIN(qsvg) +#else +Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin) +Q_IMPORT_PLUGIN(QICOPlugin) +#endif #endif /////////////////////////////////////////////////////////////////////////////// @@ -238,7 +243,11 @@ g_lamexp_ipc_ptr = }; //Image formats +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) static const char *g_lamexp_imageformats[] = {"png", "jpg", "gif", "ico", "svg", NULL}; +#else +static const char *g_lamexp_imageformats[] = {"png", "jpg", "gif", "ico", NULL}; +#endif //Global locks static QMutex g_lamexp_message_mutex;