Browse Source

Move LineEdit files out of subfolder

adaptive-webui-19844
Chocobo1 6 years ago
parent
commit
032883e278
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 5
      src/gui/CMakeLists.txt
  2. 3
      src/gui/gui.pri
  3. 0
      src/gui/lineedit.cpp
  4. 0
      src/gui/lineedit.h
  5. 13
      src/gui/lineedit/CMakeLists.txt
  6. 3
      src/gui/lineedit/lineedit.pri
  7. 2
      src/gui/properties/CMakeLists.txt
  8. 2
      src/gui/search/CMakeLists.txt

5
src/gui/CMakeLists.txt

@ -4,7 +4,6 @@ set(CMAKE_AUTOUIC True) @@ -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 @@ -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 @@ -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 @@ -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
)

3
src/gui/gui.pri

@ -1,6 +1,5 @@ @@ -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 += \ @@ -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 += \ @@ -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 \

0
src/gui/lineedit/src/lineedit.cpp → src/gui/lineedit.cpp

0
src/gui/lineedit/src/lineedit.h → src/gui/lineedit.h

13
src/gui/lineedit/CMakeLists.txt

@ -1,13 +0,0 @@ @@ -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)

3
src/gui/lineedit/lineedit.pri

@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
INCLUDEPATH += $$PWD/src
HEADERS += $$PWD/src/lineedit.h
SOURCES += $$PWD/src/lineedit.cpp

2
src/gui/properties/CMakeLists.txt

@ -39,7 +39,7 @@ target_link_libraries(qbt_properties @@ -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

2
src/gui/search/CMakeLists.txt

@ -29,5 +29,5 @@ target_link_libraries(qbt_searchengine @@ -29,5 +29,5 @@ target_link_libraries(qbt_searchengine
PUBLIC
qbt_base
PRIVATE
qbt_lineedit qbt_gui_headers
qbt_gui_headers
)

Loading…
Cancel
Save