Hello community, here is the log from the commit of package kwidgetsaddons for openSUSE:Factory checked in at 2018-04-19 15:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwidgetsaddons (Old) and /work/SRC/openSUSE:Factory/.kwidgetsaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwidgetsaddons" Thu Apr 19 15:19:03 2018 rev:52 rq:596905 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwidgetsaddons/kwidgetsaddons.changes 2018-03-20 21:48:14.883849751 +0100 +++ /work/SRC/openSUSE:Factory/.kwidgetsaddons.new/kwidgetsaddons.changes 2018-04-19 15:19:05.296327139 +0200 @@ -1,0 +2,17 @@ +Sat Apr 14 13:19:06 CEST 2018 - [email protected] + +- Update to 5.45.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.45.0.php +- Changes since 5.44.0: + * Fix compile with older Qt + * KColorButtonTest: remove todo code + * ktooltipwidget: Subtract margins from available size + * [KAcceleratorManager] Only set iconText() if actually changed (kde#391002) + * ktooltipwidget: Prevent offscreen display + * KCapacityBar: set QStyle::State_Horizontal state + * Sync with KColorScheme changes + * ktooltipwidget: Fix tooltip positioning + +------------------------------------------------------------------- Old: ---- kwidgetsaddons-5.44.0.tar.xz New: ---- kwidgetsaddons-5.45.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwidgetsaddons.spec ++++++ --- /var/tmp/diff_new_pack.ZzPJbp/_old 2018-04-19 15:19:06.464280388 +0200 +++ /var/tmp/diff_new_pack.ZzPJbp/_new 2018-04-19 15:19:06.468280227 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5WidgetsAddons5 -%define _tar_path 5.44 +%define _tar_path 5.45 Name: kwidgetsaddons -Version: 5.44.0 +Version: 5.45.0 Release: 0 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %define _kf5_version %{version}} ++++++ kwidgetsaddons-5.44.0.tar.xz -> kwidgetsaddons-5.45.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/CMakeLists.txt new/kwidgetsaddons-5.45.0/CMakeLists.txt --- old/kwidgetsaddons-5.44.0/CMakeLists.txt 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/CMakeLists.txt 2018-04-07 21:39:54.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.44.0") # handled by release scripts +set(KF5_VERSION "5.45.0") # handled by release scripts project(KWidgetsAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.44.0 NO_MODULE) +find_package(ECM 5.45.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -14,7 +14,7 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) -set(REQUIRED_QT_VERSION 5.7.0) +set(REQUIRED_QT_VERSION 5.8.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kcolorbuttontest.cpp new/kwidgetsaddons-5.45.0/autotests/kcolorbuttontest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kcolorbuttontest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kcolorbuttontest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,7 +19,7 @@ #include "kcolorbuttontest.h" -#include <QtTest/QtTest> +#include <QtTest> #include <kcolorbutton.h> #include <QColorDialog> #include <QComboBox> @@ -27,23 +27,7 @@ QTEST_MAIN(KColorButtonTest) -static void workaround() -{ - // Workaround for Qt-5.1 bug, which assumes GTK if there's no running desktop. - // (and apparently QTest::qWaitForWindowExposed doesn't work for GTK native dialogs) - qputenv("XDG_CURRENT_DESKTOP", "KDE"); - - // TODO: it means this test will always fail with native dialogs, though. - // But we can't set QColorDialog::DontUseNativeDialog from here... -} -Q_CONSTRUCTOR_FUNCTION(workaround) - -void KColorButtonTest::initTestCase() -{ - black40Colors.setHsv(-1, 0, 0); -} - -void KColorButtonTest::testChangeAndCancel() +void KColorButtonTest::testOpenDialog() { KColorButton colorButton(Qt::red); colorButton.show(); @@ -52,92 +36,5 @@ QColorDialog *dialog = colorButton.findChild<QColorDialog *>(); QVERIFY(dialog != nullptr); QVERIFY(QTest::qWaitForWindowExposed(dialog)); -#pragma message("port to QColorDialog") -#if 0 - KColorCells *cells = dialog->findChild<KColorCells *>(); - QVERIFY(cells != NULL); - QTest::mouseClick(cells->viewport(), Qt::LeftButton, 0, QPoint(1, 1)); - QCOMPARE(dialog->color(), black40Colors); - dialog->reject(); - QCOMPARE(colorButton.color(), QColor(Qt::red)); -#endif -} - -void KColorButtonTest::testDoubleClickChange() -{ - KColorButton colorButton(Qt::red); - colorButton.show(); - QVERIFY(QTest::qWaitForWindowExposed(&colorButton)); - QTest::mouseClick(&colorButton, Qt::LeftButton); - QColorDialog *dialog = colorButton.findChild<QColorDialog *>(); - if (!dialog) { - qWarning() << "No QColorDialog was found! topLevelWidgets=" << QApplication::topLevelWidgets() << "children of colorbutton=" << colorButton.children(); - } - QVERIFY(dialog != nullptr); - QVERIFY(QTest::qWaitForWindowExposed(dialog)); -#pragma message("port to QColorDialog") -#if 0 - KColorCells *cells = dialog->findChild<KColorCells *>(); - QVERIFY(cells != NULL); - QTest::mouseDClick(cells->viewport(), Qt::LeftButton, 0, QPoint(1, 1)); - QCOMPARE(colorButton.color(), black40Colors); -#endif -} - -void KColorButtonTest::testOkChange() -{ - KColorButton colorButton(Qt::red); - colorButton.show(); - QVERIFY(QTest::qWaitForWindowExposed(&colorButton)); - QTest::mouseClick(&colorButton, Qt::LeftButton); - QColorDialog *dialog = colorButton.findChild<QColorDialog *>(); - QVERIFY(dialog != nullptr); - QVERIFY(QTest::qWaitForWindowExposed(dialog)); -#pragma message("port to QColorDialog") -#if 0 - KColorCells *cells = dialog->findChild<KColorCells *>(); - QVERIFY(cells != NULL); - QTest::mouseClick(cells->viewport(), Qt::LeftButton, 0, QPoint(1, 1)); - QCOMPARE(dialog->color(), black40Colors); - - QSignalSpy okClickedSpy(dialog, SIGNAL(okClicked())); - const QDialogButtonBox *buttonBox = dialog->findChild<QDialogButtonBox *>(); - const QList<QAbstractButton *> buttons = buttonBox->buttons(); - foreach (QAbstractButton *button, buttons) { - if (buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) { - QTest::mouseClick(button, Qt::LeftButton); - break; - } - } - QCOMPARE(okClickedSpy.count(), 1); - - QCOMPARE(colorButton.color(), black40Colors); -#endif -} - -void KColorButtonTest::testRecentColorsPick() -{ - KColorButton colorButton(Qt::red); - colorButton.show(); - QVERIFY(QTest::qWaitForWindowExposed(&colorButton)); - QTest::mouseClick(&colorButton, Qt::LeftButton); - QColorDialog *dialog = colorButton.findChild<QColorDialog *>(); - QVERIFY(dialog != nullptr); - QVERIFY(QTest::qWaitForWindowExposed(dialog)); - -#pragma message("port to QColorDialog") -#if 0 - QComboBox *combo = dialog->findChild<QComboBox *>(); - combo->setFocus(); - QTest::keyPress(combo, Qt::Key_Up); - QTest::keyPress(combo, Qt::Key_Up); - - KColorCells *cells = dialog->findChild<KColorCells *>(); - QVERIFY(cells != NULL); - QTest::mouseMove(cells->viewport(), QPoint(1, 1)); - QTest::mouseClick(cells->viewport(), Qt::LeftButton, 0, QPoint(30, 1)); - const QColor color = dialog->color(); - dialog->accept(); - QCOMPARE(colorButton.color(), color); -#endif + QCOMPARE(dialog->currentColor(), QColor(Qt::red)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kcolorbuttontest.h new/kwidgetsaddons-5.45.0/autotests/kcolorbuttontest.h --- old/kwidgetsaddons-5.44.0/autotests/kcolorbuttontest.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kcolorbuttontest.h 2018-04-07 21:39:54.000000000 +0200 @@ -28,14 +28,7 @@ Q_OBJECT private Q_SLOTS: - void initTestCase(); - void testChangeAndCancel(); - void testDoubleClickChange(); - void testOkChange(); - void testRecentColorsPick(); - -private: - QColor black40Colors; + void testOpenDialog(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kdatecomboboxtest.cpp new/kwidgetsaddons-5.45.0/autotests/kdatecomboboxtest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kdatecomboboxtest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kdatecomboboxtest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,9 +19,9 @@ #include "kdatecomboboxtest.h" -#include <QtCore/QDate> +#include <QDate> -#include <QtTest/QtTest> +#include <QtTest> #include <QLineEdit> #include "kdatecombobox.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kdatetimeedittest.cpp new/kwidgetsaddons-5.45.0/autotests/kdatetimeedittest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kdatetimeedittest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kdatetimeedittest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,12 +19,12 @@ #include "kdatetimeedittest.h" -#include <QtCore/QDate> +#include <QDate> #include <QAction> #include <QComboBox> #include <QMenu> -#include <QtTest/QtTest> +#include <QtTest> #include "kdatetimeedit.h" #include "kdatecombobox.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kdualactiontest.cpp new/kwidgetsaddons-5.45.0/autotests/kdualactiontest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kdualactiontest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kdualactiontest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,7 +19,7 @@ */ #include <kdualaction.h> -#include <QtTest/QtTest> +#include <QtTest> #include "kguiitem.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kmessagewidgetautotest.cpp new/kwidgetsaddons-5.45.0/autotests/kmessagewidgetautotest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kmessagewidgetautotest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kmessagewidgetautotest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -20,7 +20,7 @@ #include "kmessagewidgetautotest.h" -#include <QtTest/QtTest> +#include <QtTest> #include <kmessagewidget.h> QTEST_MAIN(KMessageWidgetTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kpagedialogautotest.cpp new/kwidgetsaddons-5.45.0/autotests/kpagedialogautotest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kpagedialogautotest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kpagedialogautotest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -22,7 +22,7 @@ #include <QDialogButtonBox> #include <QPushButton> -#include <QtTest/QtTest> +#include <QtTest> QTEST_MAIN(KPageDialogAutoTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kpixmapsequencewidgettest.cpp new/kwidgetsaddons-5.45.0/autotests/kpixmapsequencewidgettest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kpixmapsequencewidgettest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kpixmapsequencewidgettest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,7 +19,7 @@ */ #include <KPixmapSequenceWidget> -#include <QtTest/QTest> +#include <QTest> #include "kguiitem.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kselectaction_unittest.cpp new/kwidgetsaddons-5.45.0/autotests/kselectaction_unittest.cpp --- old/kwidgetsaddons-5.44.0/autotests/kselectaction_unittest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kselectaction_unittest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -20,7 +20,7 @@ #include "kselectaction_unittest.h" #include <QComboBox> #include <QStandardItemModel> -#include <QtTest/QtTest> +#include <QtTest> #include <kselectaction.h> #include <qtoolbar.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/kselectaction_unittest.h new/kwidgetsaddons-5.45.0/autotests/kselectaction_unittest.h --- old/kwidgetsaddons-5.44.0/autotests/kselectaction_unittest.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/kselectaction_unittest.h 2018-04-07 21:39:54.000000000 +0200 @@ -20,7 +20,7 @@ #ifndef KSELECTACTION_UNITTEST_H #define KSELECTACTION_UNITTEST_H -#include <QtCore/QObject> +#include <QObject> class KSelectAction_UnitTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/ktimecomboboxtest.cpp new/kwidgetsaddons-5.45.0/autotests/ktimecomboboxtest.cpp --- old/kwidgetsaddons-5.44.0/autotests/ktimecomboboxtest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/ktimecomboboxtest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,9 +19,9 @@ #include "ktimecomboboxtest.h" -#include <QtCore/QTime> +#include <QTime> -#include <QtTest/QtTest> +#include <QtTest> #include <QLineEdit> #include <ktimecombobox.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/ktooltipwidgettest.cpp new/kwidgetsaddons-5.45.0/autotests/ktooltipwidgettest.cpp --- old/kwidgetsaddons-5.44.0/autotests/ktooltipwidgettest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/ktooltipwidgettest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 Elvis Angelaccio <[email protected]> + * Copyright (c) 2018 Michael Heidelbach <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,11 +20,21 @@ #include <KToolTipWidget> +#include <QWindow> +#include <QDesktopWidget> +#include <QScreen> +#include <QLayout> +#include <QStyle> #include <QLabel> #include <QLineEdit> #include <QSignalSpy> #include <QTest> +void KToolTipWidgetTest::initTestCase() +{ + m_screenGeometry = QGuiApplication::primaryScreen()->geometry(); +} + void KToolTipWidgetTest::showTooltipShouldShowContent() { KToolTipWidget tooltip; @@ -106,6 +117,123 @@ QCOMPARE(spy.count(), 1); } +void KToolTipWidgetTest::shouldNotObscureTarget_data() +{ + qDebug() << "Style used" << QApplication::style()->objectName(); + + QTest::addColumn<QPoint>("position"); + QTest::addColumn<QString>("content"); + + const QMap<QString,QPoint> positions{ + {QStringLiteral("topleft"), QPoint(m_offset, m_offset)}, + {QStringLiteral("topright"), QPoint(-m_offset, m_offset)}, + {QStringLiteral("bottomright"), QPoint(-m_offset, -m_offset)}, + {QStringLiteral("bottomleft"), QPoint(m_offset, -m_offset)}, + {QStringLiteral("centered"), + QPoint(m_screenGeometry.width() / 2, m_screenGeometry.height() / 2)} + }; + + QMapIterator<QString, QPoint> i(positions); + while (i.hasNext()) { + i.next(); + QTest::newRow(qPrintable(QStringLiteral("small/%1").arg(i.key())) ) + << i.value() + << QStringLiteral("dummy text"); + + QTest::newRow(qPrintable(QStringLiteral("multiline/%1").arg(i.key()))) + << i.value() + << QStringLiteral("dummy text\nLine 1\nLine 2\nLine 3"); + + QTest::newRow(qPrintable(QStringLiteral("one long line/%1").arg(i.key()))) + << i.value() + << QStringLiteral( + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam nec felis sed elit auctor lobortis non a urna. Quisque non posuere mauris. Suspendisse potenti. In diam leo, lobortis at placerat nec, sagittis at tortor. Pellentesque scelerisque enim vel elementum scelerisque. Integer eget lectus vitae lorem pulvinar hendrerit. Suspendisse auctor sapien vel semper porta. Vestibulum fringilla aliquet tincidunt. Maecenas mollis mauris et erat viverra mollis. Proin suscipit felis nisi, a dapibus est hendrerit euismod. Suspendisse quis faucibus quam. Fusce eu cursus magna, et egestas purus. Duis enim sapien, feugiat id facilisis non, rhoncus ut lectus. Aliquam at nisi vel ligula interdum ultricies. Donec condimentum ante quam, eu congue lectus pulvinar in. Cras interdum, neque quis fermentum consequat, lectus tellus eleifend turpis." + ); + + if (m_screenGeometry.width() >= 1600 && m_screenGeometry.height() >= 900) { + QTest::newRow(qPrintable(QStringLiteral("super large/%1").arg(i.key()))) + << i.value() + << QStringLiteral( + "dummy 0 text\nLine 1\nLine 2\nLine 3" + "dummy 1 text\nLine 1\nLine 2\nLine 3" + "dummy 2 text\nLine 1\nLine 2\nLine 3" + "dummy 3 text\nLine 1\nLine 2\nLine 3" + "dummy 4 text\nLine 1\nLine 2\nLine 3" + + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam nec felis sed elit auctor lobortis non a urna. Quisque non posuere mauris. Suspendisse potenti. In diam leo, lobortis at placerat nec, sagittis at tortor. Pellentesque scelerisque enim vel elementum scelerisque. Integer eget lectus vitae lorem pulvinar hendrerit. Suspendisse auctor sapien vel semper porta. Vestibulum fringilla aliquet tincidunt. Maecenas mollis mauris et erat viverra mollis. Proin suscipit felis nisi, a dapibus est hendrerit euismod. Suspendisse quis faucibus quam. Fusce eu cursus magna, et egestas purus. Duis enim sapien, feugiat id facilisis non, rhoncus ut lectus. Aliquam at nisi vel ligula interdum ultricies. Donec condimentum ante quam, eu congue lectus pulvinar in. Cras interdum, neque quis fermentum consequat, lectus tellus eleifend turpis." + ); + } + } +} + +void KToolTipWidgetTest::shouldNotObscureTarget() +{ + QFETCH(QPoint, position); + QFETCH(QString, content); + + QWidget* containerWidget = new QWidget(); + const int margin = containerWidget->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth); + QLabel* targetWidget = new QLabel(QStringLiteral("dummy file")); + QLayout* layout = new QHBoxLayout(containerWidget); + layout->addWidget(targetWidget); + + containerWidget->adjustSize(); + containerWidget->move( + position.x() >= 0 + ? position.x() + : m_screenGeometry.right() + position.x() - containerWidget->width(), + position.y() >= 0 + ? position.y() + : m_screenGeometry.bottom() + position.y() - containerWidget->height() + ); + containerWidget->show(); + QVERIFY(QTest::qWaitForWindowActive(containerWidget)); + QVERIFY(targetWidget->isVisible()); + + QRect targetRect = QRect(targetWidget->frameGeometry()); + targetRect.moveTo(targetWidget->mapToGlobal(QPoint(0, 0))); + + QLabel* contentWidget = new QLabel(content); + + QVERIFY2(containerWidget->windowHandle(), "Container's window handle is invalid"); + KToolTipWidget tooltipWidget; + tooltipWidget.showBelow(targetRect, contentWidget, containerWidget->windowHandle()); + QVERIFY(QTest::qWaitForWindowActive(&tooltipWidget)); + const QRect tooltipRect = tooltipWidget.frameGeometry(); + + qDebug() << QStringLiteral("tooltip: %1x%2 x=%3, y=%4") + .arg(tooltipRect.width()) + .arg(tooltipRect.height()) + .arg(tooltipRect.left()) + .arg(tooltipRect.top()); + qDebug() << QStringLiteral("target: %1x%2 x=%3, y=%4") + .arg(targetRect.width()) + .arg(targetRect.height()) + .arg(targetRect.left()) + .arg(targetRect.top()); + + QVERIFY2(!tooltipRect.intersects(targetRect), "Target obscured"); + QCOMPARE(tooltipRect.intersected(m_screenGeometry), tooltipRect); + + // Check margins + if (tooltipRect.bottom() < targetRect.top()) { + QCOMPARE(margin, targetRect.top() - tooltipRect.bottom()); + } else if (tooltipRect.top() > targetRect.bottom()) { + QCOMPARE(margin, tooltipRect.top() - targetRect.bottom()); + } else if (tooltipRect.right() < targetRect.left()) { + QCOMPARE(margin, targetRect.left() - tooltipRect.right()); + } else if (tooltipRect.left() > targetRect.right() ) { + QCOMPARE(margin, tooltipRect.left() - targetRect.right()); + } + + tooltipWidget.hide(); + QVERIFY(tooltipWidget.isHidden()); + + delete contentWidget; + delete containerWidget; +} + + QTEST_MAIN(KToolTipWidgetTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/autotests/ktooltipwidgettest.h new/kwidgetsaddons-5.45.0/autotests/ktooltipwidgettest.h --- old/kwidgetsaddons-5.44.0/autotests/ktooltipwidgettest.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/autotests/ktooltipwidgettest.h 2018-04-07 21:39:54.000000000 +0200 @@ -19,6 +19,7 @@ #define KTOOLTIPWIDGETTEST_H #include <QObject> +#include <QRect> class KToolTipWidgetTest : public QObject { @@ -26,11 +27,20 @@ private Q_SLOTS: + void initTestCase(); + void showTooltipShouldShowContent(); void hideLaterShouldHideAfterDelay(); void setZeroDelayShouldHideImmediately(); void shouldHideImmediatelyIfContentDestroyed(); void shouldNotTakeOwnershipOfContent(); + + void shouldNotObscureTarget_data(); + void shouldNotObscureTarget(); + +private: + QRect m_screenGeometry; + const int m_offset = 10; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/po/ca@valencia/kwidgetsaddons5_qt.po new/kwidgetsaddons-5.45.0/po/ca@valencia/kwidgetsaddons5_qt.po --- old/kwidgetsaddons-5.44.0/po/ca@valencia/kwidgetsaddons5_qt.po 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/po/ca@valencia/kwidgetsaddons5_qt.po 2018-04-07 21:39:54.000000000 +0200 @@ -1034,7 +1034,7 @@ #: kcharselect.cpp:405 kcharselect.cpp:407 msgctxt "KCharSelect|" msgid "Enter a search term or character here" -msgstr "Introduïu ací un terme a buscar o un caràcter" +msgstr "Introduïu ací un terme a cercar o un caràcter" #: kcharselect.cpp:412 msgctxt "KCharSelect|" @@ -1601,8 +1601,8 @@ msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font family settings." msgstr "" -"Marqueu esta casella de selecció per canviar l'arranjament de la família del " -"tipus de lletra." +"Marqueu aquesta casella de selecció per canviar l'arranjament de la família " +"del tipus de lletra." #: kfontchooser.cpp:204 msgctxt "KFontChooser|@info:tooltip" @@ -1623,7 +1623,7 @@ msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font style settings." msgstr "" -"Marqueu esta casella de selecció per canviar l'arranjament de l'estil del " +"Marqueu aquesta casella de selecció per canviar l'arranjament de l'estil del " "tipus de lletra." #: kfontchooser.cpp:220 @@ -1645,7 +1645,7 @@ msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font size settings." msgstr "" -"Marqueu esta casella de selecció per canviar l'arranjament de la mida del " +"Marqueu aquesta casella de selecció per canviar l'arranjament de la mida del " "tipus de lletra." #: kfontchooser.cpp:237 @@ -1732,7 +1732,7 @@ "This sample text illustrates the current settings. You may edit it to test " "special characters." msgstr "" -"Este text d'exemple il·lustra l'arranjament actual. Podeu editar-lo per a " +"Aquest text d'exemple il·lustra l'arranjament actual. Podeu editar-lo per a " "provar els caràcters especials." #: kfontchooser.cpp:587 @@ -1840,7 +1840,7 @@ #: kmessagebox.cpp:922 msgctxt "KMessageBox|" msgid "Do not show this message again" -msgstr "No tornes a mostrar este missatge" +msgstr "No tornes a mostrar aquest missatge" #: kmessagewidget.cpp:91 msgctxt "KMessageWidget|" @@ -1875,7 +1875,7 @@ #: kmimetypechooser.cpp:118 msgctxt "KMimeTypeChooser|" msgid "Click this button to display the familiar KDE mime type editor." -msgstr "Cliqueu este botó per a mostrar l'editor de tipus MIME del KDE." +msgstr "Cliqueu aquest botó per a mostrar l'editor de tipus MIME del KDE." #: knewpassworddialog.cpp:76 #, qt-format @@ -1922,7 +1922,7 @@ " - l'ús d'una barreja de lletres majúscules i minúscules;\n" " - l'ús de números i símbols, com ara #, junt amb lletres.\n" "\n" -"Voleu usar esta contrasenya igualment?" +"Voleu usar aquesta contrasenya igualment?" #: knewpasswordwidget.cpp:64 msgctxt "KNewPasswordWidget|@info:whatsthis" @@ -1977,7 +1977,7 @@ #: kpassworddialog.ui:70 msgctxt "KPasswordDialog|" msgid "Use this password:" -msgstr "Usa esta contrasenya:" +msgstr "Usa aquesta contrasenya:" #: kpassworddialog.ui:95 msgctxt "KPasswordDialog|" @@ -2080,13 +2080,13 @@ msgid "" "Pressing this button will discard all recent changes made in this dialog." msgstr "" -"En prémer este botó, es descartaran tots els canvis recents realitzats en " -"este diàleg." +"En prémer aquest botó, es descartaran tots els canvis recents realitzats en " +"aquest diàleg." #: kstandardguiitem.cpp:135 msgctxt "KStandardGuiItem|" msgid "&Save" -msgstr "Al&ça" +msgstr "Guar&da" #: kstandardguiitem.cpp:135 msgctxt "KStandardGuiItem|" @@ -2106,7 +2106,7 @@ #: kstandardguiitem.cpp:146 msgctxt "KStandardGuiItem|" msgid "Save &As..." -msgstr "Al&ça com a..." +msgstr "Guar&da com a..." #: kstandardguiitem.cpp:147 msgctxt "KStandardGuiItem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/po/id/kwidgetsaddons5_qt.po new/kwidgetsaddons-5.45.0/po/id/kwidgetsaddons5_qt.po --- old/kwidgetsaddons-5.44.0/po/id/kwidgetsaddons5_qt.po 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/po/id/kwidgetsaddons5_qt.po 2018-04-07 21:39:54.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2018-03-03 08:13+0700\n" +"PO-Revision-Date: 2018-04-03 21:50+0700\n" "Last-Translator: Wantoyo <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" "Language: id\n" @@ -1595,7 +1595,7 @@ #: kfontchooser.cpp:203 msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font family settings." -msgstr "Aktifkan kotak cek ini untuk mengubah setelan keluarga fonta." +msgstr "Aktifkan kotak centang ini untuk mengubah setelan keluarga fonta." #: kfontchooser.cpp:204 msgctxt "KFontChooser|@info:tooltip" @@ -1615,7 +1615,7 @@ #: kfontchooser.cpp:219 msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font style settings." -msgstr "Aktifkan kotak cek ini untuk mengubah setelan gaya fonta." +msgstr "Aktifkan kotak centang ini untuk mengubah setelan gaya fonta." #: kfontchooser.cpp:220 msgctxt "KFontChooser|@info:tooltip" @@ -1635,7 +1635,7 @@ #: kfontchooser.cpp:236 msgctxt "KFontChooser|@info:whatsthis" msgid "Enable this checkbox to change the font size settings." -msgstr "Aktifkan kotak cek untuk mengubah setelan ukuran fonta." +msgstr "Aktifkan kotak centang untuk mengubah setelan ukuran fonta." #: kfontchooser.cpp:237 msgctxt "KFontChooser|@info:tooltip" @@ -1720,7 +1720,7 @@ "This sample text illustrates the current settings. You may edit it to test " "special characters." msgstr "" -"Teks contoh ini mengilustrasikan setelan saat ini. Anda dapat menyuntingnya " +"Teks contoh ini mengilustrasikan setelan saat ini. Anda dapat mengeditnya " "untuk mencoba karakter spesial." #: kfontchooser.cpp:587 @@ -2097,7 +2097,7 @@ #: kstandardguiitem.cpp:147 msgctxt "KStandardGuiItem|" msgid "Save file with another name" -msgstr "Simpan fail dengan nama lain" +msgstr "Simpan file dengan nama lain" #: kstandardguiitem.cpp:152 msgctxt "KStandardGuiItem|" @@ -2154,7 +2154,7 @@ #: kstandardguiitem.cpp:171 msgctxt "KStandardGuiItem|" msgid "Clear the input in the edit field" -msgstr "Bersihkan masukan di ruang sunting" +msgstr "Bersihkan masukan di ruang edit" #: kstandardguiitem.cpp:176 msgctxt "KStandardGuiItem|show help" @@ -2264,7 +2264,7 @@ #: kstandardguiitem.cpp:247 msgctxt "KStandardGuiItem|" msgid "Open file" -msgstr "Buka fail" +msgstr "Buka file" #: kstandardguiitem.cpp:252 msgctxt "KStandardGuiItem|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/po/nn/kwidgetsaddons5_qt.po new/kwidgetsaddons-5.45.0/po/nn/kwidgetsaddons5_qt.po --- old/kwidgetsaddons-5.44.0/po/nn/kwidgetsaddons5_qt.po 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/po/nn/kwidgetsaddons5_qt.po 2018-04-07 21:39:54.000000000 +0200 @@ -2,14 +2,14 @@ # # Gaute Hvoslef Kvalnes <[email protected]>, 2003, 2004, 2005, 2006. # Håvard Korsvoll <[email protected]>, 2003, 2005. -# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Karl Ove Hufthammer <[email protected]>, 2004, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. # Eirik U. Birkeland <[email protected]>, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-02-28 03:44+0000\n" -"PO-Revision-Date: 2017-02-22 19:19+0100\n" +"PO-Revision-Date: 2018-03-12 19:13+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" "Language: nn\n" @@ -251,7 +251,7 @@ #: kcharselect-translation.cpp:57 msgctxt "KCharSelectData|KCharselect unicode block name" msgid "Syriac Supplement" -msgstr "" +msgstr "Gammalsyrisk tillegg" #: kcharselect-translation.cpp:58 msgctxt "KCharSelectData|KCharselect unicode block name" @@ -1951,7 +1951,7 @@ #: kpassworddialog.cpp:104 msgctxt "KPasswordDialog|" msgid "Supply a password below." -msgstr "" +msgstr "Skriv inn passord nedanfor." #: kpassworddialog.ui:26 msgctxt "KPasswordDialog|" @@ -1961,7 +1961,7 @@ #: kpassworddialog.ui:63 msgctxt "KPasswordDialog|" msgid "No password, use anonymous (or &guest) login" -msgstr "" +msgstr "Inkje passord – bruk anonym/&gjesteinnlogging" #: kpassworddialog.ui:70 msgctxt "KPasswordDialog|" @@ -1991,7 +1991,7 @@ #: kpasswordlineedit.cpp:56 msgctxt "QObject|" msgid "Change the visibility of the password" -msgstr "" +msgstr "Endra om passordet skal vera synleg" #: kpixmapregionselectordialog.cpp:64 msgctxt "KPixmapRegionSelectorDialog|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/po/zh_CN/kwidgetsaddons5_qt.po new/kwidgetsaddons-5.45.0/po/zh_CN/kwidgetsaddons5_qt.po --- old/kwidgetsaddons-5.44.0/po/zh_CN/kwidgetsaddons5_qt.po 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/po/zh_CN/kwidgetsaddons5_qt.po 2018-04-07 21:39:54.000000000 +0200 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-02-28 02:23-0500\n" +"PO-Revision-Date: 2018-04-05 09:21-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kacceleratormanager.cpp new/kwidgetsaddons-5.45.0/src/kacceleratormanager.cpp --- old/kwidgetsaddons-5.44.0/src/kacceleratormanager.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kacceleratormanager.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -27,8 +27,8 @@ #include <QLabel> #include <QLineEdit> #include <QMenuBar> -#include <QtCore/QMetaClassInfo> -#include <QtCore/QObject> +#include <QMetaClassInfo> +#include <QObject> #include <QList> #include <QPushButton> #include <QRadioButton> @@ -791,8 +791,10 @@ // Check if iconText was generated by Qt. In that case ignore it (no support for CJK accelerators) and set it from the text. if (iconText == copy_of_qt_strippedText(oldText)) { iconText = removeAcceleratorMarker(oldText); + if (iconText != maction->iconText()) { + maction->setIconText(iconText); + } } - maction->setIconText(iconText); if (KAcceleratorManagerPrivate::checkChange(list[cnt])) { maction->setText(list[cnt].accelerated()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kacceleratormanager_p.h new/kwidgetsaddons-5.45.0/src/kacceleratormanager_p.h --- old/kwidgetsaddons-5.44.0/src/kacceleratormanager_p.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kacceleratormanager_p.h 2018-04-07 21:39:54.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef KACCELERATORMANAGER_PRIVATE_H #define KACCELERATORMANAGER_PRIVATE_H -#include <QtCore/QString> -#include <QtCore/QObject> +#include <QString> +#include <QObject> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcapacitybar.cpp new/kwidgetsaddons-5.45.0/src/kcapacitybar.cpp --- old/kwidgetsaddons-5.44.0/src/kcapacitybar.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcapacitybar.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -186,6 +186,7 @@ opt.minimum = 0; opt.maximum = 100; opt.progress = d->value; + opt.state |= QStyle::State_Horizontal; opt.text = d->text; opt.textAlignment = Qt::AlignCenter; opt.textVisible = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcharselect.h new/kwidgetsaddons-5.45.0/src/kcharselect.h --- old/kwidgetsaddons-5.44.0/src/kcharselect.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcharselect.h 2018-04-07 21:39:54.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef kcharselect_h #define kcharselect_h -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QString> +#include <QStringList> #include <QWidget> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcharselectdata_p.h new/kwidgetsaddons-5.45.0/src/kcharselectdata_p.h --- old/kwidgetsaddons-5.44.0/src/kcharselectdata_p.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcharselectdata_p.h 2018-04-07 21:39:54.000000000 +0200 @@ -21,10 +21,10 @@ #ifndef KCHARSELECTDATA_H #define KCHARSELECTDATA_H -#include <QtCore/QChar> -#include <QtCore/QVector> -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QChar> +#include <QVector> +#include <QString> +#include <QStringList> #include <QFuture> #include <QFont> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcolorbutton.cpp new/kwidgetsaddons-5.45.0/src/kcolorbutton.cpp --- old/kwidgetsaddons-5.44.0/src/kcolorbutton.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcolorbutton.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -20,7 +20,7 @@ #include "kcolorbutton.h" -#include <QtCore/QPointer> +#include <QPointer> #include <QPainter> #include <qdrawutil.h> #include <QApplication> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcolorcombo.h new/kwidgetsaddons-5.45.0/src/kcolorcombo.h --- old/kwidgetsaddons-5.44.0/src/kcolorcombo.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcolorcombo.h 2018-04-07 21:39:54.000000000 +0200 @@ -27,7 +27,7 @@ #define KCOLORCOMBO_H #include <QComboBox> -#include <QtCore/QList> +#include <QList> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kcursor_p.h new/kwidgetsaddons-5.45.0/src/kcursor_p.h --- old/kwidgetsaddons-5.44.0/src/kcursor_p.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kcursor_p.h 2018-04-07 21:39:54.000000000 +0200 @@ -21,9 +21,9 @@ #ifndef KCURSOR_P_H #define KCURSOR_P_H -#include <QtCore/QHash> -#include <QtCore/QObject> -#include <QtCore/QTimer> +#include <QHash> +#include <QObject> +#include <QTimer> #include <QCursor> class QWidget; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kdatepicker.h new/kwidgetsaddons-5.45.0/src/kdatepicker.h --- old/kwidgetsaddons-5.44.0/src/kdatepicker.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kdatepicker.h 2018-04-07 21:39:54.000000000 +0200 @@ -24,7 +24,7 @@ #include <kwidgetsaddons_export.h> -#include <QtCore/QDateTime> +#include <QDateTime> #include <QFrame> class QLineEdit; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kdatepicker_p.h new/kwidgetsaddons-5.45.0/src/kdatepicker_p.h --- old/kwidgetsaddons-5.44.0/src/kdatepicker_p.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kdatepicker_p.h 2018-04-07 21:39:54.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef KDATEPICKER_P_H #define KDATEPICKER_P_H -#include <QtCore/QDate> +#include <QDate> #include <QLineEdit> #include <QValidator> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kdatetable_p.h new/kwidgetsaddons-5.45.0/src/kdatetable_p.h --- old/kwidgetsaddons-5.44.0/src/kdatetable_p.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kdatetable_p.h 2018-04-07 21:39:54.000000000 +0200 @@ -23,7 +23,7 @@ #define KDATETABLE_H #include <QLineEdit> -#include <QtCore/QDateTime> +#include <QDateTime> class QMenu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kdatetimeedit.cpp new/kwidgetsaddons-5.45.0/src/kdatetimeedit.cpp --- old/kwidgetsaddons-5.44.0/src/kdatetimeedit.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kdatetimeedit.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,7 +19,7 @@ #include "kdatetimeedit.h" -#include <QtCore/QStringList> +#include <QStringList> #include <QKeyEvent> #include <QMenu> #include <QLineEdit> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/keditlistwidget.cpp new/kwidgetsaddons-5.45.0/src/keditlistwidget.cpp --- old/kwidgetsaddons-5.44.0/src/keditlistwidget.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/keditlistwidget.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -21,7 +21,7 @@ #include "keditlistwidget.h" -#include <QtCore/QStringList> +#include <QStringList> #include <QKeyEvent> #include <QLabel> #include <QLayout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kfontrequester.h new/kwidgetsaddons-5.45.0/src/kfontrequester.h --- old/kwidgetsaddons-5.44.0/src/kfontrequester.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kfontrequester.h 2018-04-07 21:39:54.000000000 +0200 @@ -22,7 +22,7 @@ #include <QWidget> #include <QFont> -#include <QtCore/QString> +#include <QString> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kguiitem.h new/kwidgetsaddons-5.45.0/src/kguiitem.h --- old/kwidgetsaddons-5.44.0/src/kguiitem.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kguiitem.h 2018-04-07 21:39:54.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef kguiitem_h #define kguiitem_h -#include <QtCore/QString> +#include <QString> #include <QIcon> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kmessagebox.cpp new/kwidgetsaddons-5.45.0/src/kmessagebox.cpp --- old/kwidgetsaddons-5.44.0/src/kmessagebox.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kmessagebox.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -21,7 +21,7 @@ #include "kmessagebox.h" #include "kmessagebox_p.h" -#include <QtCore/QPointer> +#include <QPointer> #include <QCheckBox> #include <QDialog> #include <QDialogButtonBox> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kmessagewidget.cpp new/kwidgetsaddons-5.45.0/src/kmessagewidget.cpp --- old/kwidgetsaddons-5.44.0/src/kmessagewidget.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kmessagewidget.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -279,7 +279,7 @@ switch (type) { case Positive: bg1.setRgb(39, 174, 96); // values taken from kcolorscheme.cpp (Positive) - fg.setRgb(239, 240, 241); + fg.setRgb(252, 252, 252); break; case Information: bg1 = palette().highlight().color(); @@ -287,13 +287,13 @@ break; case Warning: bg1.setRgb(246, 116, 0); // values taken from kcolorscheme.cpp (Neutral) - fg.setRgb(239, 240, 241); + fg.setRgb(252, 252, 252); break; case Error: bg1.setRgb(218, 68, 83); // values taken from kcolorscheme.cpp (Negative) // #357210: use darker color to improve the visibility of close button. bg1 = bg1.darker(110); - fg.setRgb(239, 240, 241); + fg.setRgb(252, 252, 252); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kmultitabbar.h new/kwidgetsaddons-5.45.0/src/kmultitabbar.h --- old/kwidgetsaddons-5.44.0/src/kmultitabbar.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kmultitabbar.h 2018-04-07 21:39:54.000000000 +0200 @@ -26,8 +26,8 @@ #define _KMultitabbar_h_ #include <QLayout> -#include <QtCore/QString> -#include <QtCore/QList> +#include <QString> +#include <QList> #include <QPushButton> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kpagemodel.h new/kwidgetsaddons-5.45.0/src/kpagemodel.h --- old/kwidgetsaddons-5.44.0/src/kpagemodel.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kpagemodel.h 2018-04-07 21:39:54.000000000 +0200 @@ -24,7 +24,7 @@ #include <kwidgetsaddons_export.h> -#include <QtCore/QAbstractItemModel> +#include <QAbstractItemModel> class KPageModelPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kpixmapsequence.cpp new/kwidgetsaddons-5.45.0/src/kpixmapsequence.cpp --- old/kwidgetsaddons-5.44.0/src/kpixmapsequence.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kpixmapsequence.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -24,8 +24,8 @@ #include <QPixmap> #include <QPainter> -#include <QtCore/QVector> -#include <QtCore/QtDebug> +#include <QVector> +#include <QtDebug> class Q_DECL_HIDDEN KPixmapSequence::Private : public QSharedData { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kpixmapsequence.h new/kwidgetsaddons-5.45.0/src/kpixmapsequence.h --- old/kwidgetsaddons-5.44.0/src/kpixmapsequence.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kpixmapsequence.h 2018-04-07 21:39:54.000000000 +0200 @@ -21,8 +21,8 @@ #ifndef _K_PIXMAPSEQUENCE_H_ #define _K_PIXMAPSEQUENCE_H_ -#include <QtCore/QSharedDataPointer> -#include <QtCore/QSize> +#include <QSharedDataPointer> +#include <QSize> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kpixmapsequenceoverlaypainter.cpp new/kwidgetsaddons-5.45.0/src/kpixmapsequenceoverlaypainter.cpp --- old/kwidgetsaddons-5.44.0/src/kpixmapsequenceoverlaypainter.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kpixmapsequenceoverlaypainter.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -21,13 +21,13 @@ #include "kpixmapsequence.h" #include <QWidget> -#include <QtCore/QPoint> -#include <QtCore/QRect> +#include <QPoint> +#include <QRect> #include <QPainter> -#include <QtCore/QTimer> -#include <QtCore/QEvent> -#include <QtCore/QPointer> -#include <QtCore/QCoreApplication> +#include <QTimer> +#include <QEvent> +#include <QPointer> +#include <QCoreApplication> class Q_DECL_HIDDEN KPixmapSequenceOverlayPainter::Private { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kpixmapsequenceoverlaypainter.h new/kwidgetsaddons-5.45.0/src/kpixmapsequenceoverlaypainter.h --- old/kwidgetsaddons-5.44.0/src/kpixmapsequenceoverlaypainter.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kpixmapsequenceoverlaypainter.h 2018-04-07 21:39:54.000000000 +0200 @@ -20,8 +20,8 @@ #ifndef _K_PIXMAPSEQUENCE_OVERLAY_PAINTER_H_ #define _K_PIXMAPSEQUENCE_OVERLAY_PAINTER_H_ -#include <QtCore/QObject> -#include <QtCore/QPoint> +#include <QObject> +#include <QPoint> #include <kwidgetsaddons_export.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kratingpainter.cpp new/kwidgetsaddons-5.45.0/src/kratingpainter.cpp --- old/kwidgetsaddons-5.44.0/src/kratingpainter.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kratingpainter.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -24,8 +24,8 @@ #include <QPainter> #include <QPixmap> #include <QIcon> -#include <QtCore/QRect> -#include <QtCore/QPoint> +#include <QRect> +#include <QPoint> class Q_DECL_HIDDEN KRatingPainter::Private { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kratingpainter.h new/kwidgetsaddons-5.45.0/src/kratingpainter.h --- old/kwidgetsaddons-5.44.0/src/kratingpainter.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kratingpainter.h 2018-04-07 21:39:54.000000000 +0200 @@ -23,7 +23,7 @@ #include <kwidgetsaddons_export.h> -#include <QtCore/Qt> +#include <Qt> class QIcon; class QPixmap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kstandardguiitem.h new/kwidgetsaddons-5.45.0/src/kstandardguiitem.h --- old/kwidgetsaddons-5.44.0/src/kstandardguiitem.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kstandardguiitem.h 2018-04-07 21:39:54.000000000 +0200 @@ -21,7 +21,7 @@ #include <kwidgetsaddons_export.h> -#include <QtCore/QPair> +#include <QPair> #include <kguiitem.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/ktimecombobox.cpp new/kwidgetsaddons-5.45.0/src/ktimecombobox.cpp --- old/kwidgetsaddons-5.44.0/src/ktimecombobox.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/ktimecombobox.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -19,7 +19,7 @@ #include "ktimecombobox.h" -#include <QtCore/QTime> +#include <QTime> #include <QKeyEvent> #include <QLineEdit> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/ktitlewidget.cpp new/kwidgetsaddons-5.45.0/src/ktitlewidget.cpp --- old/kwidgetsaddons-5.44.0/src/ktitlewidget.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/ktitlewidget.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -20,7 +20,7 @@ #include "ktitlewidget.h" #include <QApplication> -#include <QtCore/QTimer> +#include <QTimer> #include <QMouseEvent> #include <QFrame> #include <QLabel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/ktogglefullscreenaction.cpp new/kwidgetsaddons-5.45.0/src/ktogglefullscreenaction.cpp --- old/kwidgetsaddons-5.44.0/src/ktogglefullscreenaction.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/ktogglefullscreenaction.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -27,7 +27,7 @@ #include "ktogglefullscreenaction.h" -#include <QtCore/QEvent> +#include <QEvent> class Q_DECL_HIDDEN KToggleFullScreenAction::Private { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/ktoolbarlabelaction.cpp new/kwidgetsaddons-5.45.0/src/ktoolbarlabelaction.cpp --- old/kwidgetsaddons-5.44.0/src/ktoolbarlabelaction.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/ktoolbarlabelaction.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -18,7 +18,7 @@ #include "ktoolbarlabelaction.h" -#include <QtCore/QPointer> +#include <QPointer> #include <QApplication> #include <QLabel> #include <QToolBar> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/ktooltipwidget.cpp new/kwidgetsaddons-5.45.0/src/ktooltipwidget.cpp --- old/kwidgetsaddons-5.44.0/src/ktooltipwidget.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/ktooltipwidget.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -120,7 +120,7 @@ // - the content is fully visible // - the content is not drawn inside rect - const QSize size = content->sizeHint(); + const QSize size = q->sizeHint(); const int margin = q->style()->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth); const QRect screenGeometry = screen->geometry(); @@ -139,17 +139,18 @@ if (x + size.width() >= screenGeometry.right()) { x = screenGeometry.right() - size.width() + 1; } + Q_ASSERT(x >= 0); if (hasRoomBelow) { y = rect.bottom() + margin; } else { - y = rect.top() - size.height() - margin; + y = rect.top() - size.height() - margin + 1; } } else { Q_ASSERT(hasRoomToLeft || hasRoomToRight); if (hasRoomToRight) { x = rect.right() + margin; } else { - x = rect.left() - size.width() - margin; + x = rect.left() - size.width() - margin + 1; } // Put the tooltip at the bottom of the screen. The x-coordinate has already // been adjusted, so that no overlapping with rect occurs. @@ -179,6 +180,10 @@ void KToolTipWidget::showBelow(const QRect &rect, QWidget *content, QWindow *transientParent) { d->addWidget(content); + const QSize marginSize{ + 2 * content->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin), + 2 * content->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin)}; + content->setMaximumSize(transientParent->screen()->geometry().size() - marginSize); d->show(d->centerBelow(rect, transientParent->screen()), transientParent); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kurllabel.cpp new/kwidgetsaddons-5.45.0/src/kurllabel.cpp --- old/kwidgetsaddons-5.44.0/src/kurllabel.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kurllabel.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -17,7 +17,7 @@ #include "kurllabel.h" -#include <QtCore/QTimer> +#include <QTimer> #include <QApplication> #include <QMouseEvent> #include <QPalette> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kviewstatemaintainerbase.cpp new/kwidgetsaddons-5.45.0/src/kviewstatemaintainerbase.cpp --- old/kwidgetsaddons-5.44.0/src/kviewstatemaintainerbase.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kviewstatemaintainerbase.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -21,7 +21,7 @@ #include "kviewstatemaintainerbase.h" -#include <QtCore/QPointer> +#include <QPointer> #include <QItemSelectionModel> #include <QAbstractItemView> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/src/kviewstateserializer.h new/kwidgetsaddons-5.45.0/src/kviewstateserializer.h --- old/kwidgetsaddons-5.44.0/src/kviewstateserializer.h 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/src/kviewstateserializer.h 2018-04-07 21:39:54.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef KVIEWSTATESERIALIZER_H #define KVIEWSTATESERIALIZER_H -#include <QtCore/QObject> -#include <QtCore/QPair> +#include <QObject> +#include <QPair> #include "kwidgetsaddons_export.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwidgetsaddons-5.44.0/tests/kledtest.cpp new/kwidgetsaddons-5.45.0/tests/kledtest.cpp --- old/kwidgetsaddons-5.44.0/tests/kledtest.cpp 2018-03-03 11:07:33.000000000 +0100 +++ new/kwidgetsaddons-5.45.0/tests/kledtest.cpp 2018-04-07 21:39:54.000000000 +0200 @@ -1,7 +1,7 @@ #include <qapplication.h> #include <QWidget> -#include <QtCore/QTimer> +#include <QTimer> #include <stdlib.h> #include "kled.h" #include "kledtest.h"
