diff options
author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-11-28 12:42:03 +0900 |
---|---|---|
committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2017-11-28 12:42:03 +0900 |
commit | 357625eb55e2f4569bb487ffe14a9236188e25f3 (patch) | |
tree | d39340ab74f25a23a5855f679973628f7457fd87 /libqmatrixclient.pri | |
parent | 94e6636d8225a0561ed7df3fa8081c5b0183610c (diff) | |
parent | 8f762a2458db773f6db24b568b2e944427297c2b (diff) | |
download | libquotient-357625eb55e2f4569bb487ffe14a9236188e25f3.tar.gz libquotient-357625eb55e2f4569bb487ffe14a9236188e25f3.zip |
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'libqmatrixclient.pri')
-rw-r--r-- | libqmatrixclient.pri | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri index 36f6429c..86648860 100644 --- a/libqmatrixclient.pri +++ b/libqmatrixclient.pri @@ -1,5 +1,5 @@ QT += network -CONFIG += c++11 +CONFIG += c++11 warn_on rtti_off INCLUDEPATH += $$PWD @@ -8,14 +8,14 @@ HEADERS += \ $$PWD/connection.h \ $$PWD/room.h \ $$PWD/user.h \ - $$PWD/state.h \ + $$PWD/avatar.h \ + $$PWD/util.h \ $$PWD/events/event.h \ + $$PWD/events/eventcontent.h \ $$PWD/events/roommessageevent.h \ - $$PWD/events/roomnameevent.h \ - $$PWD/events/roomaliasesevent.h \ - $$PWD/events/roomcanonicalaliasevent.h \ + $$PWD/events/simplestateevents.h \ $$PWD/events/roommemberevent.h \ - $$PWD/events/roomtopicevent.h \ + $$PWD/events/roomavatarevent.h \ $$PWD/events/typingevent.h \ $$PWD/events/receiptevent.h \ $$PWD/jobs/basejob.h \ @@ -24,14 +24,11 @@ HEADERS += \ $$PWD/jobs/sendeventjob.h \ $$PWD/jobs/postreceiptjob.h \ $$PWD/jobs/joinroomjob.h \ - $$PWD/jobs/leaveroomjob.h \ $$PWD/jobs/roommessagesjob.h \ $$PWD/jobs/syncjob.h \ $$PWD/jobs/mediathumbnailjob.h \ - $$PWD/jobs/logoutjob.h \ $$PWD/jobs/setroomstatejob.h \ - $$PWD/jobs/generated/inviting.h \ - $$PWD/jobs/generated/kicking.h \ + $$files($$PWD/jobs/generated/*.h, false) \ $$PWD/logging.h \ $$PWD/settings.h @@ -40,13 +37,11 @@ SOURCES += \ $$PWD/connection.cpp \ $$PWD/room.cpp \ $$PWD/user.cpp \ + $$PWD/avatar.cpp \ $$PWD/events/event.cpp \ + $$PWD/events/eventcontent.cpp \ $$PWD/events/roommessageevent.cpp \ - $$PWD/events/roomnameevent.cpp \ - $$PWD/events/roomaliasesevent.cpp \ - $$PWD/events/roomcanonicalaliasevent.cpp \ $$PWD/events/roommemberevent.cpp \ - $$PWD/events/roomtopicevent.cpp \ $$PWD/events/typingevent.cpp \ $$PWD/events/receiptevent.cpp \ $$PWD/jobs/basejob.cpp \ @@ -55,13 +50,10 @@ SOURCES += \ $$PWD/jobs/sendeventjob.cpp \ $$PWD/jobs/postreceiptjob.cpp \ $$PWD/jobs/joinroomjob.cpp \ - $$PWD/jobs/leaveroomjob.cpp \ $$PWD/jobs/roommessagesjob.cpp \ $$PWD/jobs/syncjob.cpp \ $$PWD/jobs/mediathumbnailjob.cpp \ - $$PWD/jobs/logoutjob.cpp \ $$PWD/jobs/setroomstatejob.cpp \ - $$PWD/jobs/generated/inviting.cpp \ - $$PWD/jobs/generated/kicking.cpp \ + $$files($$PWD/jobs/generated/*.cpp, false) \ $$PWD/logging.cpp \ $$PWD/settings.cpp |