Merge branch 'master' of https://github.com/fourtf/chatterino2

2018-01-28 03:39:47 +01:00
parent 591ab4d8da e518cff06e
commit 431b9a8c1f
76 changed files with 1645 additions and 561 deletions
@@ -163,7 +163,13 @@ SOURCES += \
    src/widgets/basewindow.cpp \
    src/singletons/helper/moderationaction.cpp \
    src/widgets/streamview.cpp \
-    src/util/networkrequest.cpp
+    src/util/networkrequest.cpp \
+    src/widgets/settingspages/ignoreuserspage.cpp \
+    src/widgets/settingspages/ignoremessagespage.cpp \
+    src/widgets/settingspages/specialchannelspage.cpp \
+    src/widgets/settingspages/keyboardsettingspage.cpp \
+    src/widgets/helper/titlebarbutton.cpp \
+    src/widgets/helper/label.cpp

 HEADERS  += \
    src/precompiled_header.hpp \
@@ -267,7 +273,14 @@ HEADERS  += \
    src/util/networkrequest.hpp \
    src/util/networkworker.hpp \
    src/util/networkrequester.hpp \
-    src/util/flagsenum.h
+    src/util/flagsenum.h \
+    src/widgets/settingspages/ignoreuserspage.hpp \
+    src/widgets/settingspages/ignoremessagespage.hpp \
+    src/widgets/settingspages/specialchannelspage.hpp \
+    src/widgets/settingspages/keyboardsettings.hpp \
+    src/widgets/settingspages/keyboardsettingspage.hpp \
+    src/widgets/helper/titlebarbutton.hpp \
+    src/widgets/helper/label.hpp

 RESOURCES += \
    resources/resources.qrc