diff --git a/LameXP_VS2010.sln b/LameXP_VS2010.sln index 267cb238..172ce7d0 100644 --- a/LameXP_VS2010.sln +++ b/LameXP_VS2010.sln @@ -5,11 +5,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LameXP", "LameXP_VS2010.vcx EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_Qt5|Win32 = Debug_Qt5|Win32 Debug|Win32 = Debug|Win32 Release_Static|Win32 = Release_Static|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {00FE736A-8DB1-41B3-B915-4CD8DB09EF48}.Debug_Qt5|Win32.ActiveCfg = Debug_Qt5|Win32 + {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|Win32.ActiveCfg = Release_Static|Win32 diff --git a/LameXP_VS2010.vcxproj b/LameXP_VS2010.vcxproj index 5323bee7..d70b118b 100644 --- a/LameXP_VS2010.vcxproj +++ b/LameXP_VS2010.vcxproj @@ -1,6 +1,10 @@  + + Debug_Qt5 + Win32 + Debug Win32 @@ -38,6 +42,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + @@ -49,12 +58,18 @@ + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)obj\$(Configuration)\ + $(SolutionDir)obj\$(Configuration)\ false + false $(SolutionDir)bin\$(Configuration)\ $(SolutionDir)obj\$(Configuration)\ false @@ -101,6 +116,51 @@ copy /Y "$(QTDIR)\plugins\imageformats\q???d4.dll" "$(TargetDir)imageformats\" copy /Y "$(QTDIR)\plugins\imageformats\q????d4.dll" "$(TargetDir)imageformats\" copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.dll" "$(TargetDir)" copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest" "$(TargetDir)" + + + + _CONFIG_NAME=$(ConfigurationName);%(PreprocessorDefinitions) + + + + + "$(ProjectDir)\etc\Utilities\AutoInc.exe" "VER_LAMEXP_BUILD" "$(ProjectDir)\src\Config.h" + + + + + %(Outputs) + + + 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) + false + EnableFastChecks + MultiThreadedDebugDLL + NotSet + NotUsing + Level3 + ProgramDatabase + false + + + "/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) + qtmaind.lib;QtCored5.lib;QtGuid5.lib;QtWidgetsd5.lib;QtConcurrentd5.lib;Winmm.lib;Shlwapi.lib;Wininet.lib;PowrProf.lib;psapi.lib;%(AdditionalDependencies) + $(QTDIR5)\qtbase\lib;$(QTDIR5)\qtbase\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + + + Copy plugin DLL%27s + mkdir "$(TargetDir)imageformats" +mkdir "$(TargetDir)platforms" +copy /Y "$(QTDIR5)\qtbase\plugins\imageformats\q???d5.dll" "$(TargetDir)imageformats\" +copy /Y "$(QTDIR5)\qtbase\plugins\imageformats\q????d5.dll" "$(TargetDir)imageformats\" +copy /Y "$(QTDIR5)\qtbase\plugins\platforms\*d5.dll" "$(TargetDir)platforms\" +copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.dll" "$(TargetDir)" +copy /Y "$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\bin\Win32\*.manifest" "$(TargetDir)" @@ -371,76 +431,97 @@ del "$(TargetDir)imageformats\q???d4.dll" MOC "$(SolutionDir)tmp\MOC_%(Filename).cpp" $(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)" 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) "$(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)" 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)" + "$(QTDIR5)\qtbase\bin\moc.exe" -o "$(SolutionDir)tmp\MOC_%(Filename).cpp" "%(FullPath)" "$(QTDIR)\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" $(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)" "$(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" $(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)" "$(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" $(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)" "$(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" $(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)" "$(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" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -449,32 +530,41 @@ del "$(TargetDir)imageformats\q???d4.dll" 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) 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)" "$(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)" "$(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" $(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)" "$(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" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -489,9 +579,13 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -517,9 +611,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -531,9 +628,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -545,9 +645,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -559,9 +662,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -573,9 +679,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -587,9 +696,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -601,9 +713,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -615,9 +730,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -629,9 +747,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -643,9 +764,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -657,9 +781,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -671,9 +798,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -685,9 +815,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -699,9 +832,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -713,9 +849,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -727,9 +866,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -749,9 +891,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -763,9 +908,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -778,9 +926,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -792,9 +943,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -808,9 +962,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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,15 +979,18 @@ del "$(TargetDir)imageformats\q???d4.dll" - PerfMOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"orming Custom Build Step + 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) - PerfMOC "$(SolutionDir)tmp\MOC_%(Filename).cpp"orming Custom Build Step + $(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)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) - PerfMOC "$(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)" $(SolutionDir)tmp\MOC_%(Filename).cpp;%(Outputs) @@ -838,8 +998,11 @@ del "$(TargetDir)imageformats\q???d4.dll" 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) @@ -849,9 +1012,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -863,9 +1029,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -877,9 +1046,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -891,9 +1063,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -905,9 +1080,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -919,9 +1097,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -936,9 +1117,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -950,9 +1134,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -964,9 +1151,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -979,9 +1169,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -994,10 +1187,14 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1012,21 +1209,27 @@ del "$(TargetDir)imageformats\q???d4.dll" Document "$(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)" "$(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" $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) + $(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs) $(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)" @@ -1038,9 +1241,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1052,9 +1258,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1066,9 +1275,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1080,9 +1292,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1094,9 +1309,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1108,9 +1326,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1122,9 +1343,12 @@ del "$(TargetDir)imageformats\q???d4.dll" 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)" @@ -1144,8 +1368,11 @@ del "$(TargetDir)imageformats\q???d4.dll" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(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)" Document @@ -1156,8 +1383,11 @@ del "$(TargetDir)imageformats\q???d4.dll" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(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)" Document @@ -1168,8 +1398,11 @@ del "$(TargetDir)imageformats\q???d4.dll" RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(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)" diff --git a/src/Config.h b/src/Config.h index 942b8fc7..2e31388c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Beta -#define VER_LAMEXP_PATCH 14 -#define VER_LAMEXP_BUILD 966 +#define VER_LAMEXP_PATCH 15 +#define VER_LAMEXP_BUILD 969 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index ab3a3e27..307ae704 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -115,7 +115,8 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta aboutText += QString("%1
").arg(NOBR(copyrightStr)); aboutText += QString("%1

").arg(NOBR(versionStr)); aboutText += QString("%1
").arg(NOBR(tr("Please visit %1 for news and updates!").arg(LINK(lamexp_website_url())))); - + +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) if(LAMEXP_DEBUG) { int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0); @@ -126,7 +127,19 @@ AboutDialog::AboutDialog(SettingsModel *settings, QWidget *parent, bool firstSta int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0); aboutText += QString("
%1").arg(NOBR(tr("Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left.").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft)))); } - +#else + if(LAMEXP_DEBUG) + { + int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0i64); + aboutText += QString("
%1").arg(NOBR(QString("!!! --- DEBUG BUILD --- Expires at: %1 · Days left: %2 --- DEBUG BUILD --- !!!").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft)))); + } + else if(lamexp_version_demo()) + { + int daysLeft = qMax(QDate::currentDate().daysTo(lamexp_version_expires()), 0i64); + aboutText += QString("
%1").arg(NOBR(tr("Note: This demo (pre-release) version of LameXP will expire at %1. Still %2 days left.").arg(lamexp_version_expires().toString(Qt::ISODate), QString::number(daysLeft)))); + } +#endif + aboutText += "

"; aboutText += "This program is free software; you can redistribute it and/or
"; aboutText += "modify it under the terms of the GNU General Public License
"; diff --git a/src/Dialog_LogView.cpp b/src/Dialog_LogView.cpp index e4342dd4..102b61b3 100644 --- a/src/Dialog_LogView.cpp +++ b/src/Dialog_LogView.cpp @@ -25,6 +25,7 @@ #include #include +#include LogViewDialog::LogViewDialog(QWidget *parent) : diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp index 0fbc7c67..f78fa0a9 100644 --- a/src/Dialog_MainWindow.cpp +++ b/src/Dialog_MainWindow.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include //#include #include #include #include @@ -902,7 +902,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { QString path = outputFolderLabel->text(); if(!path.endsWith(QDir::separator())) path.append(QDir::separator()); - ShellExecuteW(this->winId(), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW); + ShellExecuteW(reinterpret_cast(this->winId()), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW); } break; case QEvent::Enter: @@ -1068,7 +1068,7 @@ void MainWindow::windowShown(void) QString uninstallerPath = uninstallerInfo.canonicalFilePath(); for(int i = 0; i < 3; i++) { - HINSTANCE res = ShellExecuteW(this->winId(), L"open", QWCHAR(QDir::toNativeSeparators(uninstallerPath)), L"/Force", QWCHAR(QDir::toNativeSeparators(uninstallerDir)), SW_SHOWNORMAL); + HINSTANCE res = ShellExecuteW(reinterpret_cast(this->winId()), L"open", QWCHAR(QDir::toNativeSeparators(uninstallerPath)), L"/Force", QWCHAR(QDir::toNativeSeparators(uninstallerDir)), SW_SHOWNORMAL); if(reinterpret_cast(res) > 32) break; } } @@ -2654,7 +2654,7 @@ void MainWindow::showFolderContextActionTriggered(void) QString path = QDir::toNativeSeparators(m_fileSystemModel->filePath(outputFolderView->currentIndex())); if(!path.endsWith(QDir::separator())) path.append(QDir::separator()); - ShellExecuteW(this->winId(), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW); + ShellExecuteW(reinterpret_cast(this->winId()), L"explore", QWCHAR(path), NULL, NULL, SW_SHOW); } /* diff --git a/src/Dialog_Processing.cpp b/src/Dialog_Processing.cpp index b072489c..a2e2ef33 100644 --- a/src/Dialog_Processing.cpp +++ b/src/Dialog_Processing.cpp @@ -107,7 +107,8 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel m_shutdownFlag(shutdownFlag_None), m_diskObserver(NULL), m_cpuObserver(NULL), - m_ramObserver(NULL) + m_ramObserver(NULL), + m_firstShow(true) { //Init the dialog, from the .ui file setupUi(this); @@ -256,23 +257,29 @@ ProcessingDialog::~ProcessingDialog(void) void ProcessingDialog::showEvent(QShowEvent *event) { - static const char *NA = " N/A"; + QDialog::showEvent(event); - setCloseButtonEnabled(false); - button_closeDialog->setEnabled(false); - button_AbortProcess->setEnabled(false); - m_systemTray->setVisible(true); - - if(!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS)) + if(m_firstShow) { - SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); + static const char *NA = " N/A"; + + setCloseButtonEnabled(false); + button_closeDialog->setEnabled(false); + button_AbortProcess->setEnabled(false); + m_systemTray->setVisible(true); + + if(!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS)) + { + SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS); + } + + label_cpu->setText(NA); + label_disk->setText(NA); + label_ram->setText(NA); + + QTimer::singleShot(1000, this, SLOT(initEncoding())); + m_firstShow = false; } - - label_cpu->setText(NA); - label_disk->setText(NA); - label_ram->setText(NA); - - QTimer::singleShot(1000, this, SLOT(initEncoding())); } void ProcessingDialog::closeEvent(QCloseEvent *event) @@ -352,6 +359,8 @@ bool ProcessingDialog::winEvent(MSG *message, long *result) void ProcessingDialog::initEncoding(void) { + qWarning("ProcessingDialog::initEncoding()"); + m_runningThreads = 0; m_currentFile = 0; m_allJobs.clear(); @@ -962,7 +971,7 @@ void ProcessingDialog::systemTrayActivated(QSystemTrayIcon::ActivationReason rea { if(reason == QSystemTrayIcon::DoubleClick) { - SetForegroundWindow(this->winId()); + SetForegroundWindow(reinterpret_cast(this->winId())); } } diff --git a/src/Dialog_Processing.h b/src/Dialog_Processing.h index f0a5c13c..8d745789 100644 --- a/src/Dialog_Processing.h +++ b/src/Dialog_Processing.h @@ -102,6 +102,7 @@ private: QList m_failedJobs; bool m_userAborted; bool m_forcedAbort; + bool m_firstShow; QSystemTrayIcon *m_systemTray; int m_shutdownFlag; CPUObserverThread *m_cpuObserver; diff --git a/src/Dialog_SplashScreen.cpp b/src/Dialog_SplashScreen.cpp index 42bb0633..8296f9da 100644 --- a/src/Dialog_SplashScreen.cpp +++ b/src/Dialog_SplashScreen.cpp @@ -85,6 +85,7 @@ void SplashScreen::showSplash(QThread *thread) //Show splash splashScreen->m_canClose = false; splashScreen->setWindowOpacity(opacity); + splashScreen->setFixedSize(splashScreen->size()); splashScreen->show(); //Wait for window to show diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp index cb97b175..b695548f 100644 --- a/src/Dialog_Update.cpp +++ b/src/Dialog_Update.cpp @@ -207,6 +207,7 @@ UpdateDialog::UpdateDialog(SettingsModel *settings, QWidget *parent) m_logFile(new QStringList()), m_betaUpdates(settings ? (settings->autoUpdateCheckBeta() || lamexp_version_demo()) : lamexp_version_demo()), m_success(false), + m_firstShow(true), m_updateReadyToInstall(false), m_updaterProcess(NULL) { @@ -260,30 +261,34 @@ void UpdateDialog::showEvent(QShowEvent *event) { QDialog::showEvent(event); - labelVersionInstalled->setText(QString("%1 %2 (%3)").arg(tr("Build"), QString::number(lamexp_version_build()), lamexp_version_date().toString(Qt::ISODate))); - labelVersionLatest->setText(QString("(%1)").arg(tr("Unknown"))); + if(m_firstShow) + { + labelVersionInstalled->setText(QString("%1 %2 (%3)").arg(tr("Build"), QString::number(lamexp_version_build()), lamexp_version_date().toString(Qt::ISODate))); + labelVersionLatest->setText(QString("(%1)").arg(tr("Unknown"))); - installButton->setEnabled(false); - closeButton->setEnabled(false); - retryButton->setEnabled(false); - logButton->setEnabled(false); - retryButton->hide(); - logButton->hide(); - infoLabel->hide(); - hintLabel->hide(); - hintIcon->hide(); - frameAnimation->hide(); + installButton->setEnabled(false); + closeButton->setEnabled(false); + retryButton->setEnabled(false); + logButton->setEnabled(false); + retryButton->hide(); + logButton->hide(); + infoLabel->hide(); + hintLabel->hide(); + hintIcon->hide(); + frameAnimation->hide(); - int counter = MIN_CONNSCORE + 2; - for(int i = 0; update_mirrors_prim[i]; i++) counter++; - for(int i = 0; update_mirrors_back[i]; i++) counter++; + int counter = MIN_CONNSCORE + 2; + for(int i = 0; update_mirrors_prim[i]; i++) counter++; + for(int i = 0; update_mirrors_back[i]; i++) counter++; - progressBar->setMaximum(counter); - progressBar->setValue(0); + progressBar->setMaximum(counter); + progressBar->setValue(0); - m_updaterProcess = NULL; + m_updaterProcess = NULL; - QTimer::singleShot(0, this, SLOT(updateInit())); + QTimer::singleShot(0, this, SLOT(updateInit())); + m_firstShow = false; + } } void UpdateDialog::closeEvent(QCloseEvent *event) diff --git a/src/Dialog_Update.h b/src/Dialog_Update.h index d0ac48ac..543ee191 100644 --- a/src/Dialog_Update.h +++ b/src/Dialog_Update.h @@ -77,4 +77,5 @@ private: bool m_success; bool m_updateReadyToInstall; + bool m_firstShow; }; diff --git a/src/Dialog_WorkingBanner.cpp b/src/Dialog_WorkingBanner.cpp index 49ff1fcf..5ff4cbac 100644 --- a/src/Dialog_WorkingBanner.cpp +++ b/src/Dialog_WorkingBanner.cpp @@ -74,6 +74,7 @@ void WorkingBanner::show(const QString &text) { m_canClose = false; QDialog::show(); + setFixedSize(size()); setText(text); QApplication::processEvents(); } diff --git a/src/Global.cpp b/src/Global.cpp index 2cc2ff94..462bdf8c 100644 --- a/src/Global.cpp +++ b/src/Global.cpp @@ -297,7 +297,7 @@ bool lamexp_version_demo(void) */ QDate lamexp_version_expires(void) { - return lamexp_version_date().addDays(LAMEXP_DEBUG ? 2 : 30); + return lamexp_version_date().addDays(LAMEXP_DEBUG ? 7 : 30); } /* @@ -1030,6 +1030,7 @@ bool lamexp_init_qt(int argc, char* argv[]) } //Check Qt version +#ifdef QT_BUILD_KEY qDebug("Using Qt v%s [%s], %s, %s", qVersion(), QLibraryInfo::buildDate().toString(Qt::ISODate).toLatin1().constData(), (qSharedBuild() ? "DLL" : "Static"), QLibraryInfo::buildKey().toLatin1().constData()); qDebug("Compiled with Qt v%s [%s], %s\n", QT_VERSION_STR, QT_PACKAGEDATE_STR, QT_BUILD_KEY); if(_stricmp(qVersion(), QT_VERSION_STR)) @@ -1042,6 +1043,10 @@ bool lamexp_init_qt(int argc, char* argv[]) qFatal("%s", QApplication::tr("Executable '%1' was built for Qt '%2', but found Qt '%3'.").arg(QString::fromLatin1(executableName), QString::fromLatin1(QT_BUILD_KEY), QLibraryInfo::buildKey()).toLatin1().constData()); return false; } +#else + qDebug("Using Qt v%s [%s], %s", qVersion(), QLibraryInfo::buildDate().toString(Qt::ISODate).toLatin1().constData(), (qSharedBuild() ? "DLL" : "Static")); + qDebug("Compiled with Qt v%s [%s]\n", QT_VERSION_STR, QT_PACKAGEDATE_STR); +#endif //Check the Windows version switch(QSysInfo::windowsVersion() & QSysInfo::WV_NT_based) @@ -1084,9 +1089,17 @@ bool lamexp_init_qt(int argc, char* argv[]) qWarning("It appears we are running under Wine, unexpected things might happen!\n"); } + //Set text Codec for locale + QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); - //Create Qt application instance and setup version info + //Create Qt application instance QApplication *application = new QApplication(argc, argv); + + //Load plugins from application directory + QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath()); + qDebug("Library Path:\n%s\n", QApplication::libraryPaths().first().toUtf8().constData()); + + //Set application properties application->setApplicationName("LameXP - Audio Encoder Front-End"); application->setApplicationVersion(QString().sprintf("%d.%02d.%04d", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build())); application->setOrganizationName("LoRd_MuldeR"); @@ -1095,11 +1108,11 @@ bool lamexp_init_qt(int argc, char* argv[]) application->setEventFilter(lamexp_event_filter); //Set text Codec for locale - QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); + // QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); //Load plugins from application directory - QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath()); - qDebug("Library Path:\n%s\n", QApplication::libraryPaths().first().toUtf8().constData()); + // QCoreApplication::setLibraryPaths(QStringList() << QApplication::applicationDirPath()); + // qDebug("Library Path:\n%s\n", QApplication::libraryPaths().first().toUtf8().constData()); //Check for supported image formats QList supportedFormats = QImageReader::supportedImageFormats(); @@ -1129,6 +1142,7 @@ bool lamexp_init_qt(int argc, char* argv[]) } //Update console icon, if a console is attached +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) if(g_lamexp_console_attached && (!lamexp_detect_wine())) { typedef DWORD (__stdcall *SetConsoleIconFun)(HICON); @@ -1140,6 +1154,7 @@ bool lamexp_init_qt(int argc, char* argv[]) kernel32.unload(); } } +#endif //Done qt_initialized = true; diff --git a/src/WinSevenTaskbar.cpp b/src/WinSevenTaskbar.cpp index 0dbe3777..6be6285b 100644 --- a/src/WinSevenTaskbar.cpp +++ b/src/WinSevenTaskbar.cpp @@ -109,19 +109,19 @@ bool WinSevenTaskbar::setTaskbarState(QWidget *window, WinSevenTaskbarState stat switch(state) { case WinSevenTaskbarNoState: - hr = m_ptbl->SetProgressState(window->winId(), TBPF_NOPROGRESS); + hr = m_ptbl->SetProgressState(reinterpret_cast(window->winId()), TBPF_NOPROGRESS); break; case WinSevenTaskbarNormalState: - hr = m_ptbl->SetProgressState(window->winId(), TBPF_NORMAL); + hr = m_ptbl->SetProgressState(reinterpret_cast(window->winId()), TBPF_NORMAL); break; case WinSevenTaskbarIndeterminateState: - hr = m_ptbl->SetProgressState(window->winId(), TBPF_INDETERMINATE); + hr = m_ptbl->SetProgressState(reinterpret_cast(window->winId()), TBPF_INDETERMINATE); break; case WinSevenTaskbarErrorState: - hr = m_ptbl->SetProgressState(window->winId(), TBPF_ERROR); + hr = m_ptbl->SetProgressState(reinterpret_cast(window->winId()), TBPF_ERROR); break; case WinSevenTaskbarPausedState: - hr = m_ptbl->SetProgressState(window->winId(), TBPF_PAUSED); + hr = m_ptbl->SetProgressState(reinterpret_cast(window->winId()), TBPF_PAUSED); break; } @@ -135,16 +135,18 @@ void WinSevenTaskbar::setTaskbarProgress(QWidget *window, unsigned __int64 curre { if(m_ptbl && window) { - m_ptbl->SetProgressValue(window->winId(), currentValue, maximumValue); + m_ptbl->SetProgressValue(reinterpret_cast(window->winId()), currentValue, maximumValue); } } void WinSevenTaskbar::setOverlayIcon(QWidget *window, QIcon *icon) { +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) if(m_ptbl && window) { m_ptbl->SetOverlayIcon(window->winId(), (icon ? icon->pixmap(16,16).toWinHICON() : NULL), L"LameXP"); } +#endif } #else //__ITaskbarList3_INTERFACE_DEFINED__