diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | QRema.pro | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/qremamain.cpp | 2 | ||||
| -rw-r--r-- | src/qremamain.h | 4 | ||||
| -rw-r--r-- | src/qremamain.ui (renamed from data/ui/qremamain.ui) | 0 |
7 files changed, 42 insertions, 4 deletions
@@ -47,3 +47,4 @@ compile_commands.json # QtCreator local machine specific files for imported projects *creator.user* +build diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..9fa52b5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.1.0) + +set(CMAKE_COLOR_MAKEFILE ON) + +project(QRema C CXX) + +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/) + +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) +# Instruct CMake to run moc automatically when needed +set(CMAKE_AUTOMOC ON) +# Create code from a list of Qt designer ui files +set(CMAKE_AUTOUIC ON) + +# Find the QtWidgets library +find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED) + + +add_subdirectory(src) + @@ -57,11 +57,15 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target DISTFILES += \ + CMakeLists.txt \ + data/CMakeLists.txt \ data/icons/scalable/actions/add.svg \ data/icons/scalable/actions/copy.svg \ data/icons/scalable/actions/edit.svg \ data/icons/scalable/actions/remove.svg \ - data/icons/scalable/actions/settings.svg + data/icons/scalable/actions/settings.svg \ + data/ui/CMakeLists.txt \ + src/CMakeLists.txt RESOURCES += \ qremares.qrc diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..1fc7b1d --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ + +set(qrema_SRCS + main.cpp + qremamain.cpp + qremamain.h + qremamain.ui + qremaprofileparser.cpp + qremaprofileparser.h + ) + +add_executable(qrema ${qrema_SRCS}) +target_link_libraries(qrema Qt5::Widgets) diff --git a/src/qremamain.cpp b/src/qremamain.cpp index f68b7d1..0bfe541 100644 --- a/src/qremamain.cpp +++ b/src/qremamain.cpp @@ -37,7 +37,7 @@ QRemaMain::QRemaMain(QWidget *parent) : // FILES - GKeyFile *keyFile = g_key_file_new(); + //GKeyFile *keyFile = g_key_file_new(); fileModel = new QFileSystemModel(this); diff --git a/src/qremamain.h b/src/qremamain.h index 2378546..ffdb730 100644 --- a/src/qremamain.h +++ b/src/qremamain.h @@ -7,8 +7,8 @@ #include <QDesktopServices> #include <QUrl> #include <QSortFilterProxyModel> -#include <glib.h> -#include <glib/gprintf.h> +//#include <glib.h> +//#include <glib/gprintf.h> diff --git a/data/ui/qremamain.ui b/src/qremamain.ui index a724c56..a724c56 100644 --- a/data/ui/qremamain.ui +++ b/src/qremamain.ui |