From 620aa665f2f770df0d51384e954f25baec1edb42 Mon Sep 17 00:00:00 2001 From: plc-user <74435298+plc-user@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:25:57 +0100 Subject: [PATCH] Update machine_info.cpp try to resolve PR-conflict --- sources/machine_info.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sources/machine_info.cpp b/sources/machine_info.cpp index 596de23d7..40525082d 100644 --- a/sources/machine_info.cpp +++ b/sources/machine_info.cpp @@ -156,13 +156,15 @@ void MachineInfo::send_info_to_debug() qInfo()<< " Custom TitleBlock Templates Dir:"<< QString(QETApp::customTitleBlockTemplatesDir().toLatin1()); qInfo()<< " Company Elements Dir:"<< QString(QETApp::companyElementsDir().toLatin1()); qInfo()<< " Company TitleBlock Templates Dir:"<< QString(QETApp::companyTitleBlockTemplatesDir().toLatin1()); + qInfo()<< " User Location:"<< QString(QETApp::configDir().toLatin1()); - qInfo()<< " App Config Location:"<< QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation); - qInfo()<< " App Data Location:"<< QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); - qInfo()<< " App Local DataLocation:"<< QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation); - qInfo()<< " Home Location:"<< QStandardPaths::writableLocation(QStandardPaths::HomeLocation); - qInfo()<< " Runtime Location:"<< QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); - qInfo()<< " Cache Location:"<< QStandardPaths::writableLocation(QStandardPaths::CacheLocation); + + qInfo()<< " Config Location :"<< QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation); + qInfo()<< " Project stalefiles Location:"<< QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); + //qInfo()<< " App Local DataLocation:"<< QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation); + // qInfo()<< " Home Location:"<< QStandardPaths::writableLocation(QStandardPaths::HomeLocation); + // qInfo()<< " Runtime Location:"<< QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation); + // qInfo()<< " Cache Location:"<< QStandardPaths::writableLocation(QStandardPaths::CacheLocation);