From 94afd29d670beacdb71db576315d1aedfbd9bd83 Mon Sep 17 00:00:00 2001 From: "S. Razi Alavizadeh" Date: Wed, 24 Dec 2014 23:38:38 +0330 Subject: [PATCH] Windows,Qt5: Fixed compile issue. - It fixes: error: C2308: concatenating mismatched strings Concatenating wide - See: http://blog.qt.digia.com/blog/2014/06/13/qt-weekly-13-qstringliteral/ --- src/lib/app/mainapplication.cpp | 3 +-- src/plugins/GreaseMonkey/gm_manager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index dcc100b5f..4fa200b86 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -118,8 +118,7 @@ MainApplication::MainApplication(int &argc, char** argv) // QSQLITE database plugin is required if (!QSqlDatabase::isDriverAvailable(QSL("QSQLITE"))) { - QMessageBox::critical(0, QSL("Error"), QSL("Qt SQLite database plugin is not available. " - "Please install it and restart the application.")); + QMessageBox::critical(0, QSL("Error"), QSL("Qt SQLite database plugin is not available. Please install it and restart the application.")); m_isClosing = true; return; } diff --git a/src/plugins/GreaseMonkey/gm_manager.cpp b/src/plugins/GreaseMonkey/gm_manager.cpp index b23590744..2ef377668 100644 --- a/src/plugins/GreaseMonkey/gm_manager.cpp +++ b/src/plugins/GreaseMonkey/gm_manager.cpp @@ -226,8 +226,8 @@ void GM_Manager::frameLoadStart() frame->evaluateJavaScript(m_bootstrap + script->script()); } else { - const QString jscript = QString(QSL("window.addEventListener(\"DOMContentLoaded\"," - "function(e) { \n%1\n }, true);")).arg(m_bootstrap + script->script()); + const QString jscript = QString(QSL("window.addEventListener(\"DOMContentLoaded\",function(e) { \n%1\n }, true);")) + .arg(m_bootstrap + script->script()); frame->evaluateJavaScript(jscript); } }