Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
System
KCron
Commits
0f82a544
Commit
0f82a544
authored
Jan 14, 2021
by
Laurent Montel
😁
Browse files
Use Qt5.12/Kf5.68
parent
bb8aa01a
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
0f82a544
...
...
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.5.0 FATAL_ERROR)
project
(
kcron
)
set
(
QT_MIN_VERSION
"5.12.0"
)
set
(
KF5_MIN_VERSION
"5.
5
8.0"
)
set
(
KF5_MIN_VERSION
"5.
6
8.0"
)
find_package
(
ECM
${
KF5_MIN_VERSION
}
REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
)
...
...
src/taskEditorDialog.cpp
View file @
0f82a544
...
...
@@ -7,7 +7,6 @@
*/
#include "taskEditorDialog.h"
#include "kwidgetsaddons_version.h"
#include <QLayout>
#include <QCheckBox>
...
...
@@ -545,19 +544,11 @@ QGroupBox *TaskEditorDialog::createHoursGroup(QWidget *main)
void
TaskEditorDialog
::
setupTitleWidget
(
const
QString
&
comment
,
KTitleWidget
::
MessageType
messageType
)
{
titleWidget
->
setComment
(
comment
,
messageType
);
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 63, 0)
if
(
messageType
==
KTitleWidget
::
ErrorMessage
)
{
titleWidget
->
setPixmap
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-error"
)),
KTitleWidget
::
ImageRight
);
}
else
{
titleWidget
->
setPixmap
(
QIcon
::
fromTheme
(
QStringLiteral
(
"system-run"
)),
KTitleWidget
::
ImageRight
);
}
#else
if
(
messageType
==
KTitleWidget
::
ErrorMessage
)
{
titleWidget
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-error"
)),
KTitleWidget
::
ImageRight
);
}
else
{
titleWidget
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"system-run"
)),
KTitleWidget
::
ImageRight
);
}
#endif
}
void
TaskEditorDialog
::
slotEnabledChanged
()
...
...
src/variableEditorDialog.cpp
View file @
0f82a544
...
...
@@ -7,7 +7,6 @@
*/
#include "variableEditorDialog.h"
#include "kwidgetsaddons_version.h"
#include <QGridLayout>
#include <QPushButton>
...
...
@@ -146,26 +145,14 @@ void VariableEditorDialog::setupTitleWidget(const QString &comment, KTitleWidget
//krazy:exclude=doublequote_chars
if
(
comment
.
isEmpty
())
{
titleWidget
->
setComment
(
i18n
(
"<i>This variable will be used by scheduled tasks.</i>"
));
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 63, 0)
titleWidget
->
setPixmap
(
QIcon
::
fromTheme
(
QStringLiteral
(
"text-plain"
)),
KTitleWidget
::
ImageRight
);
#else
titleWidget
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"text-plain"
)),
KTitleWidget
::
ImageRight
);
#endif
}
else
{
titleWidget
->
setComment
(
comment
,
messageType
);
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 63, 0)
if
(
messageType
==
KTitleWidget
::
ErrorMessage
)
{
titleWidget
->
setPixmap
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-error"
)),
KTitleWidget
::
ImageRight
);
}
else
{
titleWidget
->
setPixmap
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-information"
)),
KTitleWidget
::
ImageRight
);
}
#else
if
(
messageType
==
KTitleWidget
::
ErrorMessage
)
{
titleWidget
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-error"
)),
KTitleWidget
::
ImageRight
);
}
else
{
titleWidget
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"dialog-information"
)),
KTitleWidget
::
ImageRight
);
}
#endif
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment