diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..808d45e --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,6 @@ +{ + "includePath": "/opt/homebrew/include", + "compilerPath": "/usr/bin/clang++", + "cStandard": "c11", + "cppStandard": "c++17" +} diff --git a/cmake/CMakeLists.txt b/CMakeLists.txt similarity index 75% rename from cmake/CMakeLists.txt rename to CMakeLists.txt index 0d40688..907e569 100644 --- a/cmake/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,15 +9,15 @@ project(clock) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_STANDARD 17 CACHE STRING "v") +set(CMAKE_CXX_STANDARD_REQUIRED True) +set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_PREFIX_PATH "/opt/homebrew/opt/qt") find_package(Qt6 COMPONENTS Core Gui Widgets REQUIRED) -include_directories( - . -) +include_directories(.) set (SRCS flock.cpp diff --git a/flock.cpp b/flock.cpp index db9e248..dfb5a97 100644 --- a/flock.cpp +++ b/flock.cpp @@ -28,9 +28,9 @@ Clock::Clock(QWidget *parent) : QWidget{parent}, pressed(false) { font.setPointSize(settings->value("USER/FONT_SIZE").toInt()); // load settings - settings = new QSettings( - QString("%1/config.ini").arg(QCoreApplication::applicationDirPath()), - QSettings::IniFormat); + settings = new QSettings(QString("%1/../floating-clock/config.ini") + .arg(QCoreApplication::applicationDirPath()), + QSettings::IniFormat); // font object font = QFont();