feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix namespace usage in QSR project wizard template

Browse Source 
Consistently use namespaces with different feature if/def's in main.cpp

Task-number: QSR-2079
Change-Id: I0609f7eb8cb18d270e59c11025850e6369e5db87
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
(cherry picked from commit f98a03a28d)
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jussi Witick
2023-04-19 10:44:53 +03:00
committed by Tarja Sundqvist
parent a37b0f0e6c
commit b57971a9cd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/saferenderer/wizards/qsrapp/main.cpp.tpl
View File

@@ -28,23 +28,23 @@ int main(int argc, char *argv[])
static SafeRenderer::QSafeLayoutResourceReader layout("/layoutData/main/main.srl"); static SafeRenderer::QSafeLayoutResourceReader layout("/layoutData/main/main.srl");
#if defined(USE_OUTPUTVERIFIER) #if defined(USE_OUTPUTVERIFIER)
static OutputVerifier outputVerifier; static SafeRenderer::OutputVerifier outputVerifier;
#if defined(HOST_BUILD) #if defined(HOST_BUILD)
//In host environment the TestVerifier must be explicitly created. //In host environment the TestVerifier must be explicitly created.
//In OpeWFD adaptation the MISRVerifier instance is created in the SafeWindow adaptation. //In OpeWFD adaptation the MISRVerifier instance is created in the SafeWindow adaptation.
static TestVerifier testVerifier(outputVerifier); static SafeRenderer::TestVerifier testVerifier(outputVerifier);
#endif #endif
SafeWindow telltaleWindow(layout.size(), QSafePoint(0U, 0U), outputVerifier); SafeRenderer::SafeWindow telltaleWindow(layout.size(), SafeRenderer::QSafePoint(0U, 0U), outputVerifier);
#else #else
SafeWindow telltaleWindow(layout.size(), QSafePoint(0U, 0U)); SafeRenderer::SafeWindow telltaleWindow(layout.size(), SafeRenderer::QSafePoint(0U, 0U));
#endif #endif
static SafeRenderer::StateManager stateManager(telltaleWindow, layout); static SafeRenderer::StateManager stateManager(telltaleWindow, layout);
telltaleWindow.requestUpdate(); //Request is required because eventHandler is not running yet. telltaleWindow.requestUpdate(); //Request is required because eventHandler is not running yet.
#if defined(USE_OUTPUTVERIFIER) #if defined(USE_OUTPUTVERIFIER)
EventHandler msgHandler(stateManager, telltaleWindow, outputVerifier); SafeRenderer::EventHandler msgHandler(stateManager, telltaleWindow, outputVerifier);
#else #else
EventHandler msgHandler(stateManager, telltaleWindow); SafeRenderer::EventHandler msgHandler(stateManager, telltaleWindow);
#endif #endif
#if defined(HOST_BUILD) #if defined(HOST_BUILD)