Merge commit 'origin/4.5'

Conflicts:
	src/3rdparty/webkit/JavaScriptCore/generated/Grammar.cpp
	src/3rdparty/webkit/JavaScriptCore/generated/Grammar.h
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/3rdparty/webkit/WebCore/generated/CSSGrammar.cpp
	src/3rdparty/webkit/WebCore/generated/CSSGrammar.h
	src/3rdparty/webkit/WebCore/generated/Grammar.cpp
	src/3rdparty/webkit/WebCore/generated/Grammar.h
	src/3rdparty/webkit/WebCore/generated/XPathGrammar.cpp
	src/3rdparty/webkit/WebCore/generated/XPathGrammar.h
	src/3rdparty/webkit/WebKit/qt/ChangeLog
	tools/linguist/lrelease/main.cpp
	tools/linguist/lupdate/main.cpp
	tools/linguist/shared/profileevaluator.cpp

2 files changed, 43 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la b/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la
new file mode 100644
index 0000000..10d3f1e
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la
@@ -0,0 +1,28 @@
+# libJavaScriptCore.la - a libtool library file
+# Generated by qmake/libtool (2.01a) (Qt 4.6.0) on: Mon Jun 15 18:55:09 2009
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names='  '
+
+# The name of the static archive.
+old_library='libJavaScriptCore.a'
+
+# Libraries that this one depends upon.
+dependency_libs='-L/depot/obuddenh/qt/lib  -lQtGui -L/depot/obuddenh/qt/lib -L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -lpthread -ldl '
+
+# Version information for libJavaScriptCore.la
+current=46
+age=0
+revision=0
+
+# Is this an already installed library.
+installed=yes
+
+# Files to dlopen/dlpreopen.
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/depot/obuddenh/qt/lib'
diff --git a/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc b/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc
new file mode 100644
index 0000000..fb90b0c
--- /dev/null
+++ b/src/3rdparty/webkit/JavaScriptCore/pkgconfig/JavaScriptCore.pc
@@ -0,0 +1,15 @@
+prefix=/depot/obuddenh/qt
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/JavaScriptCore
+qt_config=lex yacc debug uic resources qt incremental link_prl exceptions no_mocdepend debug stl qt_no_framework debug largefile stl precompile_header separate_debug_info mmx 3dnow sse sse2 dylib create_prl link_prl depend_includepath QTDIR_build use_libmysqlclient_r building-libs staticlib depend_includepath qt_install_headers qt depend_includepath qmake_cache target_qt hide_symbols create_libtool create_pc explicitlib moc thread static staticlib
+moc_location=${prefix}/bin/moc
+uic_location=${prefix}/bin/uic
+
+Name: Javascriptcore
+Description: Javascriptcore Library
+Version: 4.6.0
+Libs: -L${libdir} -lJavaScriptCore 
+Libs.private: -L/depot/obuddenh/qt/lib  -lQtGui -L/depot/obuddenh/qt/lib -L/usr/X11R6/lib -pthread -lpng -lfreetype -lgobject-2.0 -lSM -lICE -pthread -pthread -lXrender -lfontconfig -lXext -lX11 -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -lpthread -ldl  
+Cflags: -DQT_SHARED -I/depot/obuddenh/qt/include -I${includedir}
+