diff --git a/materialscanner/WhiteBalance.cpp b/materialscanner/WhiteBalance.cpp new file mode 100644 index 0000000000000000000000000000000000000000..d6dff390b18c5a8314eaa1d5b5bcb12d3e28f2d4 --- /dev/null +++ b/materialscanner/WhiteBalance.cpp @@ -0,0 +1,23 @@ + +#include "WhiteBalance.h" +using namespace cv; + + +class MyClass +{ +public: + MyClass(); + ~MyClass(); + +private: + +}; + +MyClass::MyClass() +{ + cv::Mat benchmarkWhite = imread("C:\stud\Dev\Im\Bl.jpg"); +} + +MyClass::~MyClass() +{ +} \ No newline at end of file diff --git a/materialscanner/WhiteBalance.h b/materialscanner/WhiteBalance.h new file mode 100644 index 0000000000000000000000000000000000000000..03dbea7dae58b1dc06e5319c56081b7d688a3a3e --- /dev/null +++ b/materialscanner/WhiteBalance.h @@ -0,0 +1,9 @@ +#pragma once + +#include"GalaxyIncludes.h" +#include<QWidget> +#include<QImage> +#include<QObject> +#include "opencv2/opencv.hpp" +#include "opencv2/core/mat.hpp" +#include "CaptureEventHandler.h" diff --git a/materialscanner/materialscanner.vcxproj b/materialscanner/materialscanner.vcxproj index 791272db0948c0378711122128c2703844850d65..3bb665f6f28107dc69320ae27a081abc45e28937 100644 --- a/materialscanner/materialscanner.vcxproj +++ b/materialscanner/materialscanner.vcxproj @@ -117,6 +117,8 @@ </QtMoc> </ItemDefinitionGroup> <ItemGroup> + <ClCompile Include="WhiteBalance.cpp" /> + <ClInclude Include="WhiteBalance.h" /> <QtRcc Include="materialscanner.qrc" /> <QtUic Include="materialscanner.ui" /> <QtMoc Include="materialscanner.h" /> diff --git a/materialscanner/materialscanner.vcxproj.filters b/materialscanner/materialscanner.vcxproj.filters index 863d09d4f48f99e651d69ebfcdaba8257969cfbc..be449af30cb5135fc1afc5342f6d39381ce75e2e 100644 --- a/materialscanner/materialscanner.vcxproj.filters +++ b/materialscanner/materialscanner.vcxproj.filters @@ -64,6 +64,9 @@ <ClCompile Include="CaptureEventHandler.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="WhiteBalance.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="camera-controller.h"> @@ -78,5 +81,8 @@ <ClInclude Include="CaptureEventHandler.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="WhiteBalance.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file diff --git a/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props b/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props index 7173c8bbc285d966f50b3c3d700e250fe6552b59..bd592ccc938866d209ee2ef6a4be7d2198151044 100644 --- a/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props +++ b/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props @@ -1,32 +1,32 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Qt_DEFINES_>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB</Qt_DEFINES_> -<Qt_INCLUDEPATH_>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<Qt_INCLUDEPATH_>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> <Qt_STDCPP_>stdcpp17</Qt_STDCPP_> <Qt_CL_OPTIONS_>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8</Qt_CL_OPTIONS_> -<Qt_LIBS_>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> +<Qt_LIBS_>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> <Qt_LINK_OPTIONS_>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"</Qt_LINK_OPTIONS_> <QMake_QT_SYSROOT_></QMake_QT_SYSROOT_> -<QMake_QT_INSTALL_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>C:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>C:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>C:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>C:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>C:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>C:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<QMake_QT_INSTALL_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> +<QMake_QT_INSTALL_ARCHDATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> +<QMake_QT_INSTALL_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> +<QMake_QT_INSTALL_DOCS_>C:/stud/tools/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> +<QMake_QT_INSTALL_HEADERS_>C:/stud/tools/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> +<QMake_QT_INSTALL_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> +<QMake_QT_INSTALL_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> +<QMake_QT_INSTALL_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> +<QMake_QT_INSTALL_TESTS_>C:/stud/tools/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> +<QMake_QT_INSTALL_PLUGINS_>C:/stud/tools/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> +<QMake_QT_INSTALL_QML_>C:/stud/tools/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> +<QMake_QT_INSTALL_TRANSLATIONS_>C:/stud/tools/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> <QMake_QT_INSTALL_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<QMake_QT_INSTALL_EXAMPLES_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> +<QMake_QT_INSTALL_DEMOS_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> +<QMake_QT_HOST_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> +<QMake_QT_HOST_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> +<QMake_QT_HOST_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> +<QMake_QT_HOST_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> +<QMake_QT_HOST_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> <QMake_QMAKE_SPEC_>win32-msvc</QMake_QMAKE_SPEC_> <QMake_QMAKE_XSPEC_>win32-msvc</QMake_QMAKE_XSPEC_> <QMake_QMAKE_VERSION_>3.1</QMake_QMAKE_VERSION_> diff --git a/materialscanner/x64/Debug/qmake/temp/.qmake.stash b/materialscanner/x64/Debug/qmake/temp/.qmake.stash index 0341ac07043af0f5b1d804cfa8fd6aa86c4d7958..dd598bde0378a0e33ef8f0e8562b50e0daa9a878 100644 --- a/materialscanner/x64/Debug/qmake/temp/.qmake.stash +++ b/materialscanner/x64/Debug/qmake/temp/.qmake.stash @@ -1,27 +1,7 @@ QMAKE_CXX.QT_COMPILER_STDCXX = 199711L QMAKE_CXX.QMAKE_MSC_VER = 1929 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930141 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930143 QMAKE_CXX.COMPILER_MACROS = \ QT_COMPILER_STDCXX \ QMAKE_MSC_VER \ QMAKE_MSC_FULL_VER -QMAKE_CXX.INCDIRS = \ - G:\\dev\\projects\\materialscanner\\libs\\GxIAPICPPEx\\inc \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\include" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\atlmfc\\include" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\ucrt" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\UnitTest\\include" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\um" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\shared" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\winrt" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.19041.0\\cppwinrt" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\Include\\um" -QMAKE_CXX.LIBDIRS = \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\lib\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.29.30133\\atlmfc\\lib\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\lib\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.19041.0\\ucrt\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Auxiliary\\VS\\UnitTest\\lib" \ - "C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.19041.0\\um\\x64" \ - "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\lib\\um\\x64" diff --git a/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx b/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx new file mode 100644 index 0000000000000000000000000000000000000000..c804884c5832e8869a750a8489e925857160f3e9 --- /dev/null +++ b/materialscanner/x64/Debug/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx @@ -0,0 +1 @@ +C:\Users\baja\AppData\Local\Temp\2p5hurnj.qx0.designtime.props diff --git a/materialscanner/x64/Debug/qmake/temp/props.txt b/materialscanner/x64/Debug/qmake/temp/props.txt index 917f80b7dddfcdfd8316eefa4c79b7ddc7095299..0a6df66561d1688a01a94f179c2bbcecdced2986 100644 --- a/materialscanner/x64/Debug/qmake/temp/props.txt +++ b/materialscanner/x64/Debug/qmake/temp/props.txt @@ -1,24 +1,24 @@ QT_SYSROOT: -QT_INSTALL_PREFIX:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_ARCHDATA:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DATA:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DOCS:C:/Qt/Docs/Qt-6.2.4 -QT_INSTALL_HEADERS:C:/Qt/6.2.4/msvc2019_64/include -QT_INSTALL_LIBS:C:/Qt/6.2.4/msvc2019_64/lib -QT_INSTALL_LIBEXECS:C:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_BINS:C:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_TESTS:C:/Qt/6.2.4/msvc2019_64/tests -QT_INSTALL_PLUGINS:C:/Qt/6.2.4/msvc2019_64/plugins -QT_INSTALL_QML:C:/Qt/6.2.4/msvc2019_64/qml -QT_INSTALL_TRANSLATIONS:C:/Qt/6.2.4/msvc2019_64/translations +QT_INSTALL_PREFIX:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_DATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_DOCS:C:/stud/tools/Docs/Qt-6.2.4 +QT_INSTALL_HEADERS:C:/stud/tools/6.2.4/msvc2019_64/include +QT_INSTALL_LIBS:C:/stud/tools/6.2.4/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_INSTALL_BINS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_INSTALL_TESTS:C:/stud/tools/6.2.4/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/stud/tools/6.2.4/msvc2019_64/plugins +QT_INSTALL_QML:C:/stud/tools/6.2.4/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/stud/tools/6.2.4/msvc2019_64/translations QT_INSTALL_CONFIGURATION: -QT_INSTALL_EXAMPLES:C:/Qt/Examples/Qt-6.2.4 -QT_INSTALL_DEMOS:C:/Qt/Examples/Qt-6.2.4 -QT_HOST_PREFIX:C:/Qt/6.2.4/msvc2019_64 -QT_HOST_DATA:C:/Qt/6.2.4/msvc2019_64 -QT_HOST_BINS:C:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBEXECS:C:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBS:C:/Qt/6.2.4/msvc2019_64/lib +QT_INSTALL_EXAMPLES:C:/stud/tools/Examples/Qt-6.2.4 +QT_INSTALL_DEMOS:C:/stud/tools/Examples/Qt-6.2.4 +QT_HOST_PREFIX:C:/stud/tools/6.2.4/msvc2019_64 +QT_HOST_DATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_HOST_BINS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_HOST_LIBEXECS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_HOST_LIBS:C:/stud/tools/6.2.4/msvc2019_64/lib QMAKE_SPEC:win32-msvc QMAKE_XSPEC:win32-msvc QMAKE_VERSION:3.1 diff --git a/materialscanner/x64/Debug/qmake/temp/qtvars.log b/materialscanner/x64/Debug/qmake/temp/qtvars.log index f971dd799c4dd848dd11932a21b77b3ae0727a07..76a8066508922c4e9d6f62c9d9917dd0fce59282 100644 --- a/materialscanner/x64/Debug/qmake/temp/qtvars.log +++ b/materialscanner/x64/Debug/qmake/temp/qtvars.log @@ -1 +1 @@ -Info: creating stash file C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp\.qmake.stash +Info: creating stash file C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp\.qmake.stash diff --git a/materialscanner/x64/Debug/qmake/temp/qtvars.vcxproj b/materialscanner/x64/Debug/qmake/temp/qtvars.vcxproj index 23f752b673a4cbe3c163121f02aa86902f808965..db15b0041ef4351a870165822aef757c9867fcbc 100644 --- a/materialscanner/x64/Debug/qmake/temp/qtvars.vcxproj +++ b/materialscanner/x64/Debug/qmake/temp/qtvars.vcxproj @@ -33,7 +33,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> - <AdditionalIncludeDirectories>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 %(AdditionalOptions)</AdditionalOptions> <AssemblerListingLocation>.\</AssemblerListingLocation> <BrowseInformation>false</BrowseInformation> @@ -50,7 +50,7 @@ <WarningLevel>TurnOffAllWarnings</WarningLevel> </ClCompile> <Link> - <AdditionalDependencies>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>true</DataExecutionPrevention> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -72,8 +72,8 @@ <ItemGroup> <CustomBuild Include="moc_predefs.h.cbt"> <FileType>Document</FileType> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -BxC:\Qt\6.2.4\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -Zi -MDd -std:c++17 -utf-8 -W0 -E C:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\stud\tools\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -BxC:\stud\tools\6.2.4\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -Zi -MDd -std:c++17 -utf-8 -W0 -E C:\stud\tools\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate moc_predefs.h</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">moc_predefs.h;%(Outputs)</Outputs> </CustomBuild> diff --git a/materialscanner/x64/Debug/qmake/temp/qtvars_x64_Debug.props b/materialscanner/x64/Debug/qmake/temp/qtvars_x64_Debug.props index 7173c8bbc285d966f50b3c3d700e250fe6552b59..bd592ccc938866d209ee2ef6a4be7d2198151044 100644 --- a/materialscanner/x64/Debug/qmake/temp/qtvars_x64_Debug.props +++ b/materialscanner/x64/Debug/qmake/temp/qtvars_x64_Debug.props @@ -1,32 +1,32 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Qt_DEFINES_>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB</Qt_DEFINES_> -<Qt_INCLUDEPATH_>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<Qt_INCLUDEPATH_>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> <Qt_STDCPP_>stdcpp17</Qt_STDCPP_> <Qt_CL_OPTIONS_>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8</Qt_CL_OPTIONS_> -<Qt_LIBS_>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> +<Qt_LIBS_>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Guid.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Cored.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> <Qt_LINK_OPTIONS_>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"</Qt_LINK_OPTIONS_> <QMake_QT_SYSROOT_></QMake_QT_SYSROOT_> -<QMake_QT_INSTALL_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>C:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>C:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>C:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>C:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>C:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>C:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<QMake_QT_INSTALL_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> +<QMake_QT_INSTALL_ARCHDATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> +<QMake_QT_INSTALL_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> +<QMake_QT_INSTALL_DOCS_>C:/stud/tools/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> +<QMake_QT_INSTALL_HEADERS_>C:/stud/tools/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> +<QMake_QT_INSTALL_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> +<QMake_QT_INSTALL_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> +<QMake_QT_INSTALL_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> +<QMake_QT_INSTALL_TESTS_>C:/stud/tools/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> +<QMake_QT_INSTALL_PLUGINS_>C:/stud/tools/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> +<QMake_QT_INSTALL_QML_>C:/stud/tools/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> +<QMake_QT_INSTALL_TRANSLATIONS_>C:/stud/tools/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> <QMake_QT_INSTALL_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<QMake_QT_INSTALL_EXAMPLES_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> +<QMake_QT_INSTALL_DEMOS_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> +<QMake_QT_HOST_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> +<QMake_QT_HOST_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> +<QMake_QT_HOST_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> +<QMake_QT_HOST_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> +<QMake_QT_HOST_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> <QMake_QMAKE_SPEC_>win32-msvc</QMake_QMAKE_SPEC_> <QMake_QMAKE_XSPEC_>win32-msvc</QMake_QMAKE_XSPEC_> <QMake_QMAKE_VERSION_>3.1</QMake_QMAKE_VERSION_> diff --git a/materialscanner/x64/Debug/qt_work.log b/materialscanner/x64/Debug/qt_work.log index 835e8dbb33afbad10cc7e306dc216d40239ec85a..06ef39aebc7ecbd960ea78da1bc159acad01c7e6 100644 Binary files a/materialscanner/x64/Debug/qt_work.log and b/materialscanner/x64/Debug/qt_work.log differ diff --git a/materialscanner/x64/Release/qmake/qtvars_x64_Release.props b/materialscanner/x64/Release/qmake/qtvars_x64_Release.props index a064ddfb58ac011f2fd7ff18a6f5c0340ac09c9d..86043c77ea27101e142085174b5b1e21ff9fb3fb 100644 --- a/materialscanner/x64/Release/qmake/qtvars_x64_Release.props +++ b/materialscanner/x64/Release/qmake/qtvars_x64_Release.props @@ -1,32 +1,32 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Qt_DEFINES_>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB</Qt_DEFINES_> -<Qt_INCLUDEPATH_>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<Qt_INCLUDEPATH_>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> <Qt_STDCPP_>stdcpp17</Qt_STDCPP_> <Qt_CL_OPTIONS_>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8</Qt_CL_OPTIONS_> -<Qt_LIBS_>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> +<Qt_LIBS_>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> <Qt_LINK_OPTIONS_>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"</Qt_LINK_OPTIONS_> <QMake_QT_SYSROOT_></QMake_QT_SYSROOT_> -<QMake_QT_INSTALL_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>C:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>C:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>C:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>C:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>C:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>C:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<QMake_QT_INSTALL_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> +<QMake_QT_INSTALL_ARCHDATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> +<QMake_QT_INSTALL_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> +<QMake_QT_INSTALL_DOCS_>C:/stud/tools/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> +<QMake_QT_INSTALL_HEADERS_>C:/stud/tools/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> +<QMake_QT_INSTALL_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> +<QMake_QT_INSTALL_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> +<QMake_QT_INSTALL_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> +<QMake_QT_INSTALL_TESTS_>C:/stud/tools/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> +<QMake_QT_INSTALL_PLUGINS_>C:/stud/tools/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> +<QMake_QT_INSTALL_QML_>C:/stud/tools/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> +<QMake_QT_INSTALL_TRANSLATIONS_>C:/stud/tools/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> <QMake_QT_INSTALL_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<QMake_QT_INSTALL_EXAMPLES_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> +<QMake_QT_INSTALL_DEMOS_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> +<QMake_QT_HOST_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> +<QMake_QT_HOST_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> +<QMake_QT_HOST_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> +<QMake_QT_HOST_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> +<QMake_QT_HOST_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> <QMake_QMAKE_SPEC_>win32-msvc</QMake_QMAKE_SPEC_> <QMake_QMAKE_XSPEC_>win32-msvc</QMake_QMAKE_XSPEC_> <QMake_QMAKE_VERSION_>3.1</QMake_QMAKE_VERSION_> diff --git a/materialscanner/x64/Release/qmake/temp/.qmake.stash b/materialscanner/x64/Release/qmake/temp/.qmake.stash index 25ca1a2f95041fc2f9312bbc98cff0d3fe4a3076..dd598bde0378a0e33ef8f0e8562b50e0daa9a878 100644 --- a/materialscanner/x64/Release/qmake/temp/.qmake.stash +++ b/materialscanner/x64/Release/qmake/temp/.qmake.stash @@ -1,6 +1,6 @@ QMAKE_CXX.QT_COMPILER_STDCXX = 199711L QMAKE_CXX.QMAKE_MSC_VER = 1929 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930141 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930143 QMAKE_CXX.COMPILER_MACROS = \ QT_COMPILER_STDCXX \ QMAKE_MSC_VER \ diff --git a/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx b/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx index 54717a028237ddd52ea4ee979ddd461b99a01436..a91137607273d164be191e1ac84eec27f82a0a85 100644 --- a/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx +++ b/materialscanner/x64/Release/qmake/temp/4B0C42FC-1A58-4426-8803-5DB7203D559C.materialscanner.designtime.idx @@ -1 +1 @@ -C:\Users\Jan\AppData\Local\Temp\ctmduq0r.vqz.designtime.props +C:\Users\baja\AppData\Local\Temp\bpmnv5pa.h2s.designtime.props diff --git a/materialscanner/x64/Release/qmake/temp/props.txt b/materialscanner/x64/Release/qmake/temp/props.txt index 917f80b7dddfcdfd8316eefa4c79b7ddc7095299..0a6df66561d1688a01a94f179c2bbcecdced2986 100644 --- a/materialscanner/x64/Release/qmake/temp/props.txt +++ b/materialscanner/x64/Release/qmake/temp/props.txt @@ -1,24 +1,24 @@ QT_SYSROOT: -QT_INSTALL_PREFIX:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_ARCHDATA:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DATA:C:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DOCS:C:/Qt/Docs/Qt-6.2.4 -QT_INSTALL_HEADERS:C:/Qt/6.2.4/msvc2019_64/include -QT_INSTALL_LIBS:C:/Qt/6.2.4/msvc2019_64/lib -QT_INSTALL_LIBEXECS:C:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_BINS:C:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_TESTS:C:/Qt/6.2.4/msvc2019_64/tests -QT_INSTALL_PLUGINS:C:/Qt/6.2.4/msvc2019_64/plugins -QT_INSTALL_QML:C:/Qt/6.2.4/msvc2019_64/qml -QT_INSTALL_TRANSLATIONS:C:/Qt/6.2.4/msvc2019_64/translations +QT_INSTALL_PREFIX:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_ARCHDATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_DATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_INSTALL_DOCS:C:/stud/tools/Docs/Qt-6.2.4 +QT_INSTALL_HEADERS:C:/stud/tools/6.2.4/msvc2019_64/include +QT_INSTALL_LIBS:C:/stud/tools/6.2.4/msvc2019_64/lib +QT_INSTALL_LIBEXECS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_INSTALL_BINS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_INSTALL_TESTS:C:/stud/tools/6.2.4/msvc2019_64/tests +QT_INSTALL_PLUGINS:C:/stud/tools/6.2.4/msvc2019_64/plugins +QT_INSTALL_QML:C:/stud/tools/6.2.4/msvc2019_64/qml +QT_INSTALL_TRANSLATIONS:C:/stud/tools/6.2.4/msvc2019_64/translations QT_INSTALL_CONFIGURATION: -QT_INSTALL_EXAMPLES:C:/Qt/Examples/Qt-6.2.4 -QT_INSTALL_DEMOS:C:/Qt/Examples/Qt-6.2.4 -QT_HOST_PREFIX:C:/Qt/6.2.4/msvc2019_64 -QT_HOST_DATA:C:/Qt/6.2.4/msvc2019_64 -QT_HOST_BINS:C:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBEXECS:C:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBS:C:/Qt/6.2.4/msvc2019_64/lib +QT_INSTALL_EXAMPLES:C:/stud/tools/Examples/Qt-6.2.4 +QT_INSTALL_DEMOS:C:/stud/tools/Examples/Qt-6.2.4 +QT_HOST_PREFIX:C:/stud/tools/6.2.4/msvc2019_64 +QT_HOST_DATA:C:/stud/tools/6.2.4/msvc2019_64 +QT_HOST_BINS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_HOST_LIBEXECS:C:/stud/tools/6.2.4/msvc2019_64/bin +QT_HOST_LIBS:C:/stud/tools/6.2.4/msvc2019_64/lib QMAKE_SPEC:win32-msvc QMAKE_XSPEC:win32-msvc QMAKE_VERSION:3.1 diff --git a/materialscanner/x64/Release/qmake/temp/qtvars.log b/materialscanner/x64/Release/qmake/temp/qtvars.log index e3a721e38a443aba37d34698809c418291d8b248..54307258f3fdb3c58275a378056e315e5361fa18 100644 --- a/materialscanner/x64/Release/qmake/temp/qtvars.log +++ b/materialscanner/x64/Release/qmake/temp/qtvars.log @@ -1 +1 @@ -Info: creating stash file C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp\.qmake.stash +Info: creating stash file C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp\.qmake.stash diff --git a/materialscanner/x64/Release/qmake/temp/qtvars.vcxproj b/materialscanner/x64/Release/qmake/temp/qtvars.vcxproj index 1ba15325cd1f6c173610b9cfd7456be7731911dd..70efc80e83928d4553b1bd7a3731de889c63afbb 100644 --- a/materialscanner/x64/Release/qmake/temp/qtvars.vcxproj +++ b/materialscanner/x64/Release/qmake/temp/qtvars.vcxproj @@ -34,7 +34,7 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <AdditionalIncludeDirectories>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 %(AdditionalOptions)</AdditionalOptions> <AssemblerListingLocation>.\</AssemblerListingLocation> <BrowseInformation>false</BrowseInformation> @@ -52,7 +52,7 @@ <WarningLevel>TurnOffAllWarnings</WarningLevel> </ClCompile> <Link> - <AdditionalDependencies>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions> <DataExecutionPrevention>true</DataExecutionPrevention> <EnableCOMDATFolding>true</EnableCOMDATFolding> @@ -77,8 +77,8 @@ <ItemGroup> <CustomBuild Include="moc_predefs.h.cbt"> <FileType>Document</FileType> - <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -BxC:\Qt\6.2.4\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -O2 -MD -std:c++17 -utf-8 -W0 -E C:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\stud\tools\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -BxC:\stud\tools\6.2.4\msvc2019_64\bin\qmake.exe -nologo -Zc:wchar_t -FS -Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -O2 -MD -std:c++17 -utf-8 -W0 -E C:\stud\tools\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate moc_predefs.h</Message> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">moc_predefs.h;%(Outputs)</Outputs> </CustomBuild> diff --git a/materialscanner/x64/Release/qmake/temp/qtvars_x64_Release.props b/materialscanner/x64/Release/qmake/temp/qtvars_x64_Release.props index a064ddfb58ac011f2fd7ff18a6f5c0340ac09c9d..86043c77ea27101e142085174b5b1e21ff9fb3fb 100644 --- a/materialscanner/x64/Release/qmake/temp/qtvars_x64_Release.props +++ b/materialscanner/x64/Release/qmake/temp/qtvars_x64_Release.props @@ -1,32 +1,32 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Qt_DEFINES_>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;NDEBUG;QT_NO_DEBUG;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB</Qt_DEFINES_> -<Qt_INCLUDEPATH_>C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\Qt\6.2.4\msvc2019_64\include;C:\Qt\6.2.4\msvc2019_64\include\QtWidgets;C:\Qt\6.2.4\msvc2019_64\include\QtGui;C:\Qt\6.2.4\msvc2019_64\include\QtCore;C:\dev\materialscanner\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<Qt_INCLUDEPATH_>C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;C:\stud\tools\6.2.4\msvc2019_64\include;C:\stud\tools\6.2.4\msvc2019_64\include\QtWidgets;C:\stud\tools\6.2.4\msvc2019_64\include\QtGui;C:\stud\tools\6.2.4\msvc2019_64\include\QtCore;C:\stud\Dev\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;C:\stud\tools\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> <Qt_STDCPP_>stdcpp17</Qt_STDCPP_> <Qt_CL_OPTIONS_>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8</Qt_CL_OPTIONS_> -<Qt_LIBS_>C:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> +<Qt_LIBS_>C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Gui.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6Core.lib;C:\stud\tools\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> <Qt_LINK_OPTIONS_>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'"</Qt_LINK_OPTIONS_> <QMake_QT_SYSROOT_></QMake_QT_SYSROOT_> -<QMake_QT_INSTALL_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>C:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>C:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>C:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>C:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>C:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>C:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<QMake_QT_INSTALL_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> +<QMake_QT_INSTALL_ARCHDATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> +<QMake_QT_INSTALL_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> +<QMake_QT_INSTALL_DOCS_>C:/stud/tools/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> +<QMake_QT_INSTALL_HEADERS_>C:/stud/tools/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> +<QMake_QT_INSTALL_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> +<QMake_QT_INSTALL_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> +<QMake_QT_INSTALL_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> +<QMake_QT_INSTALL_TESTS_>C:/stud/tools/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> +<QMake_QT_INSTALL_PLUGINS_>C:/stud/tools/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> +<QMake_QT_INSTALL_QML_>C:/stud/tools/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> +<QMake_QT_INSTALL_TRANSLATIONS_>C:/stud/tools/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> <QMake_QT_INSTALL_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>C:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>C:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>C:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>C:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<QMake_QT_INSTALL_EXAMPLES_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> +<QMake_QT_INSTALL_DEMOS_>C:/stud/tools/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> +<QMake_QT_HOST_PREFIX_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> +<QMake_QT_HOST_DATA_>C:/stud/tools/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> +<QMake_QT_HOST_BINS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> +<QMake_QT_HOST_LIBEXECS_>C:/stud/tools/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> +<QMake_QT_HOST_LIBS_>C:/stud/tools/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> <QMake_QMAKE_SPEC_>win32-msvc</QMake_QMAKE_SPEC_> <QMake_QMAKE_XSPEC_>win32-msvc</QMake_QMAKE_XSPEC_> <QMake_QMAKE_VERSION_>3.1</QMake_QMAKE_VERSION_> diff --git a/materialscanner/x64/Release/qt_work.log b/materialscanner/x64/Release/qt_work.log index 226faaaeed57a7ff3c965f00380821df672b7619..56b99eeb9f719a504eb71d7ac0c4686c30b47fc7 100644 Binary files a/materialscanner/x64/Release/qt_work.log and b/materialscanner/x64/Release/qt_work.log differ