From 8f6979e06e7a7d73122c6e2a1c336862cc64eef2 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Thu, 5 Apr 2012 12:43:48 +0200
Subject: [PATCH] Fixing the crash from #367 (hopefully) now.

---
 src/defines.pri             | 3 +--
 src/lib/webview/webpage.cpp | 6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/defines.pri b/src/defines.pri
index e1a13b78c..f96dafe2d 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -16,8 +16,7 @@ win32 {
 }
 
 DEFINES *= QT_NO_URL_CAST_FROM_STRING
-# Apparently, it may cause crashes on some machines
-#DEFINES *= QT_USE_QSTRINGBUILDER
+DEFINES *= QT_USE_QSTRINGBUILDER
 
 ##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template
 !win32: !CONFIG(debug, debug|release): DEFINES *= QT_NO_DEBUG_OUTPUT
diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp
index 3e937fd39..1d46ef469 100644
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@@ -54,7 +54,7 @@
 
 QString WebPage::m_lastUploadLocation = QDir::homePath();
 QString WebPage::m_userAgent;
-QString WebPage::m_fakeUserAgent = "Mozilla/5.0 (" + qz_buildSystem() + ") AppleWebKit/" + QupZilla::WEBKITVERSION + " (KHTML, like Gecko) Chrome/10.0 Safari/" + QupZilla::WEBKITVERSION;
+QString WebPage::m_fakeUserAgent;
 QUrl WebPage::m_lastUnsupportedUrl;
 QList<WebPage*> WebPage::m_livingPages;
 
@@ -434,6 +434,10 @@ QString WebPage::userAgentForUrl(const QUrl &url) const
 {
     // Let Google services play nice with us
     if (url.host().contains("google")) {
+        if (m_fakeUserAgent.isEmpty()) {
+            m_fakeUserAgent = "Mozilla/5.0 (" + qz_buildSystem() + ") AppleWebKit/" + QupZilla::WEBKITVERSION + " (KHTML, like Gecko) Chrome/10.0 Safari/" + QupZilla::WEBKITVERSION;
+        }
+
         return m_fakeUserAgent;
     }