Commit c6bccbf6 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix some compile error against qt6

parent db16b7d1
Pipeline #150552 passed with stage
in 1 minute and 56 seconds
......@@ -69,7 +69,7 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
WindowSystem
)
find_package(KUserFeedback 1.0.0)
find_package(KUserFeedback 1.2.0)
set_package_properties(KUserFeedback
PROPERTIES TYPE OPTIONAL
PURPOSE "Used for submission of telemetry data"
......@@ -91,13 +91,13 @@ set_package_properties(KF5Activities PROPERTIES DESCRIPTION "KActivities librari
find_package(Phonon4Qt${QT_MAJOR_VERSION} CONFIG REQUIRED)
find_package(PackageKitQt5)
set_package_properties(PackageKitQt5
find_package(PackageKitQt${QT_MAJOR_VERSION})
set_package_properties(PackageKitQt${QT_MAJOR_VERSION}
PROPERTIES DESCRIPTION "Software Manager integration"
TYPE OPTIONAL
PURPOSE "Used in the service menu installer"
)
if(PackageKitQt5_FOUND)
if(PackageKitQt${QT_MAJOR_VERSION}_FOUND)
set(HAVE_PACKAGEKIT TRUE)
endif()
......
......@@ -307,7 +307,7 @@ target_link_libraries(dolphinstatic
KF5::KCMUtils
KF5::DBusAddons
KF5::Notifications
Phonon::phonon4qt5
Phonon::phonon4qt${QT_MAJOR_VERSION}
)
if (HAVE_KACTIVITIES)
......
......@@ -15,7 +15,7 @@
#include <KDirLister>
#include <KIO/Job>
#include <KIO/kio_version.h>
#include <kio_version.h>
#include <KLocalizedString>
#include <KLazyLocalizedString>
#include <KUrlMimeData>
......
......@@ -1211,7 +1211,11 @@ QString KStandardItemListWidget::elideRightKeepExtension(const QString &text, in
QString ret = m_customizedFontMetrics.elidedText(text.chopped(extensionLength),
Qt::ElideRight,
elidingWidth - extensionWidth);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
ret.append(text.rightRef(extensionLength));
#else
ret.append(QStringView(text).right(extensionLength));
#endif
return ret;
}
}
......
......@@ -11,7 +11,7 @@
#include <QWidget>
#include <KIO/EmptyTrashJob>
#include <KIOWidgets/KDirLister>
#include <KDirLister>
class Trash: public QObject
{
......
Supports Markdown
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