From 0cdb833aa64fc69c5af61d606652391e5fd2cf6c Mon Sep 17 00:00:00 2001 From: Nick Tiskov Date: Fri, 28 Dec 2012 15:40:22 +0400 Subject: [PATCH 1/2] Use qico plugin in static build. Required for RSS favicon capabilities. --- src/main.cpp | 4 ++++ winconf.pri | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 5b7100ea5..7bcbdef42 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,6 +34,10 @@ #include #ifndef DISABLE_GUI +#if defined(QBT_STATIC_QT) +#include +Q_IMPORT_PLUGIN(qico) +#endif #include #include #include diff --git a/winconf.pri b/winconf.pri index 68812042e..3d9eadbf9 100644 --- a/winconf.pri +++ b/winconf.pri @@ -45,3 +45,8 @@ else { DEFINES += WITH_GEOIP_EMBEDDED message("On Windows, GeoIP database must be embedded.") + +CONFIG(static) { + DEFINES += QBT_STATIC_QT + QTPLUGIN += qico +} From f55ea07c1dbb18e775ab3459d9efc7f43c33b10e Mon Sep 17 00:00:00 2001 From: Nick Tiskov Date: Sat, 29 Dec 2012 20:06:15 +0400 Subject: [PATCH 2/2] Move QTPLUGIN qmake macro to src.pro. --- src/src.pro | 4 ++++ winconf.pri | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/src.pro b/src/src.pro index ca5d075fc..ae889da72 100644 --- a/src/src.pro +++ b/src/src.pro @@ -28,6 +28,10 @@ nox { DEFINES += DISABLE_GUI } else { QT += xml + CONFIG(static) { + DEFINES += QBT_STATIC_QT + QTPLUGIN += qico + } TARGET = qbittorrent } QT += network diff --git a/winconf.pri b/winconf.pri index 3d9eadbf9..68812042e 100644 --- a/winconf.pri +++ b/winconf.pri @@ -45,8 +45,3 @@ else { DEFINES += WITH_GEOIP_EMBEDDED message("On Windows, GeoIP database must be embedded.") - -CONFIG(static) { - DEFINES += QBT_STATIC_QT - QTPLUGIN += qico -}