# HG changeset patch # User Mehmet Aslan # Date 2019-03-30 06:04:21 # Node ID 8a90fdbd636c4e5ce40d88edd23e682b370e0e36 # Parent d4acccec104cf4a95a0ae2269bb7d8bc35476536 ApplicationName get from PROGRAM_NAME macro in CMakeLists.txt Default settings name get from PROGRAM_NAME macro in CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,6 +178,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MINOR=${VERSION_MINOR} ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_PATCH=${VERSION_PATCH} ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${VERSION_REVISION}\\\" ") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROGRAM_NAME_STRING=\\\"${PROGRAM_NAME}\\\" ") # add make run target add_custom_target(run diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -36,7 +36,7 @@ void messageHandler(QtMsgType type, cons int main(int argc, char *argv[]) { QApplication a(argc, argv); - QApplication::setApplicationName("SerialPlot"); + QApplication::setApplicationName(PROGRAM_NAME_STRING); QApplication::setApplicationVersion(VERSION_STRING); MainWindow w; pMainWindow = &w; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -253,7 +253,7 @@ MainWindow::MainWindow(QWidget *parent) onSourceChanged(dataFormatPanel.activeSource()); // load default settings - QSettings settings("serialplot", "serialplot"); + QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING); loadAllSettings(&settings); // ensure command panel has 1 command if none loaded @@ -302,7 +302,7 @@ void MainWindow::closeEvent(QCloseEvent } // save settings - QSettings settings("serialplot", "serialplot"); + QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING); saveAllSettings(&settings); settings.sync();