From 0ae54df9f529b1f309b695387891d04104fc5c0a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 22 Nov 2014 13:55:55 +0000
Subject: [PATCH] bumped KDE4 and Qt version requirements

---
 CMakeLists.txt                                              | 4 ++--
 kcontrol/fonts/fonts.cpp                                    | 6 +-----
 libs/plasmaclock/calendartable.cpp                          | 2 --
 .../applets/systemtray/protocols/fdo/fdographicswidget.cpp  | 4 ----
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62a8d2fd..6dcc3065 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,9 @@ set(KDE4WORKSPACE_VERSION ${KDE4WORKSPACE_VERSION_MAJOR}.${KDE4WORKSPACE_VERSION
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} )
 
 #search packages used by KDE
-set(QT_MIN_VERSION "4.8.0")
+set(QT_MIN_VERSION "4.8.2")
 
-find_package(KDE4 4.9.95 REQUIRED)
+find_package(KDE4 4.14.3 REQUIRED)
 include(KDE4Defaults)
 
 option(WITH_XINERAMA "Xinerama support for multi-headed X displays" ON)
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index 0f8d1644..88010d57 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -18,15 +18,13 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QSpinBox>
-#include <qplatformdefs.h>
-
-//Added by qt3to4:
 #include <QPixmap>
 #include <QByteArray>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QFormLayout>
+#include <qplatformdefs.h>
 
 #include <KFontDialog>
 #include <KAcceleratorManager>
@@ -212,9 +210,7 @@ void FontUseItem::applyFontDiff( const QFont &fnt, int fontDiffFlags )
     _font.setWeight( fnt.weight() );
     _font.setStyle( fnt.style() );
     _font.setUnderline( fnt.underline() );
-#if QT_VERSION >= 0x040800
     _font.setStyleName( fnt.styleName() );
-#endif
   }
 
   setFont( _font, isFixedOnly() );
diff --git a/libs/plasmaclock/calendartable.cpp b/libs/plasmaclock/calendartable.cpp
index 71399484..22e58daa 100644
--- a/libs/plasmaclock/calendartable.cpp
+++ b/libs/plasmaclock/calendartable.cpp
@@ -1053,11 +1053,9 @@ void CalendarTable::resizeEvent(QGraphicsSceneResizeEvent * event)
 
     d->dateFont = Theme::defaultTheme()->font(Plasma::Theme::DefaultFont);
 
-#if QT_VERSION >= 0x040800
     d->weekDayFont.setHintingPreference(QFont::PreferNoHinting);
     d->dateFontBold.setHintingPreference(QFont::PreferNoHinting);
     d->dateFont.setHintingPreference(QFont::PreferNoHinting);
-#endif
 
     QFontMetrics fm(d->weekDayFont);
 
diff --git a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
index 80fbed37..083984d3 100644
--- a/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
+++ b/plasma/generic/applets/systemtray/protocols/fdo/fdographicswidget.cpp
@@ -151,11 +151,7 @@ void FdoGraphicsWidget::setupXEmbedDelegate()
         return;
     }
 
-#if QT_VERSION < 0x040401
     const Qt::ApplicationAttribute attr = (Qt::ApplicationAttribute)4;
-#else
-    const Qt::ApplicationAttribute attr = Qt::AA_DontCreateNativeWidgetSiblings;
-#endif
     if (!QApplication::testAttribute(attr)) {
         QApplication::setAttribute(attr);
     }