Attachment #406062 for bug #542136

View | Details | Raw Unified | Return to bug 542136
Collapse All | Expand All




message (${ADDITIONAL_LIBKADU_LIBRARIES})
target_link_libraries (libkadu LINK_PRIVATE ${ADDITIONAL_LIBKADU_LIBRARIES})

find_package (Qca-qt5 REQUIRED)

add_executable (kadu WIN32 ${main_SRCS})
kadu_set_flags (kadu)
qt5_use_modules (kadu LINK_PRIVATE Core Gui Widgets Network Xml)
target_link_libraries (kadu LINK_PRIVATE libkadu ${ADDITIONAL_LIBRARIES} qca-qt5)

if (NOT IS_ABSOLUTE "${KADU_INSTALL_LIB_DIR}")
	set (install_full_lib_dir "${CMAKE_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}")

Lines 33-39 Link Here

(-)a/kadu-core/main.cpp (-1 / +1 lines)
33		33
34	#include <QtCore/QLibraryInfo>	34	#include <QtCore/QLibraryInfo>
35	#include <QtCore/QTranslator>	35	#include <QtCore/QTranslator>
36	#include <QtCrypto/QtCrypto>	36	#include <QtCrypto>
37	#include <QtWidgets/QApplication>	37	#include <QtWidgets/QApplication>
38	#include <QtWidgets/QMessageBox>	38	#include <QtWidgets/QMessageBox>
39		39




#include <QtCore/QEvent>
#include <QtGui/QMouseEvent>
#include <QtGui/QMovie>
#include <QtGui/QIcon>

#include "plugins/docking/docking.h"


{
	kdebugf();

	QIcon icon = QIcon::fromTheme(DockingManager::instance()->defaultIcon().fullPath());
	setIcon(icon);

	connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));


		Movie->deleteLater();
		Movie = 0;
	}
	setIcon(QIcon::fromTheme(icon.fullPath()));
}

void Qt4TrayIcon::changeTrayMovie(const QString &moviePath)

Return to bug 542136

Lines 212-223 endif () Link Here

(-)a/kadu-core/CMakeLists.txt (-2 / +2 lines)
212	message (${ADDITIONAL_LIBKADU_LIBRARIES})	212	message (${ADDITIONAL_LIBKADU_LIBRARIES})
213	target_link_libraries (libkadu LINK_PRIVATE ${ADDITIONAL_LIBKADU_LIBRARIES})	213	target_link_libraries (libkadu LINK_PRIVATE ${ADDITIONAL_LIBKADU_LIBRARIES})
214		214
215	find_package (QCA2 REQUIRED)	215	find_package (Qca-qt5 REQUIRED)
216		216
217	add_executable (kadu WIN32 ${main_SRCS})	217	add_executable (kadu WIN32 ${main_SRCS})
218	kadu_set_flags (kadu)	218	kadu_set_flags (kadu)
219	qt5_use_modules (kadu LINK_PRIVATE Core Gui Widgets Network Xml)	219	qt5_use_modules (kadu LINK_PRIVATE Core Gui Widgets Network Xml)
220	target_link_libraries (kadu LINK_PRIVATE libkadu ${ADDITIONAL_LIBRARIES} ${QCA2_LIBRARIES})	220	target_link_libraries (kadu LINK_PRIVATE libkadu ${ADDITIONAL_LIBRARIES} qca-qt5)
221		221
222	if (NOT IS_ABSOLUTE "${KADU_INSTALL_LIB_DIR}")	222	if (NOT IS_ABSOLUTE "${KADU_INSTALL_LIB_DIR}")
223	set (install_full_lib_dir "${CMAKE_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}")	223	set (install_full_lib_dir "${CMAKE_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}")

Lines 26-31 Link Here

(-)a/plugins/qt4_docking/qt4_docking.cpp (-2 / +4 lines)
26	#include <QtCore/QEvent>	26	#include <QtCore/QEvent>
27	#include <QtGui/QMouseEvent>	27	#include <QtGui/QMouseEvent>
28	#include <QtGui/QMovie>	28	#include <QtGui/QMovie>
		29	#include <QtGui/QIcon>
29		30
30	#include "plugins/docking/docking.h"	31	#include "plugins/docking/docking.h"
31		32
Lines 68-74 Qt4TrayIcon::Qt4TrayIcon(QWidget *parent) : Link Here
68	{	69	{
69	kdebugf();	70	kdebugf();
70		71
71	setIcon(DockingManager::instance()->defaultIcon().icon());	72	QIcon icon = QIcon::fromTheme(DockingManager::instance()->defaultIcon().fullPath());
		73	setIcon(icon);
72		74
73	connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));	75	connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));
74		76
Lines 102-108 void Qt4TrayIcon::changeTrayIcon(const KaduIcon &icon) Link Here
102	Movie->deleteLater();	104	Movie->deleteLater();
103	Movie = 0;	105	Movie = 0;
104	}	106	}
105	setIcon(icon.icon());	107	setIcon(QIcon::fromTheme(icon.fullPath()));
106	}	108	}
107		109
108	void Qt4TrayIcon::changeTrayMovie(const QString &moviePath)	110	void Qt4TrayIcon::changeTrayMovie(const QString &moviePath)