summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <elvis.angelaccio@kde.org>2016-11-17 19:19:01 (GMT)
committerElvis Angelaccio <elvis.angelaccio@kde.org>2016-11-17 19:23:29 (GMT)
commitebae4b1ca046fc96f14847f03943bb8b831e08ef (patch)
tree6a41e0d99e2e402bb363a3a077d21b607368c425
parentae6ce265b603ebb889ae5b171787d74aadfab227 (diff)
Remove unnecessary version checkv16.11.80
Previous commit doesn't do what it says, as the check happens at build-time and not at runtime. So word-wrapping would still be disabled if one upgrades to KF 5.29 without rebuilding Ark. We can just unconditionnaly enable word-wrapping, since KF 5.29 will be released almost together with Applications 16.12
-rw-r--r--kerfuffle/compressionoptionswidget.cpp6
-rw-r--r--part/part.cpp6
2 files changed, 2 insertions, 10 deletions
diff --git a/kerfuffle/compressionoptionswidget.cpp b/kerfuffle/compressionoptionswidget.cpp
index 6d6a000..1b4f7a5 100644
--- a/kerfuffle/compressionoptionswidget.cpp
+++ b/kerfuffle/compressionoptionswidget.cpp
@@ -33,7 +33,6 @@
#include <KColorScheme>
#include <KPluginMetaData>
-#include <kwidgetsaddons_version.h>
#include <QMimeDatabase>
@@ -60,10 +59,7 @@ CompressionOptionsWidget::CompressionOptionsWidget(QWidget *parent,
volumeSizeSpinbox->setValue(static_cast<double>(m_opts.volumeSize()) / 1024);
}
- // KWidgetsAddons 5.29 fixes KMessageWidget word-wrapping.
- if (KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 29, 0)) {
- warningMsgWidget->setWordWrap(true);
- }
+ warningMsgWidget->setWordWrap(true);
}
CompressionOptions CompressionOptionsWidget::commpressionOptions() const
diff --git a/part/part.cpp b/part/part.cpp
index d174a15..3906d7d 100644
--- a/part/part.cpp
+++ b/part/part.cpp
@@ -56,7 +56,6 @@
#include <KStandardGuiItem>
#include <KToggleAction>
#include <KLocalizedString>
-#include <kwidgetsaddons_version.h>
#include <KXMLGUIFactory>
#include <QAction>
@@ -124,10 +123,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args)
m_commentBox->setLayout(vbox);
m_messageWidget = new KMessageWidget(parentWidget);
- // KWidgetsAddons 5.29 fixes KMessageWidget word-wrapping.
- if (KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 29, 0)) {
- m_messageWidget->setWordWrap(true);
- }
+ m_messageWidget->setWordWrap(true);
m_messageWidget->hide();
m_commentMsgWidget = new KMessageWidget();