diff options
| author |  ctrlaltca | 2024-02-24 11:30:48 +0100 |
|---|---|---|
| committer |  GitHub | 2024-02-24 11:30:48 +0100 |
| commit | 9e9049626a307f96a6f7cb512ef8111dd0502070 (patch) | |
| tree | 0bf2bce69d028cc0f11e848a4e81ca0b9f48294a /src/modules/setup | |
| parent | Use separate caches for CI linux qt5 and qt6 builds (#2608) (diff) | |
| download | KVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.tar.gz KVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.tar.bz2 KVIrc-9e9049626a307f96a6f7cb512ef8111dd0502070.zip | |
Switch windows CI builds to Github Actions and Qt6 (#2606)
* Make build compatible with ninja generator
* Remove usage of Qt Windows Extras under qt6
* Avoid compilation noise on UNICODE redefinition
* Remove "KviHeapObject::operator new" signature for debug builds, add placement new operator
* Fix implicit cast of 0 to QFlags
* Fix Avoid ambiguous overload in concatenating strings
* KviIpcSentinel::winEvent - Adapt to changed method signature in qt6
* Remove windows 95/98/me support :)
* appveyor: try switching qt version
* Try creating a github action for windows build
* Remove appveyor config; move windows-only patches into dist/windows/patches
Diffstat (limited to 'src/modules/setup')
| -rw-r--r-- | src/modules/setup/SetupWizard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp index 30be5a079..67a7dcdba 100644 --- a/src/modules/setup/SetupWizard.cpp +++ b/src/modules/setup/SetupWizard.cpp @@ -962,7 +962,7 @@ void SetupWizard::accept() #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) else { //portable - szDir = g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "Settings"; + szDir = QString("%1%2%3").arg(g_pApp->applicationDirPath()).arg(KVI_PATH_SEPARATOR_CHAR).arg("Settings"); } #endif @@ -990,7 +990,7 @@ void SetupWizard::accept() #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) else { //portable - szDir = g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "Downloads"; + szDir = QString("%1%2%3").arg(g_pApp->applicationDirPath()).arg(KVI_PATH_SEPARATOR_CHAR).arg("Downloads"); } #endif @@ -1109,7 +1109,7 @@ void SetupWizard::accept() #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) if(m_pDirMakePortable->isChecked()) { - KviFileUtils::writeFile(g_pApp->applicationDirPath() + KVI_PATH_SEPARATOR_CHAR + "portable", QString("true")); + KviFileUtils::writeFile(QString("%1%2%3").arg(g_pApp->applicationDirPath()).arg(KVI_PATH_SEPARATOR_CHAR).arg("portable"), QString("true")); g_pApp->m_bPortable = true; } else |