From b95ecd1109c109efcb6ecb7d75a9f6145b911517 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Tue, 18 Sep 2012 23:32:38 +0000 Subject: [PATCH] Disabled embedded images for the next stable release. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5570 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/chat/ChatWidget.cpp | 4 ++-- retroshare-gui/src/gui/msgs/MessageComposer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index a46b3ab4b..0ee8becc1 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -118,10 +118,10 @@ ChatWidget::ChatWidget(QWidget *parent) : ui->chatTextEdit->installEventFilter(this); -#if QT_VERSION < 0x040700 +//#if QT_VERSION < 0x040700 // embedded images are not supported before QT 4.7.0 ui->attachPictureButton->setVisible(false); -#endif +//#endif resetStatusBar(); } diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp index 56feda96a..5a183fa26 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp +++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp @@ -307,10 +307,10 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags) ui.hashBox->setDropWidget(this); ui.hashBox->setAutoHide(true); -#if QT_VERSION < 0x040700 +//#if QT_VERSION < 0x040700 // embedded images are not supported before QT 4.7.0 ui.imagebtn->setVisible(false); -#endif +//#endif /* Hide platform specific features */ #ifdef Q_WS_WIN