diff options
| author | Anton <anton@picapica> | 2017-12-01 21:55:53 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2017-12-01 21:55:53 +0400 |
| commit | ac041927bc0c82e33acaa9e15fd46ecca0b77172 (patch) | |
| tree | 742f1bf43917e79dae43c78684a2a3d055214e76 /pica-client/pica-client.pro | |
| parent | 32e742ed040c5a70edb4cbfb947581f1e192d5a6 (diff) | |
| parent | 9c0a5bf2bbd94539427ece7eb1cb8ea82c6c3dec (diff) | |
| download | pica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.tar.gz pica-pica-ac041927bc0c82e33acaa9e15fd46ecca0b77172.zip | |
Merge branch 'direct_c2c_connections'
Diffstat (limited to 'pica-client/pica-client.pro')
| -rw-r--r-- | pica-client/pica-client.pro | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pica-client/pica-client.pro b/pica-client/pica-client.pro index 70c1222..ef9f9fd 100644 --- a/pica-client/pica-client.pro +++ b/pica-client/pica-client.pro @@ -22,7 +22,6 @@ SOURCES += main.cpp\ accountswindow.cpp \ accounts.cpp \ dialogs/addaccountdialog.cpp \ - nodethread.cpp \ askpassword.cpp \ msguirouter.cpp \ picasystray.cpp \ @@ -37,7 +36,9 @@ SOURCES += main.cpp\ dialogs/showpicaiddialog.cpp \ dialogs/filetransferdialog.cpp \ filetransfercontroller.cpp \ - sound.cpp + sound.cpp \ + dialogs/settingsdialog.cpp \ + settings.cpp HEADERS += mainwindow.h \ chatwindow.h \ @@ -51,7 +52,6 @@ HEADERS += mainwindow.h \ accountswindow.h \ accounts.h \ dialogs/addaccountdialog.h \ - nodethread.h \ askpassword.h \ msguirouter.h \ picasystray.h \ @@ -68,7 +68,9 @@ HEADERS += mainwindow.h \ dialogs/showpicaiddialog.h \ dialogs/filetransferdialog.h \ filetransfercontroller.h \ - sound.h + sound.h \ + dialogs/settingsdialog.h \ + settings.h DEFINES = PICA_MULTITHREADED |