Changeset 88350 in webkit


Ignore:
Timestamp:
Jun 8, 2011 8:28:27 AM (13 years ago)
Author:
yael.aharon@nokia.com
Message:

2011-06-08 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

[Qt] Build fix for building QtWebKit inside of Qt.
​https://bugs.webkit.org/show_bug.cgi?id=62280

Remove CONFIG=staticlib, because it causes the configure script to add -ljavascriptcore
into QtWebKit.prl.

No new tests, as this is just a build fix.

2011-06-08 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

[Qt] Build fix for building QtWebKit inside of Qt.
​https://bugs.webkit.org/show_bug.cgi?id=62280

Remove CONFIG=staticlib, because it causes the configure script to add -lwebcore
into QtWebKit.prl.

No new tests, as this is just a build fix.

  • WebCore.pri:

2011-06-08 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Andreas Kling.

[Qt] Build fix for building QtWebKit inside of Qt.
​https://bugs.webkit.org/show_bug.cgi?id=62280

Remove CONFIG=staticlib, because it causes the configure script to add -lwebkit2
into QtWebKit.prl.

  • WebKit2.pri:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r88328 r88350  
     12011-06-08  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix for building QtWebKit inside of Qt.
     6        https://bugs.webkit.org/show_bug.cgi?id=62280
     7
     8        Remove CONFIG=staticlib, because it causes the configure script to add -ljavascriptcore
     9        into QtWebKit.prl.
     10
     11        No new tests, as this is just a build fix.
     12
     13        * JavaScriptCore.pri:
     14
    1152011-06-07  Geoffrey Garen  <ggaren@apple.com>
    216

  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r88016 r88350  
    103103    # statically in applications (which isn't used often because, among other things, of licensing obstacles).
    104104    CONFIG -= explicitlib
     105    CONFIG -= staticlib
    105106
    106107    export(QMAKE_LIBDIR)

  • trunk/Source/WebCore/ChangeLog

    r88348 r88350  
     12011-06-08  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix for building QtWebKit inside of Qt.
     6        https://bugs.webkit.org/show_bug.cgi?id=62280
     7
     8        Remove CONFIG=staticlib, because it causes the configure script to add -lwebcore
     9        into QtWebKit.prl.
     10
     11        No new tests, as this is just a build fix.
     12
     13        * WebCore.pri:
     14
    1152011-06-08  Vsevolod Vlasov  <vsevik@chromium.org>
    216

  • trunk/Source/WebCore/WebCore.pri

    r88304 r88350  
    373373   
    374374    CONFIG -= explicitlib
     375    CONFIG -= staticlib
    375376    export(QMAKE_LIBDIR)
    376377    export(POST_TARGETDEPS)

  • trunk/Source/WebKit2/ChangeLog

    r88316 r88350  
     12011-06-08  Yael Aharon  <yael.aharon@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix for building QtWebKit inside of Qt.
     6        https://bugs.webkit.org/show_bug.cgi?id=62280
     7
     8        Remove CONFIG=staticlib, because it causes the configure script to add -lwebkit2
     9        into QtWebKit.prl.
     10
     11        * WebKit2.pri:
     12
    1132011-06-07  Tim Horton  <timothy_horton@apple.com>
    214

  • trunk/Source/WebKit2/WebKit2.pri

    r84364 r88350  
    9090    # The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies.
    9191    CONFIG -= explicitlib
     92    CONFIG -= staticlib
    9293
    9394    export(QMAKE_LIBDIR)
Note: See TracChangeset for help on using the changeset viewer.