Commit 4603b92a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Drop outdated QT_USE_FAST_OPERATOR_PLUS and use QT_USE_QSTRINGBUILDER

parent 62bd919d
......@@ -50,7 +50,9 @@ if (X11_FOUND)
find_package(Qt5 REQUIRED X11Extras)
endif(X11_FOUND)
add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(
-DQT_USE_QSTRINGBUILDER
)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
include (CheckSymbolExists)
......
......@@ -600,7 +600,7 @@ static void openTabWithTitle(KonqMainWindow &mainWindow, const QString &title, K
// correct since it's a subclass of text/html, khtml can display it
QVERIFY(view->supportsMimeType("application/x-netscape-bookmarks"));
// Tab caption test
view->openUrl(QUrl("data:text/html, <title>" + title.toUtf8() + "</title>"), QStringLiteral("http://loc.bar.url"));
view->openUrl(QUrl(QStringLiteral("data:text/html, <title>") + title + QStringLiteral("</title>")), QStringLiteral("http://loc.bar.url"));
QSignalSpy spyCompleted(view, SIGNAL(viewCompleted(KonqView*)));
QVERIFY(spyCompleted.wait(10000));
QCOMPARE(view->caption(), title);
......
......@@ -4120,7 +4120,7 @@ void KonqMainWindow::connectExtension(KParts::BrowserExtension *ext)
//qCDebug(KONQUEROR_LOG) << it.key();
if (act) {
// Does the extension have a slot with the name of this action ?
if (ext->metaObject()->indexOfSlot(it.key() + "()") != -1) {
if (ext->metaObject()->indexOfSlot(QByteArray(it.key() + "()").constData()) != -1) {
connect(act, SIGNAL(triggered()), ext, it.value() /* SLOT(slot name) */);
act->setEnabled(ext->isActionEnabled(it.key()));
const QString text = ext->actionText(it.key());
......@@ -4149,7 +4149,7 @@ void KonqMainWindow::disconnectExtension(KParts::BrowserExtension *ext)
for (; it != itEnd; ++it) {
QAction *act = actionCollection()->action(it.key().data());
//qCDebug(KONQUEROR_LOG) << it.key();
if (act && ext->metaObject()->indexOfSlot(it.key() + "()") != -1) {
if (act && ext->metaObject()->indexOfSlot(QByteArray(it.key() + "()").constData()) != -1) {
//qCDebug(KONQUEROR_LOG) << act << act->name();
act->disconnect(ext);
}
......
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