diff options
| author | Marianne Yrjänä <marianne.yrjana@qt.io> | 2017-11-13 14:59:42 +0200 |
|---|---|---|
| committer | Marianne Yrjänä <marianne.yrjana@qt.io> | 2017-11-14 09:10:06 +0000 |
| commit | a86a3e150b908683ce0fafa8dcd65cb57444d1f9 (patch) | |
| tree | bc5d53804970cd5e9b4e46d2e5349a476fc3a20e | |
| parent | 3d259a961947fc24375d35c13388c6c7f0cdd52b (diff) | |
Initialize help file path
Unused code related to old help file path initialization removed at same
time
Task-number: QT3DS-91
Change-Id: I9bcc68b30915ab10d1647ae046df7b07f30464fd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Studio/_Win/Application/StudioApp.cpp | 6 | ||||
| -rw-r--r-- | src/Authoring/Studio/_Win/Application/StudioApp.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp index 39a2d61e..902ece68 100644 --- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp +++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp @@ -313,10 +313,8 @@ bool CStudioApp::InitInstance(int argc, char* argv[]) thePreferencesPath, CFilePath(L"Qt3DSComposer\\Preferences.setting")); CPreferences::SetPreferencesFile(thePreferencesPath); -#ifdef KDAB_TEMPORARILY_REMOVED - // Set up the path to the help file - InitHelpSystem(); -#endif + // Initialize help file path + m_pszHelpFilePath = ::LoadResourceString(IDS_HELP_FILE_NAME); CStudioPreferences::LoadPreferences(); diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.h b/src/Authoring/Studio/_Win/Application/StudioApp.h index a44302ff..738a1e88 100644 --- a/src/Authoring/Studio/_Win/Application/StudioApp.h +++ b/src/Authoring/Studio/_Win/Application/StudioApp.h @@ -113,7 +113,6 @@ protected: int RunSystemTests(const Q3DStudio::CString &inTestArgs); int OpenAndRunApplication(const Q3DStudio::CString &inFilename); void InitCore(); - void InitHelpSystem(); bool ShowStartupDialog(); bool HandleWelcomeRes(int res, bool recursive); |