From 54dec268dbd0cbe70e278223ee63d66cde4e2a43 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 25 Jan 2016 18:59:44 +0100 Subject: [PATCH] show UI files in Qt Creator --- CMakeLists.txt | 7 ++++++- qtutilities.pro | 15 ++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4910908..ff052cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,11 @@ set(SRC_FILES widgets/iconbutton.cpp resources/qtutilsicons.qrc ) +set(WIDGETS_UI_FILES + aboutdialog/aboutdialog.ui + enterpassworddialog/enterpassworddialog.ui + settingsdialog/settingsdialog.ui +) # meta data set(META_PROJECT_NAME qtutilities) @@ -112,7 +117,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) # executable and linking -add_library(${META_PROJECT_NAME} SHARED ${HEADER_FILES} ${SRC_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH}) +add_library(${META_PROJECT_NAME} SHARED ${HEADER_FILES} ${SRC_FILES} ${WIDGETS_UI_FILES} ${RES_FILES} ${WINDOWS_ICON_PATH}) if(${CMAKE_SYSTEM_NAME} MATCHES Linux) set(EXTRA_LIBS X11) endif() diff --git a/qtutilities.pro b/qtutilities.pro index ce9e9ec..d45c190 100644 --- a/qtutilities.pro +++ b/qtutilities.pro @@ -25,7 +25,8 @@ CONFIG(noplatformspecificcapslockdetection, noplatformspecificcapslockdetection| } # add project files -HEADERS += resources/resources.h \ +HEADERS += \ + resources/resources.h \ models/checklistmodel.h \ resources/qtconfigarguments.h \ misc/dialogutils.h @@ -36,7 +37,8 @@ SOURCES += resources/resources.cpp \ misc/dialogutils.cpp contains(DEFINES, GUI_QTWIDGETS) { - HEADERS += aboutdialog/aboutdialog.h \ + HEADERS += \ + aboutdialog/aboutdialog.h \ enterpassworddialog/enterpassworddialog.h \ settingsdialog/optioncategorymodel.h \ settingsdialog/settingsdialog.h \ @@ -50,7 +52,8 @@ contains(DEFINES, GUI_QTWIDGETS) { widgets/clearspinbox.h \ widgets/clearplaintextedit.h - SOURCES += aboutdialog/aboutdialog.cpp \ + SOURCES += \ + aboutdialog/aboutdialog.cpp \ enterpassworddialog/enterpassworddialog.cpp \ settingsdialog/optioncategorymodel.cpp \ settingsdialog/settingsdialog.cpp \ @@ -64,12 +67,14 @@ contains(DEFINES, GUI_QTWIDGETS) { widgets/clearspinbox.cpp \ widgets/clearplaintextedit.cpp - FORMS += aboutdialog/aboutdialog.ui \ + FORMS += \ + aboutdialog/aboutdialog.ui \ enterpassworddialog/enterpassworddialog.ui \ settingsdialog/settingsdialog.ui } -RESOURCES += resources/qtutilsicons.qrc +RESOURCES += \ + resources/qtutilsicons.qrc OTHER_FILES += \ README.md \