mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
bumped KDE4 and Qt version requirements
This commit is contained in:
parent
42d476973c
commit
0ae54df9f5
4 changed files with 3 additions and 13 deletions
|
@ -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)
|
||||
|
|
|
@ -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() );
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue