summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/mainwindow.cpp6
-rw-r--r--src/newtabpage.cpp2
3 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cf1400..12e9c8cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,8 @@ INCLUDE(MacroOptionalFindPackage)
INCLUDE(FindPackageHandleStandardArgs)
INCLUDE(KDE4Defaults)
INCLUDE(MacroLibrary)
+ADD_DEFINITIONS(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
# ==================================================================================
# Log messages
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e401a93e..a419151c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -490,7 +490,7 @@ void MainWindow::setupActions()
{
a = new KAction(i18n("Switch to Tab %1", i), this);
a->setShortcut(KShortcut(QString("Alt+%1").arg(i)));
- actionCollection()->addAction(QL1S(("switch_tab_" + QString::number(i)).toAscii()), a);
+ actionCollection()->addAction(QL1S(QString("switch_tab_" + QString::number(i)).toAscii()), a);
connect(a, SIGNAL(triggered(bool)), tabSignalMapper, SLOT(map()));
tabSignalMapper->setMapping(a, i);
}
@@ -502,7 +502,7 @@ void MainWindow::setupActions()
{
a = new KAction(i18n("Switch to Favorite Page %1", i), this);
a->setShortcut(KShortcut(QString("Ctrl+%1").arg(i)));
- actionCollection()->addAction(QL1S(("switch_favorite_" + QString::number(i)).toAscii()), a);
+ actionCollection()->addAction(QL1S(QString("switch_favorite_" + QString::number(i)).toAscii()), a);
connect(a, SIGNAL(triggered(bool)), favoritesSignalMapper, SLOT(map()));
favoritesSignalMapper->setMapping(a, i);
}
@@ -997,7 +997,7 @@ void MainWindow::viewPageSource()
out << code;
}
- KRun::runUrl(QL1S("file://") + temp.fileName(), QL1S("text/plain"), this, false);
+ KRun::runUrl(QString(QL1S("file://") + temp.fileName()), QL1S("text/plain"), this, false);
return;
}
diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp
index 940e2c4f..2b7de0bf 100644
--- a/src/newtabpage.cpp
+++ b/src/newtabpage.cpp
@@ -113,7 +113,7 @@ void NewTabPage::generate(const KUrl &url)
if (url.fileName() == QL1S("clear"))
{
rApp->mainWindow()->actionByName("clear_private_data")->trigger();
- generate(QL1S("about:") + url.directory());
+ generate(QString(QL1S("about:") + url.directory()));
return;
}
if (url == KUrl("about:bookmarks/edit"))