summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2021-08-16 17:16:17 -0400
committerJoseph Donofry <joedonofry@gmail.com>2021-08-16 17:16:17 -0400
commit093f9f9e338f7898a2e3e3ed5673952639015cab (patch)
tree4117da7ddaf1bb2c2e3dbd8b51277343142f799c /src/ChatPage.cpp
parentMerge origin/master and fix conflicts (diff)
parentUpdate qt5 path in macos deploy.sh script (diff)
downloadnheko-093f9f9e338f7898a2e3e3ed5673952639015cab.tar.xz
Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 42e3bc7b..8a0e891b 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -4,11 +4,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include <QApplication> -#include <QImageReader> #include <QInputDialog> #include <QMessageBox> #include <QSettings> -#include <QShortcut> #include <mtx/responses.hpp>