diff --git a/materialscanner/camera-controller.cpp b/materialscanner/camera-controller.cpp index e024c3fe8583f32eeae43ca4ed02a3034daddaa9..339c3317bd3f01cb23cb82833d152c05a65105bd 100644 --- a/materialscanner/camera-controller.cpp +++ b/materialscanner/camera-controller.cpp @@ -1,6 +1,6 @@ #include "camera-controller.h" #include<qdebug.h> -#include "camera.cpp" +#include "camera.h" using namespace std; @@ -30,7 +30,7 @@ bool cameraController::initCamera() try { cout << "Init camera..." << endl; - camera cameraInstance; //create instance, assuming it has default constructor! + camera cameraInstance = camera(); //create instance, assuming it has default constructor! cameraInstance.run(); } catch (CGalaxyException& e) diff --git a/materialscanner/camera.cpp b/materialscanner/camera.cpp index da347a4099ea5878bea33a06304374a13cccdf67..cb257fac57dec31b40e1d12b7c37384225d281cb 100644 --- a/materialscanner/camera.cpp +++ b/materialscanner/camera.cpp @@ -2,99 +2,158 @@ #include<QWidget> #include<QImage> #include<QObject> +#include "camera.h" //#include<CSampleCaptureEventHandler.h> using namespace std; -class camera : public ICaptureEventHandler +camera::camera() { + +} + +camera::~camera() { + +} + +void camera::DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam) // Callback function processing { -public: - void DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam) // Callback function processing - { - cout << "Bild erhalten" << endl; - cout << "ImageInfo: " << objImageDataPointer->GetStatus() << endl; - cout << "ImageInfo: " << objImageDataPointer->GetWidth() << endl; - cout << "ImageInfo: " << objImageDataPointer->GetHeight() << endl; - cout << "ImageInfo: " << objImageDataPointer->GetPayloadSize() << endl; - } + cout << "Bild erhalten" << endl; + cout << "ImageInfo: " << objImageDataPointer->GetStatus() << endl; + cout << "ImageInfo: " << objImageDataPointer->GetWidth() << endl; + cout << "ImageInfo: " << objImageDataPointer->GetHeight() << endl; + cout << "ImageInfo: " << objImageDataPointer->GetPayloadSize() << endl; +} + + + +bool camera::run() +{ + cout << "Run code reached..." << endl; + // Declare event callback object pointer + IDeviceOfflineEventHandler* pDeviceOfflineEventHandler = NULL;/// Callback object for offline event + IFeatureEventHandler* pFeatureEventHandler = NULL;/// remote device event callback object + ICaptureEventHandler* pCaptureEventHandler = NULL;/// fetch callback object + // Inicializar + IGXFactory::GetInstance().Init(); + // Enumerar dispositivos + gxdeviceinfo_vector vectorDeviceInfo; + IGXFactory::GetInstance().UpdateDeviceList(1000, vectorDeviceInfo); - bool run() + int a = 0; + if (0 == vectorDeviceInfo.size()) { - cout << "Run code reached..." << endl; - // Declare event callback object pointer - IDeviceOfflineEventHandler* pDeviceOfflineEventHandler = NULL;/// Callback object for offline event - IFeatureEventHandler* pFeatureEventHandler = NULL;/// remote device event callback object - ICaptureEventHandler* pCaptureEventHandler = NULL;/// fetch callback object + cout << "No device available!" << endl; - // Inicializar - IGXFactory::GetInstance().Init(); + // Desinicializar la biblioteca + IGXFactory::GetInstance().Uninit(); + return false; + } - // Enumerar dispositivos - gxdeviceinfo_vector vectorDeviceInfo; - IGXFactory::GetInstance().UpdateDeviceList(1000, vectorDeviceInfo); + // Abre el primer dispositivo y la primera secuencia debajo del dispositivo + CGXDevicePointer objDevicePtr; - int a = 0; - if (0 == vectorDeviceInfo.size()) - { - cout << "No device available!" << endl; + GxIAPICPP::gxstring strSN = vectorDeviceInfo[0].GetSN(); - // Desinicializar la biblioteca - IGXFactory::GetInstance().Uninit(); - return false; - } + objDevicePtr = IGXFactory::GetInstance().OpenDeviceBySN(strSN, GX_ACCESS_EXCLUSIVE); - // Abre el primer dispositivo y la primera secuencia debajo del dispositivo - CGXDevicePointer ObjDevicePtr = - IGXFactory::GetInstance().OpenDeviceBySN(vectorDeviceInfo[0].GetSN(), GX_ACCESS_EXCLUSIVE); - CGXStreamPointer ObjStreamPtr = ObjDevicePtr->OpenStream(0); + uint32_t nStreamNum = objDevicePtr->GetStreamCount(); + if (nStreamNum > 0) + { + CGXStreamPointer objStreamPtr = objDevicePtr->OpenStream(0); + /*Stream object control or acquisition.*/ // Abrufen des Remoteger�teattributtreibers - CGXFeatureControlPointer ObjFeatureControlPtr = ObjDevicePtr->GetRemoteFeatureControl(); + CGXFeatureControlPointer ObjFeatureControlPtr = objDevicePtr->GetRemoteFeatureControl(); + /* + ObjFeatureControlPtr->GetEnumFeature("TriggerMode")->SetValue("On"); ObjFeatureControlPtr->GetEnumFeature("TriggerSource")->SetValue("Line0"); ObjFeatureControlPtr->GetEnumFeature("TriggerActivation")->SetValue("RisingEdge"); ObjFeatureControlPtr->GetFloatFeature("TriggerDelay")->SetValue(500000); ObjFeatureControlPtr->GetFloatFeature("TriggerFilterRaisingEdge")->SetValue(5000); + */ + + /*Improve the acquisition performance of the network camera + [currently only the Gigabit network camera supports the optimal packet length]*/ + GX_DEVICE_CLASS_LIST objDeviceClass = objDevicePtr->GetDeviceInfo().GetDeviceClass(); + + if (GX_DEVICE_CLASS_U3V == objDeviceClass) + { + /*Determine whether the device supports the stream channel packet function.*/ + if (true == ObjFeatureControlPtr->IsImplemented("GevSCPSPacketSize")) + { + /*Get the optimal packet length value of the current network environment*/ + int nPacketSize = objStreamPtr->GetOptimalPacketSize(); + + /*Set the optimal packet length value to the stream channel packet length of + the current device.*/ + + ObjFeatureControlPtr->GetIntFeature("GevSCPSPacketSize")->SetValue(nPacketSize); + + } + + } + // Callback Collection registrieren - pCaptureEventHandler = new camera(); - ObjStreamPtr->RegisterCaptureCallback(pCaptureEventHandler, NULL); + //pCaptureEventHandler = new camera(); + //ObjStreamPtr->RegisterCaptureCallback(pCaptureEventHandler, NULL); // Senden von Miningbefehlen - ObjStreamPtr->StartGrab(); + objStreamPtr->StartGrab(); ObjFeatureControlPtr->GetCommandFeature("AcquisitionStart")->Execute(); - cout << "Sleep started!" << endl; - Sleep(10000); - cout << "Sleep ended!" << endl; + CImageDataPointer objImageDataPtr; + + objImageDataPtr = objStreamPtr->GetImage(500);/* Set timeout is 500ms, users can set the value by themselves.*/ + + if (objImageDataPtr->GetStatus() == GX_FRAME_STATUS_SUCCESS) + { + cout << "Bild erhalten!" << endl; + cout << "ImageInfo: " << objImageDataPtr->GetStatus() << endl; + cout << "ImageInfo: " << objImageDataPtr->GetWidth() << endl; + cout << "ImageInfo: " << objImageDataPtr->GetHeight() << endl; + cout << "ImageInfo: " << objImageDataPtr->GetPayloadSize() << endl; + + void* pRGB24Buffer = NULL; + // Angenommen, die Originaldaten sind ein BayerRG8-Bild + pRGB24Buffer = objImageDataPtr->ConvertToRGB24(GX_BIT_0_7, GX_RAW2RGB_NEIGHBOUR, true); + + QImage* image = new QImage(objImageDataPtr->GetWidth(), objImageDataPtr->GetHeight(), QImage::Format_ARGB32); + } + + + //cout << "Sleep started!" << endl; + //Sleep(10000); + //cout << "Sleep ended!" << endl; //Befehl "Miningstopp senden" ObjFeatureControlPtr->GetCommandFeature("AcquisitionStop")->Execute(); ObjFeatureControlPtr->GetEnumFeature("TriggerMode")->SetValue("Off"); - ObjStreamPtr->StopGrab(); + objStreamPtr->StopGrab(); //R�ckruf beim Abmelden der Sammlung - ObjStreamPtr->UnregisterCaptureCallback(); + objStreamPtr->UnregisterCaptureCallback(); //Ressourcen freisetzen - ObjStreamPtr->Close(); - ObjDevicePtr->Close(); + objStreamPtr->Close(); + } - //Deinitialisieren der Bibliothek - IGXFactory::GetInstance().Uninit(); + objDevicePtr->Close(); - //Zerst�rt den Ereignisr�ckrufzeiger - if (NULL != pCaptureEventHandler) - { - delete pCaptureEventHandler; - pCaptureEventHandler = NULL; - } + //Deinitialisieren der Bibliothek + IGXFactory::GetInstance().Uninit(); - return true; + //Zerst�rt den Ereignisr�ckrufzeiger + if (NULL != pCaptureEventHandler) + { + delete pCaptureEventHandler; + pCaptureEventHandler = NULL; } -}; \ No newline at end of file + return true; +} \ No newline at end of file diff --git a/materialscanner/camera.h b/materialscanner/camera.h new file mode 100644 index 0000000000000000000000000000000000000000..10ddcb069cd56abfdeffda3e2374b62f99d9642a --- /dev/null +++ b/materialscanner/camera.h @@ -0,0 +1,11 @@ +#pragma once + +class camera : ICaptureEventHandler +{ +public: + camera(); + ~camera(); + + void DoOnImageCaptured(CImageDataPointer& objImageDataPointer, void* pUserParam); + bool run(); +}; \ No newline at end of file diff --git a/materialscanner/main.cpp b/materialscanner/main.cpp index 313a1dec8f8a9799da00e41657f5da0aaa83c9cd..b15bd44acb4c65c80f19f3de869062f5ab35b39b 100644 --- a/materialscanner/main.cpp +++ b/materialscanner/main.cpp @@ -12,8 +12,8 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); materialscanner w; - lightsController lights = lightsController::lightsController(); - cameraController camera = cameraController::cameraController(); + lightsController lightsController = lightsController::lightsController(); + cameraController cameraController = cameraController::cameraController(); //string address = "./image/9demo.bmp"; //cv::Mat src = cv::imread(address); diff --git a/materialscanner/materialscanner.vcxproj b/materialscanner/materialscanner.vcxproj index 49a723519f07522e85e7ff9c9c8e0294bfab4257..92dad51d3f49c3e6ecf68c97a13790077f2cecb4 100644 --- a/materialscanner/materialscanner.vcxproj +++ b/materialscanner/materialscanner.vcxproj @@ -128,6 +128,7 @@ <None Include="materialscanner.ico" /> <ResourceCompile Include="materialscanner.rc" /> <ClInclude Include="camera-controller.h" /> + <ClInclude Include="camera.h" /> <ClInclude Include="lights-controller.h" /> <ClInclude Include="stdafx.h" /> <ClCompile Include="stdafx.cpp"> diff --git a/materialscanner/materialscanner.vcxproj.filters b/materialscanner/materialscanner.vcxproj.filters index 409576df6481884f3842b6795258e14d9c5aae2a..ca5567729397587e0f1c11e0e28b113a88b82c70 100644 --- a/materialscanner/materialscanner.vcxproj.filters +++ b/materialscanner/materialscanner.vcxproj.filters @@ -69,5 +69,8 @@ <ClInclude Include="lights-controller.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="camera.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project> \ No newline at end of file diff --git a/materialscanner/materialscanner.vcxproj.user b/materialscanner/materialscanner.vcxproj.user index f5dbcd595c37ddbb8b18dc0ed547d45c6e7dd21a..04fd4d6f4a59120e07c54ab83190eeaa81eb6fed 100644 --- a/materialscanner/materialscanner.vcxproj.user +++ b/materialscanner/materialscanner.vcxproj.user @@ -2,9 +2,9 @@ <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup /> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <QtLastBackgroundBuild>2022-04-13T12:53:33.4948721Z</QtLastBackgroundBuild> + <QtLastBackgroundBuild>2022-04-20T07:56:11.9902122Z</QtLastBackgroundBuild> </PropertyGroup> <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <QtLastBackgroundBuild>2022-04-13T12:53:34.1666211Z</QtLastBackgroundBuild> + <QtLastBackgroundBuild>2022-04-20T07:56:13.6088372Z</QtLastBackgroundBuild> </PropertyGroup> </Project> \ No newline at end of file diff --git a/materialscanner/x64/Debug/materialscanner.log b/materialscanner/x64/Debug/materialscanner.log index 9798b691548b85239f96112734e6ad11d34f737b..a448c1abe3c5be87f685fd05fd571e299fa108cd 100644 --- a/materialscanner/x64/Debug/materialscanner.log +++ b/materialscanner/x64/Debug/materialscanner.log @@ -1,25 +1,7 @@ - Reading Qt configuration (D:/Qt/6.2.4/msvc2019_64/bin/qmake) - moc materialscanner.h - stdafx.cpp - camera-controller.cpp + Reading Qt configuration (C:/Qt/6.2.4/msvc2019_64/bin/qmake) camera.cpp - lights-controller.cpp - materialscanner.cpp - main.cpp -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0x764 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xc19 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xd34 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xd45 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(71,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert lights-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(74,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert lights-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(81,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert lights-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0x764 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. (Quelldatei wird kompiliert camera-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xc19 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. (Quelldatei wird kompiliert camera-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xd34 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. (Quelldatei wird kompiliert camera-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: Die Datei enthält ein Zeichen, das bei Offset 0xd45 beginnt. Dieses Zeichen ist im aktuellen Quellzeichensatz (Codepage 65001) unzulässig. (Quelldatei wird kompiliert camera-controller.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(71,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert main.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(74,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert main.cpp) -D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\libs\mqtt\paho-cpp\include\mqtt\client.h(81,8): warning C4834: Der Rückgabewert einer Funktion mit dem "nodiscard"-Attribut wird verworfen. (Quelldatei wird kompiliert main.cpp) - qrc_materialscanner.cpp - moc_materialscanner.cpp - materialscanner.vcxproj -> D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\x64\Debug\materialscanner.exe +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x807 that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x1320 that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x143e that is illegal in the current source character set (codepage 65001). +C:\dev\materialscanner\materialscanner-qt\materialscanner\camera.cpp(1,1): warning C4828: The file contains a character starting at offset 0x144f that is illegal in the current source character set (codepage 65001). + materialscanner.vcxproj -> C:\dev\materialscanner\materialscanner-qt\x64\Debug\materialscanner.exe diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog index dbef685fc5e2596adb8a9f6f423fcf2d826b11cd..0ab5fccf8112c936d7768aef1ecd031dab95be16 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.command.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog index df9ae4a6c76b1783b42728647d47741810a56bbb..7eb4e40487d2af2d7dbcbae980f699b1bcd82bf9 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.read.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog index 14c81f2f704d1391036df3d6be69bdbeafde0fea..41ccc82292fbfad8a11de756d89a2c82654e91c3 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/CL.write.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog index 3573873a0d5e2cdbb6a16f3426c012e33667e33d..b38cb5ad7197752d60e8b129c079236a86e4bd62 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.command.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog index 9990269d80a6a1b91bd1b127ef0b5e307954d28e..4401905937678234fa284de2c27aa3bf3eea4d2f 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.read.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog index 730da2242df271f31d5773558be375fded680c84..49a5e4d3e3f9056e7c611e661b09b7795e56e375 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/link.write.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.lastbuildstate b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.lastbuildstate index d604fbbd6022cf2b5216ef9ce5ea64859f2bf57c..83194a5358960b68984ac40dbbae95f5888d499c 100644 --- a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.lastbuildstate +++ b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.lastbuildstate @@ -1,2 +1,2 @@ -#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0 -Debug|x64|D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\| +PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:VCServicingVersionCrtHeaders=14.29.30136:TargetPlatformVersion=10.0.19041.0: +Debug|x64|C:\dev\materialscanner\materialscanner-qt\| diff --git a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog index 0a9a071297130a11f683da2f194032e8fa81c127..43884b2384da5f3964337e49e24678639d19789c 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/materialscanner.write.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/moc.read.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/moc.read.1u.tlog index cac457cdd7efcfd379f16028b92f922e2703e16d..18c203a427fc396e2b7ceb6caa99e254c35139f6 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/moc.read.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/moc.read.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/moc.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/moc.write.1u.tlog index 2bcf979d14b9467fb35d8330ef1cce3c50821a3e..9b50b0e26de9c5203f28c04330f8b983bbea1183 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/moc.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/moc.write.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/rc.read.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/rc.read.1.tlog index 6312c77fdc218d2b38a9d8a3bf45646bd81f3caa..e528d03367d959771fcaa0eaaf8df302b93446a4 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/rc.read.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/rc.read.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/rc.write.1.tlog b/materialscanner/x64/Debug/materialscanner.tlog/rc.write.1.tlog index 9e0a36c027ba84c03454e1c0fbb7b2024971e10a..5cb3526d7c33d6eaf01d704a4e2c2c5b7a665b38 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/rc.write.1.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/rc.write.1.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/rcc.read.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/rcc.read.1u.tlog index c3734ca037ab24276a6acfefe69eedc6205290c0..e391b854ca881056ef5da881f6661e692911a703 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/rcc.read.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/rcc.read.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/rcc.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/rcc.write.1u.tlog index b809219893548a50b004836cd0b67d4975574a80..280158b5389e454ee9cf8a7417a4a8629612437c 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/rcc.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/rcc.write.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/uic.read.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/uic.read.1u.tlog index 22d5b501b8ba3dd3df6784f8f29001704453e2be..65255a9e3345f0a7502bc1f2ec6c4615e416c824 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/uic.read.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/uic.read.1u.tlog differ diff --git a/materialscanner/x64/Debug/materialscanner.tlog/uic.write.1u.tlog b/materialscanner/x64/Debug/materialscanner.tlog/uic.write.1u.tlog index 5b1173686c65fd8c2836ad936a46a7972ac4172d..24beae58df22d517c436f9099e65ceacd1bea837 100644 Binary files a/materialscanner/x64/Debug/materialscanner.tlog/uic.write.1u.tlog and b/materialscanner/x64/Debug/materialscanner.tlog/uic.write.1u.tlog differ diff --git a/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props b/materialscanner/x64/Debug/qmake/qtvars_x64_Debug.props index ae85d2459e172a530f4b7677b0572fd82bf02b4d..7173c8bbc285d966f50b3c3d700e250fe6552b59 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_>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<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_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_>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> +<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_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_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>D:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>D:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>D:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>D:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>D:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>D:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<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_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<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_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 f6b75f62c90b904967e5be2bc79ce4f367c10d74..0341ac07043af0f5b1d804cfa8fd6aa86c4d7958 100644 --- a/materialscanner/x64/Debug/qmake/temp/.qmake.stash +++ b/materialscanner/x64/Debug/qmake/temp/.qmake.stash @@ -1,14 +1,14 @@ QMAKE_CXX.QT_COMPILER_STDCXX = 199711L -QMAKE_CXX.QMAKE_MSC_VER = 1924 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 192428316 +QMAKE_CXX.QMAKE_MSC_VER = 1929 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930141 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.24.28314\\include" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.24.28314\\atlmfc\\include" \ + "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" \ @@ -18,11 +18,10 @@ QMAKE_CXX.INCDIRS = \ "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.24.28314\\lib\\x64" \ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.24.28314\\atlmfc\\lib\\x64" \ + "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" \ - Lib\\um\\x64 + "C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.8\\lib\\um\\x64" diff --git a/materialscanner/x64/Debug/qmake/temp/props.txt b/materialscanner/x64/Debug/qmake/temp/props.txt index 9002da111668debfc431e442c0c812efd2df510b..917f80b7dddfcdfd8316eefa4c79b7ddc7095299 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:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_ARCHDATA:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DATA:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DOCS:D:/Qt/Docs/Qt-6.2.4 -QT_INSTALL_HEADERS:D:/Qt/6.2.4/msvc2019_64/include -QT_INSTALL_LIBS:D:/Qt/6.2.4/msvc2019_64/lib -QT_INSTALL_LIBEXECS:D:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_BINS:D:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_TESTS:D:/Qt/6.2.4/msvc2019_64/tests -QT_INSTALL_PLUGINS:D:/Qt/6.2.4/msvc2019_64/plugins -QT_INSTALL_QML:D:/Qt/6.2.4/msvc2019_64/qml -QT_INSTALL_TRANSLATIONS:D:/Qt/6.2.4/msvc2019_64/translations +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_CONFIGURATION: -QT_INSTALL_EXAMPLES:D:/Qt/Examples/Qt-6.2.4 -QT_INSTALL_DEMOS:D:/Qt/Examples/Qt-6.2.4 -QT_HOST_PREFIX:D:/Qt/6.2.4/msvc2019_64 -QT_HOST_DATA:D:/Qt/6.2.4/msvc2019_64 -QT_HOST_BINS:D:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBEXECS:D:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBS:D:/Qt/6.2.4/msvc2019_64/lib +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 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 ef61077b996130427d5027c468f506dd876aa2d1..f971dd799c4dd848dd11932a21b77b3ae0727a07 100644 --- a/materialscanner/x64/Debug/qmake/temp/qtvars.log +++ b/materialscanner/x64/Debug/qmake/temp/qtvars.log @@ -1 +1 @@ -Info: creating stash file D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp\.qmake.stash +Info: creating stash file C:\dev\materialscanner\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 9e44e1e9142030c90abd55945246d93639a220f9..23f752b673a4cbe3c163121f02aa86902f808965 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>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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> <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>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <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> <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'">D:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -BxD:\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 D:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> + <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> <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 ae85d2459e172a530f4b7677b0572fd82bf02b4d..7173c8bbc285d966f50b3c3d700e250fe6552b59 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_>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Debug\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<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_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_>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgetsd.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Guid.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Cored.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPointd.lib;shell32.lib</Qt_LIBS_> +<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_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_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>D:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>D:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>D:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>D:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>D:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>D:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<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_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<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_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 4fdd116a75a9c274f31ceddacf2484a9b6d4fbad..0d4f8e735be63a382e4b8da15f494e3068b906ea 100644 Binary files a/materialscanner/x64/Debug/qt_work.log and b/materialscanner/x64/Debug/qt_work.log differ diff --git a/materialscanner/x64/Debug/vc142.pdb b/materialscanner/x64/Debug/vc142.pdb index fe32afc5df14561644b9c433d68f04ed746d50ea..fec6cc2ba83bc43e04ccbf353394f07daaaed16e 100644 Binary files a/materialscanner/x64/Debug/vc142.pdb and b/materialscanner/x64/Debug/vc142.pdb differ diff --git a/materialscanner/x64/Release/moc/moc_materialscanner.cpp b/materialscanner/x64/Release/moc/moc_materialscanner.cpp index 15107484402745a41427718aec09ddbb1759f6ef..f1d04e4d707cfc238a5ee9fba2b744875420c33c 100644 --- a/materialscanner/x64/Release/moc/moc_materialscanner.cpp +++ b/materialscanner/x64/Release/moc/moc_materialscanner.cpp @@ -9,7 +9,6 @@ #include <memory> #include "stdafx.h" #include "../../../materialscanner.h" -#include <QtGui/qtextcursor.h> #include <QtCore/qbytearray.h> #include <QtCore/qmetatype.h> #if !defined(Q_MOC_OUTPUT_REVISION) diff --git a/materialscanner/x64/Release/qmake/qtvars_x64_Release.props b/materialscanner/x64/Release/qmake/qtvars_x64_Release.props index 817f690bfdf5af6d4c67c8bac50f362a5c075b93..a064ddfb58ac011f2fd7ff18a6f5c0340ac09c9d 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_>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<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_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_>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> +<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_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_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>D:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>D:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>D:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>D:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>D:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>D:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<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_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<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_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 be6ba31453020c2cbadc48b0ff45c6716ca7c77c..25ca1a2f95041fc2f9312bbc98cff0d3fe4a3076 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 = 1924 -QMAKE_CXX.QMAKE_MSC_FULL_VER = 192428316 +QMAKE_CXX.QMAKE_MSC_VER = 1929 +QMAKE_CXX.QMAKE_MSC_FULL_VER = 192930141 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 2b9e3fe016624f1e4a35cbea683a1b50eda73981..e9a59c7fe34b4455b7d35c175ff536a860f981f5 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\Marike\AppData\Local\Temp\1qolv3p4.50y.designtime.props +C:\Users\Jan\AppData\Local\Temp\xkjewcy2.kij.designtime.props diff --git a/materialscanner/x64/Release/qmake/temp/props.txt b/materialscanner/x64/Release/qmake/temp/props.txt index 9002da111668debfc431e442c0c812efd2df510b..917f80b7dddfcdfd8316eefa4c79b7ddc7095299 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:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_ARCHDATA:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DATA:D:/Qt/6.2.4/msvc2019_64 -QT_INSTALL_DOCS:D:/Qt/Docs/Qt-6.2.4 -QT_INSTALL_HEADERS:D:/Qt/6.2.4/msvc2019_64/include -QT_INSTALL_LIBS:D:/Qt/6.2.4/msvc2019_64/lib -QT_INSTALL_LIBEXECS:D:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_BINS:D:/Qt/6.2.4/msvc2019_64/bin -QT_INSTALL_TESTS:D:/Qt/6.2.4/msvc2019_64/tests -QT_INSTALL_PLUGINS:D:/Qt/6.2.4/msvc2019_64/plugins -QT_INSTALL_QML:D:/Qt/6.2.4/msvc2019_64/qml -QT_INSTALL_TRANSLATIONS:D:/Qt/6.2.4/msvc2019_64/translations +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_CONFIGURATION: -QT_INSTALL_EXAMPLES:D:/Qt/Examples/Qt-6.2.4 -QT_INSTALL_DEMOS:D:/Qt/Examples/Qt-6.2.4 -QT_HOST_PREFIX:D:/Qt/6.2.4/msvc2019_64 -QT_HOST_DATA:D:/Qt/6.2.4/msvc2019_64 -QT_HOST_BINS:D:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBEXECS:D:/Qt/6.2.4/msvc2019_64/bin -QT_HOST_LIBS:D:/Qt/6.2.4/msvc2019_64/lib +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 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 949a3537f2b1cb8ebdda7670666c19265c9bc892..e3a721e38a443aba37d34698809c418291d8b248 100644 --- a/materialscanner/x64/Release/qmake/temp/qtvars.log +++ b/materialscanner/x64/Release/qmake/temp/qtvars.log @@ -1 +1 @@ -Info: creating stash file D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp\.qmake.stash +Info: creating stash file C:\dev\materialscanner\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 550d5ce3181330d89c3cdc15720464a4c8c8633d..1ba15325cd1f6c173610b9cfd7456be7731911dd 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>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <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> <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>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <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> <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'">D:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp;%(AdditionalInputs)</AdditionalInputs> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -BxD:\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 D:\Qt\6.2.4\msvc2019_64\mkspecs\features\data\dummy.cpp 2>NUL >moc_predefs.h</Command> + <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> <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 817f690bfdf5af6d4c67c8bac50f362a5c075b93..a064ddfb58ac011f2fd7ff18a6f5c0340ac09c9d 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_>D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;D:\Qt\6.2.4\msvc2019_64\include;D:\Qt\6.2.4\msvc2019_64\include\QtWidgets;D:\Qt\6.2.4\msvc2019_64\include\QtGui;D:\Qt\6.2.4\msvc2019_64\include\QtCore;D:\Dokumente\GitHub\MaterialscannerGUI\materialscanner-qt\materialscanner\x64\Release\qmake\temp;/include;D:\Qt\6.2.4\msvc2019_64\mkspecs\win32-msvc</Qt_INCLUDEPATH_> +<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_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_>D:\Qt\6.2.4\msvc2019_64\lib\Qt6Widgets.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Gui.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6Core.lib;D:\Qt\6.2.4\msvc2019_64\lib\Qt6EntryPoint.lib;shell32.lib</Qt_LIBS_> +<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_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_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_PREFIX_> -<QMake_QT_INSTALL_ARCHDATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_ARCHDATA_> -<QMake_QT_INSTALL_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_INSTALL_DATA_> -<QMake_QT_INSTALL_DOCS_>D:/Qt/Docs/Qt-6.2.4</QMake_QT_INSTALL_DOCS_> -<QMake_QT_INSTALL_HEADERS_>D:/Qt/6.2.4/msvc2019_64/include</QMake_QT_INSTALL_HEADERS_> -<QMake_QT_INSTALL_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_INSTALL_LIBS_> -<QMake_QT_INSTALL_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_LIBEXECS_> -<QMake_QT_INSTALL_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_INSTALL_BINS_> -<QMake_QT_INSTALL_TESTS_>D:/Qt/6.2.4/msvc2019_64/tests</QMake_QT_INSTALL_TESTS_> -<QMake_QT_INSTALL_PLUGINS_>D:/Qt/6.2.4/msvc2019_64/plugins</QMake_QT_INSTALL_PLUGINS_> -<QMake_QT_INSTALL_QML_>D:/Qt/6.2.4/msvc2019_64/qml</QMake_QT_INSTALL_QML_> -<QMake_QT_INSTALL_TRANSLATIONS_>D:/Qt/6.2.4/msvc2019_64/translations</QMake_QT_INSTALL_TRANSLATIONS_> +<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_CONFIGURATION_></QMake_QT_INSTALL_CONFIGURATION_> -<QMake_QT_INSTALL_EXAMPLES_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_EXAMPLES_> -<QMake_QT_INSTALL_DEMOS_>D:/Qt/Examples/Qt-6.2.4</QMake_QT_INSTALL_DEMOS_> -<QMake_QT_HOST_PREFIX_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_PREFIX_> -<QMake_QT_HOST_DATA_>D:/Qt/6.2.4/msvc2019_64</QMake_QT_HOST_DATA_> -<QMake_QT_HOST_BINS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_BINS_> -<QMake_QT_HOST_LIBEXECS_>D:/Qt/6.2.4/msvc2019_64/bin</QMake_QT_HOST_LIBEXECS_> -<QMake_QT_HOST_LIBS_>D:/Qt/6.2.4/msvc2019_64/lib</QMake_QT_HOST_LIBS_> +<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_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 dab057910d67e3e00a68eed1e85c9a7e4b44c781..f417edc3f33a9639e280681349891ecc121005f8 100644 Binary files a/materialscanner/x64/Release/qt_work.log and b/materialscanner/x64/Release/qt_work.log differ diff --git a/x64/Debug/materialscanner.ilk b/x64/Debug/materialscanner.ilk index a158fb95d98a33d21d08acaa8482dc9d10427bc6..5129f0e402b60ed9564a033523e6f25f0cb66b23 100644 Binary files a/x64/Debug/materialscanner.ilk and b/x64/Debug/materialscanner.ilk differ diff --git a/x64/Debug/materialscanner.pdb b/x64/Debug/materialscanner.pdb index d68f8235001bab1d6f7ab1522540f2d9e586edd8..7b209e19848a35b08d8f8eaf5f72188fe2d055b0 100644 Binary files a/x64/Debug/materialscanner.pdb and b/x64/Debug/materialscanner.pdb differ