| Differences between
and this patch
- a/Source/JavaScriptCore/ChangeLog +13 lines
Lines 1-3 a/Source/JavaScriptCore/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        * JavaScriptCore.pri: rename addJavaScriptCore to prependJavaScriptCore
12
        * jsc.pro: ditto
13
1
2011-02-23  Sheriff Bot  <webkit.review.bot@gmail.com>
14
2011-02-23  Sheriff Bot  <webkit.review.bot@gmail.com>
2
15
3
        Unreviewed, rolling out r79418.
16
        Unreviewed, rolling out r79418.
- a/Source/JavaScriptCore/JavaScriptCore.pri -5 / +5 lines
Lines 70-85 wince* { a/Source/JavaScriptCore/JavaScriptCore.pri_sec1
70
}
70
}
71
71
72
72
73
defineTest(addJavaScriptCoreLib) {
73
defineTest(prependJavaScriptCoreLib) {
74
    # Argument is the relative path to JavaScriptCore.pro's qmake output
74
    # Argument is the relative path to JavaScriptCore.pro's qmake output
75
    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
75
    pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
76
76
77
    win32-msvc*|wince* {
77
    win32-msvc*|wince* {
78
        LIBS += -L$$pathToJavaScriptCoreOutput
78
        LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS
79
        LIBS += -l$$JAVASCRIPTCORE_TARGET
79
        LIBS = -L$$pathToJavaScriptCoreOutput $$LIBS
80
        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib
80
        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib
81
    } else:symbian {
81
    } else:symbian {
82
        LIBS += -l$${JAVASCRIPTCORE_TARGET}.lib
82
        LIBS = -l$${JAVASCRIPTCORE_TARGET}.lib $$LIBS
83
        # The default symbian build system does not use library paths at all. However when building with
83
        # The default symbian build system does not use library paths at all. However when building with
84
        # qmake's symbian makespec that uses Makefiles
84
        # qmake's symbian makespec that uses Makefiles
85
        QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput
85
        QMAKE_LIBDIR += $$pathToJavaScriptCoreOutput
Lines 88-94 defineTest(addJavaScriptCoreLib) { a/Source/JavaScriptCore/JavaScriptCore.pri_sec2
88
        # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW
88
        # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW
89
        # that can't resolve symbols from QtCore if libjscore comes after.
89
        # that can't resolve symbols from QtCore if libjscore comes after.
90
        QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
90
        QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
91
        LIBS += -l$$JAVASCRIPTCORE_TARGET
91
        LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS
92
        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
92
        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
93
    }
93
    }
94
94
- a/Source/JavaScriptCore/jsc.pro -1 / +1 lines
Lines 22-28 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib a/Source/JavaScriptCore/jsc.pro_sec1
22
}
22
}
23
OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
23
OBJECTS_DIR_WTR = $$OBJECTS_DIR$${QMAKE_DIR_SEP}
24
include($$PWD/JavaScriptCore.pri)
24
include($$PWD/JavaScriptCore.pri)
25
addJavaScriptCoreLib(.)
25
prependJavaScriptCoreLib(.)
26
26
27
symbian {
27
symbian {
28
    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
28
    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
- a/Source/JavaScriptCore/qt/ChangeLog +12 lines
Lines 1-3 a/Source/JavaScriptCore/qt/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        * api/QtScript.pro:
12
1
2010-09-29  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
13
2010-09-29  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
2
14
3
        Reviewed by Andreas Kling.
15
        Reviewed by Andreas Kling.
- a/Source/JavaScriptCore/qt/api/QtScript.pro -1 / +1 lines
Lines 17-23 isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../../.. a/Source/JavaScriptCore/qt/api/QtScript.pro_sec1
17
include($$PWD/../../../WebKit.pri)
17
include($$PWD/../../../WebKit.pri)
18
18
19
include($$PWD/../../JavaScriptCore.pri)
19
include($$PWD/../../JavaScriptCore.pri)
20
addJavaScriptCoreLib(../..)
20
prependJavaScriptCoreLib(../..)
21
21
22
INCLUDEPATH += $$PWD/../../API
22
INCLUDEPATH += $$PWD/../../API
23
23
- a/Source/WebCore/ChangeLog +14 lines
Lines 1-3 a/Source/WebCore/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        No new tests needed.
12
13
        * WebCore.pri:
14
1
2011-02-23  Dan Bernstein  <mitz@apple.com>
15
2011-02-23  Dan Bernstein  <mitz@apple.com>
2
16
3
        Reviewed by Maciej Stachowiak.
17
        Reviewed by Maciej Stachowiak.
- a/Source/WebCore/WebCore.pri -5 / +5 lines
Lines 362-381 enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1 a/Source/WebCore/WebCore.pri_sec1
362
362
363
use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
363
use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
364
364
365
defineTest(addWebCoreLib) {
365
defineTest(prependWebCoreLib) {
366
    pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
366
    pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
367
367
368
    win32-msvc*|wince* {
368
    win32-msvc*|wince* {
369
        LIBS += -L$$pathToWebCoreOutput
369
        LIBS = -l$$WEBCORE_TARGET $$LIBS
370
        LIBS += -l$$WEBCORE_TARGET
370
        LIBS = -L$$pathToWebCoreOutput $$LIBS
371
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
371
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
372
    } else:symbian {
372
    } else:symbian {
373
        LIBS += -l$${WEBCORE_TARGET}.lib
373
        LIBS = -l$${WEBCORE_TARGET}.lib $$LIBS
374
        QMAKE_LIBDIR += $$pathToWebCoreOutput
374
        QMAKE_LIBDIR += $$pathToWebCoreOutput
375
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
375
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
376
    } else {
376
    } else {
377
        QMAKE_LIBDIR = $$pathToWebCoreOutput $$QMAKE_LIBDIR
377
        QMAKE_LIBDIR = $$pathToWebCoreOutput $$QMAKE_LIBDIR
378
        LIBS += -l$$WEBCORE_TARGET
378
        LIBS = -l$$WEBCORE_TARGET $$LIBS
379
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}lib$${WEBCORE_TARGET}.a
379
        POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}lib$${WEBCORE_TARGET}.a
380
    }
380
    }
381
    
381
    
- a/Source/WebKit/qt/ChangeLog +12 lines
Lines 1-3 a/Source/WebKit/qt/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        * QtWebKit.pro: prepend libraries in the correct order
12
1
2011-02-23  Alexis Menard  <alexis.menard@openbossa.org>
13
2011-02-23  Alexis Menard  <alexis.menard@openbossa.org>
2
14
3
        Reviewed by Dan Bernstein.
15
        Reviewed by Dan Bernstein.
- a/Source/WebKit/qt/QtWebKit.pro -5 / +3 lines
Lines 37-47 include($$SOURCE_DIR/JavaScriptCore/JavaScriptCore.pri) a/Source/WebKit/qt/QtWebKit.pro_sec1
37
webkit2:include($$SOURCE_DIR/WebKit2/WebKit2.pri)
37
webkit2:include($$SOURCE_DIR/WebKit2/WebKit2.pri)
38
include($$SOURCE_DIR/WebCore/WebCore.pri)
38
include($$SOURCE_DIR/WebCore/WebCore.pri)
39
39
40
webkit2:addWebKit2Lib(../../WebKit2)
40
!v8:prependJavaScriptCoreLib(../../JavaScriptCore)
41
41
prependWebCoreLib(../../WebCore)
42
addWebCoreLib(../../WebCore)
42
webkit2:prependWebKit2Lib(../../WebKit2)
43
44
!v8:addJavaScriptCoreLib(../../JavaScriptCore)
45
43
46
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
44
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
47
45
- a/Source/WebKit2/ChangeLog +12 lines
Lines 1-3 a/Source/WebKit2/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        * WebKit2.pri:
12
1
2011-02-23  Siddharth Mathur  <siddharth.mathur@nokia.com>
13
2011-02-23  Siddharth Mathur  <siddharth.mathur@nokia.com>
2
14
3
        Reviewed by Laszlo Gombos.
15
        Reviewed by Laszlo Gombos.
- a/Source/WebKit2/WebKit2.pri -5 / +5 lines
Lines 63-82 symbian { a/Source/WebKit2/WebKit2.pri_sec1
63
    INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
63
    INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
64
}
64
}
65
65
66
defineTest(addWebKit2Lib) {
66
defineTest(prependWebKit2Lib) {
67
    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
67
    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
68
68
69
    win32-msvc*|wince* {
69
    win32-msvc*|wince* {
70
        LIBS += -L$$pathToWebKit2Output
70
        LIBS = -l$$WEBKIT2_TARGET $$LIBS
71
        LIBS += -l$$WEBKIT2_TARGET
71
        LIBS = -L$$pathToWebKit2Output $$LIBS
72
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
72
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
73
    } else:symbian {
73
    } else:symbian {
74
        LIBS += -l$${WEBKIT2_TARGET}.lib
74
        LIBS = -l$${WEBKIT2_TARGET}.lib $$LIBS
75
        QMAKE_LIBDIR += $$pathToWebKit2Output
75
        QMAKE_LIBDIR += $$pathToWebKit2Output
76
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
76
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
77
    } else {
77
    } else {
78
        QMAKE_LIBDIR = $$pathToWebKit2Output $$QMAKE_LIBDIR
78
        QMAKE_LIBDIR = $$pathToWebKit2Output $$QMAKE_LIBDIR
79
        LIBS += -l$$WEBKIT2_TARGET
79
        LIBS = -l$$WEBKIT2_TARGET $$LIBS
80
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
80
        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
81
    }
81
    }
82
82
- a/Tools/ChangeLog +13 lines
Lines 1-3 a/Tools/ChangeLog_sec1
1
2011-02-23  Andras Becsi  <abecsi@webkit.org>
2
3
        Reviewed by NOBODY (OOPS!).
4
5
        [Qt] MinGW build fails to link
6
        https://bugs.webkit.org/show_bug.cgi?id=55050
7
8
        Prepend the libraries of subcomponents instead of appending them
9
        to fix the library order according to the dependency of the libraries
10
11
        * WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro:
12
        * WebKitTestRunner/qt/WebKitTestRunner.pro:
13
1
2011-02-23  Siddharth Mathur  <siddharth.mathur@nokia.com>
14
2011-02-23  Siddharth Mathur  <siddharth.mathur@nokia.com>
2
15
3
        Reviewed by Laszlo Gombos.
16
        Reviewed by Laszlo Gombos.
- a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro -2 / +2 lines
Lines 45-53 HEADERS += \ a/Tools/WebKitTestRunner/InjectedBundle/qt/InjectedBundle.pro_sec1
45
45
46
include(../../../../Source/WebKit.pri)
46
include(../../../../Source/WebKit.pri)
47
include(../../../../Source/JavaScriptCore/JavaScriptCore.pri)
47
include(../../../../Source/JavaScriptCore/JavaScriptCore.pri)
48
addJavaScriptCoreLib(../../../JavaScriptCore)
48
prependJavaScriptCoreLib(../../../JavaScriptCore)
49
include(../../../../Source/WebKit2/WebKit2.pri)
49
include(../../../../Source/WebKit2/WebKit2.pri)
50
addWebKit2Lib(../../../WebKit2)
50
prependWebKit2Lib(../../../WebKit2)
51
51
52
INCLUDEPATH = \
52
INCLUDEPATH = \
53
    $$PWD \
53
    $$PWD \
- a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro -1 / +1 lines
Lines 68-71 linux-* { a/Tools/WebKitTestRunner/qt/WebKitTestRunner.pro_sec1
68
}
68
}
69
69
70
include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
70
include(../../../Source/JavaScriptCore/JavaScriptCore.pri)
71
addJavaScriptCoreLib(../../JavaScriptCore)
71
prependJavaScriptCoreLib(../../JavaScriptCore)

Return to Bug 55050