diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 15:08:06 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-07-13 15:08:06 (GMT) |
commit | d077a3eac8f0401a18913471e08709e74552c507 (patch) | |
tree | ad83af83620995dd79ebb12abd35d85282b95c6f /src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la | |
parent | 6744a0d6095277e1876694cc8fe42b41997c6c31 (diff) | |
parent | 8f65472671406ad5881b119ba32b075b828bbb1a (diff) | |
download | Qt-d077a3eac8f0401a18913471e08709e74552c507.zip Qt-d077a3eac8f0401a18913471e08709e74552c507.tar.gz Qt-d077a3eac8f0401a18913471e08709e74552c507.tar.bz2 |
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
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la')
-rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/libJavaScriptCore.la | 28 |
1 files changed, 28 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' |