diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 8ed310686..304bfd96a 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -4,7 +4,6 @@ set(CMAKE_AUTOUIC True) add_library(qbt_gui_headers INTERFACE) target_include_directories(qbt_gui_headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -add_subdirectory(lineedit) add_subdirectory(properties) add_subdirectory(powermanagement) add_subdirectory(rss) @@ -30,6 +29,7 @@ fspathedit_p.h guiiconprovider.h hidabletabwidget.h ipsubnetwhitelistoptionsdialog.h +lineedit.h loglistwidget.h mainwindow.h optionsdialog.h @@ -80,6 +80,7 @@ fspathedit.cpp fspathedit_p.cpp guiiconprovider.cpp ipsubnetwhitelistoptionsdialog.cpp +lineedit.cpp loglistwidget.cpp mainwindow.cpp optionsdialog.cpp @@ -137,7 +138,7 @@ updownratiodialog.ui target_link_libraries(qbt_gui PRIVATE - qbt_lineedit qbt_powermanagement qbt_rss qbt_properties qbt_searchengine + qbt_powermanagement qbt_rss qbt_properties qbt_searchengine qbt_base ) diff --git a/src/gui/gui.pri b/src/gui/gui.pri index 02a099668..494eb19e3 100644 --- a/src/gui/gui.pri +++ b/src/gui/gui.pri @@ -1,6 +1,5 @@ INCLUDEPATH += $$PWD -include(lineedit/lineedit.pri) include(powermanagement/powermanagement.pri) include(properties/properties.pri) unix:!macx:dbus: include(qtnotify/qtnotify.pri) @@ -24,6 +23,7 @@ HEADERS += \ $$PWD/guiiconprovider.h \ $$PWD/hidabletabwidget.h \ $$PWD/ipsubnetwhitelistoptionsdialog.h \ + $$PWD/lineedit.h \ $$PWD/loglistwidget.h \ $$PWD/mainwindow.h \ $$PWD/optionsdialog.h \ @@ -85,6 +85,7 @@ SOURCES += \ $$PWD/fspathedit_p.cpp \ $$PWD/guiiconprovider.cpp \ $$PWD/ipsubnetwhitelistoptionsdialog.cpp \ + $$PWD/lineedit.cpp \ $$PWD/loglistwidget.cpp \ $$PWD/mainwindow.cpp \ $$PWD/optionsdialog.cpp \ diff --git a/src/gui/lineedit/src/lineedit.cpp b/src/gui/lineedit.cpp similarity index 100% rename from src/gui/lineedit/src/lineedit.cpp rename to src/gui/lineedit.cpp diff --git a/src/gui/lineedit/src/lineedit.h b/src/gui/lineedit.h similarity index 100% rename from src/gui/lineedit/src/lineedit.h rename to src/gui/lineedit.h diff --git a/src/gui/lineedit/CMakeLists.txt b/src/gui/lineedit/CMakeLists.txt deleted file mode 100644 index b0c982e7d..000000000 --- a/src/gui/lineedit/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_library(qbt_lineedit STATIC -src/lineedit.cpp -src/lineedit.h -) - -target_link_libraries(qbt_lineedit - PRIVATE - qbt_gui_headers - PUBLIC - Qt5::Widgets -) - -target_include_directories(qbt_lineedit PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) diff --git a/src/gui/lineedit/lineedit.pri b/src/gui/lineedit/lineedit.pri deleted file mode 100644 index d07a720c6..000000000 --- a/src/gui/lineedit/lineedit.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH += $$PWD/src -HEADERS += $$PWD/src/lineedit.h -SOURCES += $$PWD/src/lineedit.cpp diff --git a/src/gui/properties/CMakeLists.txt b/src/gui/properties/CMakeLists.txt index 0adc4a1fa..b4c87dbfe 100644 --- a/src/gui/properties/CMakeLists.txt +++ b/src/gui/properties/CMakeLists.txt @@ -39,7 +39,7 @@ target_link_libraries(qbt_properties PRIVATE qbt_gui_headers PUBLIC - qbt_base qbt_lineedit Qt5::Widgets + qbt_base Qt5::Widgets ) target_include_directories(qbt_properties diff --git a/src/gui/search/CMakeLists.txt b/src/gui/search/CMakeLists.txt index a80aee3cc..88b218cad 100644 --- a/src/gui/search/CMakeLists.txt +++ b/src/gui/search/CMakeLists.txt @@ -29,5 +29,5 @@ target_link_libraries(qbt_searchengine PUBLIC qbt_base PRIVATE - qbt_lineedit qbt_gui_headers + qbt_gui_headers )