From f17f9f89b42fd5557a8c9ec1726e28ed92916cd3 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Thu, 31 Jan 2013 19:17:38 +0100
Subject: [PATCH] WebGL is now enabled by default on QtWebKit 2.3

Also fixed link in README and translated one string in czech
windows installer.
---
 README.md                                                | 9 ++++++++-
 src/lib/network/schemehandlers/qupzillaschemehandler.cpp | 4 ++--
 windows/languages.nsh                                    | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 990c8736d..7e09ef526 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ QupZilla Web Browser
 Homepage: [http://www.qupzilla.com](http://www.qupzilla.com)  
 Blog: [http://blog.qupzilla.com](http://blog.qupzilla.com)  
 IRC: `#qupzilla` at `irc.freenode.net`  
-Translations: [https://www.transifex.com/projects/p/qupzilla](at Transifex.com)
+Translations: [https://www.transifex.com](https://www.transifex.com/projects/p/qupzilla)
 
 About QupZilla
 ----------------------------------------------------------------------------------------
@@ -56,6 +56,13 @@ On Mac OS X: To deploy QupZilla in bundle, run this command:
 
 You need to specify path to `macdeployqt` only if it is not in PATH.
 
+If you see errors like
+```
+webview/webpage.cpp: error: no ‘void WebPage::appCacheQuotaExceeded(QWebSecurityOrigin*, quint64)’ member function declared in class ‘WebPage’
+webview/webpage.cpp: error: no ‘void WebPage::featurePermissionRequested(QWebFrame*, const QWebPage::Feature&)’ member function declared in class ‘WebPage’
+```
+run `qmake -r DEFINES+=USE_QTWEBKIT_2_2 && make` to fix it.
+
 Current version
 ----------------------------------------------------------------------------------------
 
diff --git a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
index 352e2e29c..2dc5eb017 100644
--- a/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
+++ b/src/lib/network/schemehandlers/qupzillaschemehandler.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
 * QupZilla - WebKit based browser
-* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+* Copyright (C) 2010-2013  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -390,7 +390,7 @@ QString QupZillaSchemeReply::configPage()
 #ifdef QUPZILLA_DEBUG_BUILD
         debugBuild = tr("<b>Enabled</b>");
 #endif
-#ifdef USE_WEBGL
+#if defined (USE_WEBGL) || QTWEBKIT_FROM_2_3
         webGLEnabled = tr("<b>Enabled</b>");
 #endif
 #if defined(Q_OS_WIN) && defined(W7API)
diff --git a/windows/languages.nsh b/windows/languages.nsh
index 526d50ba3..eea9f4cb3 100644
--- a/windows/languages.nsh
+++ b/windows/languages.nsh
@@ -43,7 +43,7 @@ LangString DESC_SecDesktop ${LANG_CZECH} "Přidat zástupce na plochu."
 LangString DESC_SecExtensions ${LANG_CZECH} "Associovat QupZillu s .htm(l) soubory"
 LangString DESC_SecThemes ${LANG_CZECH} "Dodatečná témata pro QupZillu"
 
-LangString PRODUCT_DESC ${LANG_CZECH} "QupZilla is a new, fast and secure open-source WWW browser. QupZilla is licensed under GPL version 3 or (at your option) any later version. It is based on WebKit core and Qt Framework."
+LangString PRODUCT_DESC ${LANG_CZECH} "QupZilla je nový, rychlý a bezpečný open-source WWW prohlížeč. QupZilla je licencována pod GPL verze 3 nebo (podle vaší volby) jakékoliv vyšší verze. Prohlížeč je založen na jádru WebKit a Qt Frameworku."
 LangString TITLE_SecSetASDefault ${LANG_CZECH} "Výchozí prohlížeč"
 LangString TITLE_SecProtocols ${LANG_CZECH} "Asociace protokolů"
 LangString DESC_SecSetASDefault ${LANG_CZECH} "Nastavit QupZillu jako výchozí internetový prohlížeč"