Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r6eaef41ddd9dcb8717b1fbb7925b52279b0553cd -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 6eaef41ddd9dcb8717b1fbb7925b52279b0553cd) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -43,8 +43,12 @@ #ifdef BUILD_FOR_TARGET const char *USB_Mount_Point = "/media/usb/"; #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *USB_Mount_Point = "/home/leahi/Desktop/usb-disk/"; +#else + const char *USB_Mount_Point = "/home/denali/Desktop/usb-disk/"; #endif +#endif const char *USB_File_System = "vfat"; @@ -72,8 +76,12 @@ const char *SDCard_Base_Path_Name = "/media/sd-card/"; #else // should not be in the project application folder. [not tracking by git] +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *SDCard_Base_Path_Name = "/home/leahi/Desktop/sd-card/"; +#else + const char *SDCard_Base_Path_Name = "/home/denali/Desktop/sd-card/"; #endif +#endif // Screenshot store folder const char *Screenshot_Base_Path_Name = "Screenshots/"; // this is the base path which will use the USB_Mount_Point to store the screenshots. @@ -87,16 +95,24 @@ #ifdef BUILD_FOR_TARGET return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData(); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Desktop/"; +#else + return "/home/denali/Desktop/"; #endif +#endif } const char *Translations_Path() { #ifdef BUILD_FOR_TARGET return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData(); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Projects/application/resources/"; +#else + return "/home/denali/Projects/application/resources/"; #endif +#endif } #ifdef BUILD_FOR_TARGET @@ -110,9 +126,14 @@ #endif #else // should be in the project application folder. [is tracking by git] +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *Settings_Path_Init = "/home/leahi/Public/luis/application/config/configurations/"; const char *Settings_Path_Name = "/home/leahi/Public/luis/application/config/configurations/"; +#else + const char *Settings_Path_Init = "/home/denali/Public/luis/application/config/configurations/"; + const char *Settings_Path_Name = "/home/denali/Public/luis/application/config/configurations/"; #endif +#endif const char *Settings_Category_Instructions = "Instructions/Instructions" ; const char *Settings_Category_InstructionsImagesLoc = "%1/Instructions/" ; const char *Settings_Category_DataList = "Parameters/DataList" ; @@ -142,8 +163,12 @@ #endif #else // on VM it is a temporary file which is not being tracked +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *CloudSync_Base_Path_Name = "/home/leahi/Desktop/CloudSync/"; +#else + const char *CloudSync_Base_Path_Name = "/home/denali/Desktop/CloudSync/"; #endif +#endif #ifdef BUILD_FOR_TARGET const char *CloudSync_Credentials_Folder_Name = "credentials/"; @@ -160,7 +185,11 @@ // therefore in manufacturing or update mode we are still running scripts as root. return QCoreApplication::applicationDirPath() + ( ( gEnableManufacturing || gEnableUpdating )? "/scripts/" : "/scripts/"); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Projects/application/scripts/"; +#else + return "/home/denali/Projects/application/scripts/"; +#endif #endif }