Commit 9a0cfb37 authored by Heiko Becker's avatar Heiko Becker 🏃
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 9f39e0c2 b1079198
......@@ -56,11 +56,6 @@ include(CheckSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckTypeSize)
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000)
endif()
if(WIN32)
set(CMAKE_REQUIRED_LIBRARIES ${KDEWIN32_LIBRARIES})
set(CMAKE_REQUIRED_INCLUDES ${KDEWIN32_INCLUDES})
......
......@@ -64,11 +64,7 @@ GeneralConfigurationWidget::GeneralConfigurationWidget()
startupLogMode->addItem(logMode->icon(), logMode->name(), QVariant(logMode->id()));
}
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(startupLogMode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &GeneralConfigurationWidget::configurationChanged);
#else
connect(startupLogMode, QOverload<int, const QString &>::of(&QComboBox::currentIndexChanged), this, &GeneralConfigurationWidget::configurationChanged);
#endif
connect(maxLines, QOverload<int>::of(&QSpinBox::valueChanged), this, &GeneralConfigurationWidget::configurationChanged);
connect(deleteDuplicatedLines, &QAbstractButton::clicked, this, &GeneralConfigurationWidget::configurationChanged);
......
......@@ -79,11 +79,7 @@ StatusBar::StatusBar(QWidget *parent)
d->messageList = new KComboBox(this);
d->messageList->setInsertPolicy(QComboBox::InsertAtTop);
d->messageList->setMaxVisibleItems(5);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(d->messageList, QOverload<int>::of(&KComboBox::currentIndexChanged), this, &StatusBar::selectLastHistory);
#else
connect(d->messageList, QOverload<int, const QString &>::of(&KComboBox::currentIndexChanged), this, &StatusBar::selectLastHistory);
#endif
/*
//TODO Define a specifical palette (and make it works !)
QPalette palette(d->messageList->palette());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment