[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkwebkitpart=5D_/=3A_Fix_compile_with_=22-DQT=5FUSE?=
From:       Montel Laurent <montel () kde ! org>
Date:       2011-06-09 11:40:51
Message-ID: 20110609114051.7EA24A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit c8d428c7835efde6df2f769f9ee7fad350f61339 by Montel Laurent.
Committed on 09/06/2011 at 13:40.
Pushed by mlaurent into branch 'master'.

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

M  +2    -0    CMakeLists.txt     
M  +1    -1    src/webpage.cpp     

http://commits.kde.org/kwebkitpart/c8d428c7835efde6df2f769f9ee7fad350f61339

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4caea..c3e056f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@ project(kwebkitpart)
 find_package(KDE4 4.5.69 REQUIRED)
 include(KDE4Defaults)
 include(MacroLibrary)
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
 
 add_subdirectory(cmake)
 add_subdirectory(icons)
diff --git a/src/webpage.cpp b/src/webpage.cpp
index d401c01..2c2cb72 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -116,7 +116,7 @@ WebPage::WebPage(KWebKitPart *part, QWidget *parent)
     // TODO: Determine how a per page style sheets settings interacts with a
     // global one. Is it an intersection of the two or a complete override ?
     if (!QWebSettings::globalSettings()->userStyleSheetUrl().isValid())
-        settings()->setUserStyleSheetUrl((QL1S("data:text/css;charset=utf-8;base64,") +
+        settings()->setUserStyleSheetUrl(QString(QL1S("data:text/css;charset=utf-8;base64,") +
                                           WebKitSettings::self()->settingsToCSS().toUtf8().toBase64()));
 
     connect(this, SIGNAL(geometryChangeRequested(const QRect &)),

[prev in list] [next in list] [prev in thread] [next in thread]