diff options
Diffstat (limited to 'Source/JavaScriptCore/qt')
| -rw-r--r-- | Source/JavaScriptCore/qt/ChangeLog | 20 | ||||
| -rw-r--r-- | Source/JavaScriptCore/qt/api/QtScript.pro | 7 |
2 files changed, 21 insertions, 6 deletions
diff --git a/Source/JavaScriptCore/qt/ChangeLog b/Source/JavaScriptCore/qt/ChangeLog index 11018b4..22484b7 100644 --- a/Source/JavaScriptCore/qt/ChangeLog +++ b/Source/JavaScriptCore/qt/ChangeLog @@ -1,3 +1,23 @@ +2011-03-01 Andras Becsi <abecsi@webkit.org> + + Reviewed by Csaba Osztrogonác. + + [Qt] Clean up the project files and move common options to WebKit.pri. + + * api/QtScript.pro: Deduplicate options. + +2011-02-24 Andras Becsi <abecsi@webkit.org> + + Reviewed by Laszlo Gombos. + + [Qt] MinGW build fails to link + https://bugs.webkit.org/show_bug.cgi?id=55050 + + Prepend the libraries of subcomponents instead of appending them + to fix the library order according to the dependency of the libraries + + * api/QtScript.pro: + 2010-09-29 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed by Andreas Kling. diff --git a/Source/JavaScriptCore/qt/api/QtScript.pro b/Source/JavaScriptCore/qt/api/QtScript.pro index 490758c..22e8b0c 100644 --- a/Source/JavaScriptCore/qt/api/QtScript.pro +++ b/Source/JavaScriptCore/qt/api/QtScript.pro @@ -7,17 +7,12 @@ INCLUDEPATH += $$PWD CONFIG += building-libs isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../../generated -!CONFIG(release, debug|release) { - OBJECTS_DIR = obj/debug -} else { # Release - OBJECTS_DIR = obj/release -} isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../.. include($$PWD/../../../WebKit.pri) include($$PWD/../../JavaScriptCore.pri) -addJavaScriptCoreLib(../..) +prependJavaScriptCoreLib(../..) INCLUDEPATH += $$PWD/../../API |