diff --git a/YACReader/YACReader.pri b/YACReader/YACReader.pri index 7ac8ad55..2b30df6b 100644 --- a/YACReader/YACReader.pri +++ b/YACReader/YACReader.pri @@ -92,7 +92,7 @@ SOURCES += $$PWD/comic.cpp \ $$PWD/../common/library_item.cpp \ $$PWD/yacreader_local_client.cpp -include($$PWD/../custom_widgets/custom_widgets.pri) +include($$PWD/../custom_widgets/custom_widgets_yacreader.pri) include($$PWD/../compressed_archive/wrapper.pri) RESOURCES += $$PWD/yacreader_images.qrc \ diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 70ff8446..5e82ef6d 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -119,7 +119,7 @@ SOURCES += comic_flow.cpp \ include(./server/server.pri) -include(../custom_widgets/custom_widgets.pri) +include(../custom_widgets/custom_widgets_yacreaderlibrary.pri) include(../compressed_archive/wrapper.pri) RESOURCES += images.qrc files.qrc @@ -127,8 +127,6 @@ win32:RESOURCES += images_win.qrc unix:!macx:RESOURCES += images_win.qrc macx:RESOURCES += images_osx.qrc -#include(../YACReader/YACReader.pri) - RC_FILE = icon.rc macx { diff --git a/custom_widgets/custom_widgets_yacreader.pri b/custom_widgets/custom_widgets_yacreader.pri new file mode 100644 index 00000000..a7493911 --- /dev/null +++ b/custom_widgets/custom_widgets_yacreader.pri @@ -0,0 +1,25 @@ +INCLUDEPATH += $$PWD +DEPENDPATH += $$PWD + +HEADERS += $$PWD/help_about_dialog.h \ + $$PWD/yacreader_field_edit.h \ + $$PWD/yacreader_field_plain_text_edit.h \ + $$PWD/yacreader_flow.h \ + $$PWD/yacreader_flow_config_widget.h \ + $$PWD/yacreader_gl_flow_config_widget.h \ + $$PWD/yacreader_options_dialog.h \ + $$PWD/yacreader_spin_slider_widget.h \ + $$PWD/yacreader_tool_bar_stretch.h \ + $$PWD/yacreader_busy_widget.h + + +SOURCES += $$PWD/help_about_dialog.cpp \ + $$PWD/yacreader_field_edit.cpp \ + $$PWD/yacreader_field_plain_text_edit.cpp \ + $$PWD/yacreader_flow.cpp \ + $$PWD/yacreader_flow_config_widget.cpp \ + $$PWD/yacreader_gl_flow_config_widget.cpp \ + $$PWD/yacreader_options_dialog.cpp \ + $$PWD/yacreader_spin_slider_widget.cpp \ + $$PWD/yacreader_tool_bar_stretch.cpp \ + $$PWD/yacreader_busy_widget.cpp \ No newline at end of file diff --git a/custom_widgets/custom_widgets.pri b/custom_widgets/custom_widgets_yacreaderlibrary.pri similarity index 90% rename from custom_widgets/custom_widgets.pri rename to custom_widgets/custom_widgets_yacreaderlibrary.pri index e768faf7..661463d2 100644 --- a/custom_widgets/custom_widgets.pri +++ b/custom_widgets/custom_widgets_yacreaderlibrary.pri @@ -11,11 +11,9 @@ HEADERS += $$PWD/help_about_dialog.h \ $$PWD/yacreader_search_line_edit.h \ $$PWD/yacreader_spin_slider_widget.h \ $$PWD/yacreader_tool_bar_stretch.h \ - $$PWD/yacreader_dark_menu.h \ $$PWD/yacreader_titled_toolbar.h \ $$PWD/yacreader_deleting_progress.h \ $$PWD/yacreader_table_view.h \ - $$PWD/yacreader_social_dialog.h \ $$PWD/yacreader_sidebar.h \ $$PWD/yacreader_library_list_widget.h \ $$PWD/yacreader_library_item_widget.h \ @@ -33,11 +31,9 @@ SOURCES += $$PWD/help_about_dialog.cpp \ $$PWD/yacreader_search_line_edit.cpp \ $$PWD/yacreader_spin_slider_widget.cpp \ $$PWD/yacreader_tool_bar_stretch.cpp \ - $$PWD/yacreader_dark_menu.cpp \ $$PWD/yacreader_titled_toolbar.cpp \ $$PWD/yacreader_deleting_progress.cpp \ $$PWD/yacreader_table_view.cpp \ - $$PWD/yacreader_social_dialog.cpp \ $$PWD/yacreader_sidebar.cpp \ $$PWD/yacreader_library_list_widget.cpp \ $$PWD/yacreader_library_item_widget.cpp \