diff options
| author |  Fabio Bas | 2012-12-11 07:04:44 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-12-11 07:04:44 +0000 |
| commit | 28fb1155c8db8d2cc17272ec4358edd37296ee13 (patch) | |
| tree | b7410938d60c88ae73ceb8c8c86e91ef355083a8 | |
| parent | Help against a common confusion about network/nickserv settings (diff) | |
| download | KVIrc-28fb1155c8db8d2cc17272ec4358edd37296ee13.tar.gz KVIrc-28fb1155c8db8d2cc17272ec4358edd37296ee13.tar.bz2 KVIrc-28fb1155c8db8d2cc17272ec4358edd37296ee13.zip | |
Fixed compilation with qt5rc1
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6296 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kernel/KviApplication.cpp | 4 | ||||
| -rw-r--r-- | src/modules/options/OptionsWidget_servers.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp index e00dfc338..5483e40ca 100644 --- a/src/kvirc/kernel/KviApplication.cpp +++ b/src/kvirc/kernel/KviApplication.cpp @@ -109,7 +109,7 @@ #if (QT_VERSION < 0x050000) #include <QCleanlooksStyle> #else - #include <QFusionStyle> + #include <QCommonStyle> #endif #ifdef COMPILE_ON_WINDOWS @@ -237,7 +237,7 @@ KviApplication::KviApplication(int &argc,char ** argv) #if (QT_VERSION < 0x050000) setStyle(new QCleanlooksStyle()); #else - setStyle(new QFusionStyle()); + setStyle(new QCommonStyle()); #endif setPalette(style()->standardPalette()); } diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index f87314b5e..8acd69d11 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -69,7 +69,6 @@ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) || defined(COMPILE_ON_MAC) #include <QStyleFactory> - #include <QWindowsStyle> #endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW IrcNetworkDetailsWidget::IrcNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n) |