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/
remotes/origin/falkon
S. Razi Alavizadeh 11 years ago
parent 0ccc759e1f
commit 94afd29d67
  1. 3
      src/lib/app/mainapplication.cpp
  2. 4
      src/plugins/GreaseMonkey/gm_manager.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;
}

@ -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);
}
}

Loading…
Cancel
Save