summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-17 23:14:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-17 23:14:53 (GMT)
commit3341054219a9d58286b8770d4bb4b40fb33b3c09 (patch)
treea036717d2fc2d1adb24e627a6eadd6007dff6e12
parentfd36b47e8758562fc9ff350f292fc9ae9ed91d4e (diff)
parent7ca733a86aaea39e9fdf56ff38e3b763dece8fa4 (diff)
downloadQt-3341054219a9d58286b8770d4bb4b40fb33b3c09.zip
Qt-3341054219a9d58286b8770d4bb4b40fb33b3c09.tar.gz
Qt-3341054219a9d58286b8770d4bb4b40fb33b3c09.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fixed compile of JavaScriptCore for Symbian^3. Fix compilation: StringImpl has no public, default constructor JavaScriptCore doesn't need QtGui Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri2
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro4
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro3
-rw-r--r--src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h2
-rw-r--r--src/3rdparty/webkit/WebCore/platform/text/StringImpl.h1
5 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
index 902e6f3..32b8f4c 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -19,6 +19,8 @@ symbian: {
# Need to guarantee this comes before system includes of /epoc32/include
MMP_RULES += "USERINCLUDE ../JavaScriptCore/profiler"
LIBS += -lhal
+ # For hal.h
+ INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
}
INCLUDEPATH = \
diff --git a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
index f04d4a5..280742f 100644
--- a/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+++ b/src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -10,6 +10,7 @@ CONFIG += staticlib
TARGET = $$JAVASCRIPTCORE_TARGET
DESTDIR = $$JAVASCRIPTCORE_DESTDIR
QT += core
+QT -= gui
CONFIG += depend_includepath
@@ -221,3 +222,6 @@ SOURCES += \
!contains(DEFINES, USE_SYSTEM_MALLOC) {
SOURCES += wtf/TCSystemAlloc.cpp
}
+
+# JavaScriptCore is not going to build with C++0x any time soon
+*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index bdb3f83..50319bc 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -2946,3 +2946,6 @@ symbian {
}
}
}
+
+# WebKit doesn't compile in C++0x mode
+*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
diff --git a/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h
index ba1c72c..6ba4d7b 100644
--- a/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h
@@ -27,6 +27,8 @@ namespace WebCore {
class AtomicStringImpl : public StringImpl
{
+public:
+ AtomicStringImpl() : StringImpl(0) {}
};
}
diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
index af9d650..81cd149 100644
--- a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h
@@ -64,6 +64,7 @@ class StringImpl : public Noncopyable {
friend struct CStringTranslator;
friend struct HashAndCharactersTranslator;
friend struct UCharBufferTranslator;
+ friend class AtomicStringImpl;
private:
enum BufferOwnership {
BufferInternal,