Fixed building after recent commits

Closes #1257
remotes/origin/falkon
nowrep 12 years ago
parent 6598885538
commit d3e8cbac97
  1. 4
      src/lib/app/mainapplication.cpp
  2. 2
      src/lib/bookmarks/bookmarksexport/htmlexporter.cpp
  3. 2
      translations/empty.ts

@ -840,8 +840,8 @@ void MainApplication::loadSettings()
#endif
#ifdef USE_WEBGL
m_websettings->setAttribute(QWebSettings::WebGLEnabled, true);
m_websettings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, true);
webSettings->setAttribute(QWebSettings::WebGLEnabled, true);
webSettings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, true);
#endif
#if QTWEBKIT_FROM_2_2

@ -28,7 +28,7 @@ HtmlExporter::HtmlExporter(QObject* parent)
QString HtmlExporter::name() const
{
return BookmarksExporter::tr("HTML File (bookmarks.html)");
return BookmarksExporter::tr("HTML File") + QL1S(" (bookmarks.html)");
}
QString HtmlExporter::getPath(QWidget* parent)

@ -690,7 +690,7 @@ Please install latest version of QupZilla.</source>
<name>BookmarksExporter</name>
<message>
<location filename="../src/lib/bookmarks/bookmarksexport/htmlexporter.cpp" line="31"/>
<source>HTML File (bookmarks.html)</source>
<source>HTML File</source>
<translation type="unfinished"></translation>
</message>
<message>

Loading…
Cancel
Save