Changeset 87950 in webkit


Ignore:
Timestamp:
Jun 2, 2011 1:37:58 PM (13 years ago)
Author:
alexis.menard@openbossa.org
Message:

2011-06-02 Alexis Menard <alexis.menard@openbossa.org>

Reviewed by Andreas Kling.

[Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
https://bugs.webkit.org/show_bug.cgi?id=61957

When building inside the Qt source tree, qmake always append the mkspecs
defines after ours. We have to workaround and make sure that we append
our flags after the qmake variable used inside Qt. This workaround was provided
by our qmake folks.

  • Source/WebKit.pri:

2011-06-02 Alexis Menard <alexis.menard@openbossa.org>

Reviewed by Andreas Kling.

[Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
https://bugs.webkit.org/show_bug.cgi?id=61957

When building inside the Qt source tree, qmake always append the mkspecs
defines after ours. We have to workaround and make sure that we append
our flags after the qmake variable used inside Qt. This workaround was provided
by our qmake folks.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r87760 r87950  
     12011-06-02  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
     6        https://bugs.webkit.org/show_bug.cgi?id=61957
     7
     8        When building inside the Qt source tree, qmake always append the mkspecs
     9        defines after ours. We have to workaround and make sure that we append
     10        our flags after the qmake variable used inside Qt. This workaround was provided
     11        by our qmake folks.
     12
     13        * Source/WebKit.pri:
     14
    1152011-03-30  Martin Robinson  <mrobinson@igalia.com>
    216
  • trunk/Source/JavaScriptCore/ChangeLog

    r87838 r87950  
     12011-06-02  Alexis Menard  <alexis.menard@openbossa.org>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix of QtWebKit 2.2 when inside Qt tree with GCC 4.6.
     6        https://bugs.webkit.org/show_bug.cgi?id=61957
     7
     8        When building inside the Qt source tree, qmake always append the mkspecs
     9        defines after ours. We have to workaround and make sure that we append 
     10        our flags after the qmake variable used inside Qt. This workaround was provided
     11        by our qmake folks.
     12
     13        * JavaScriptCore.pro:
     14
    1152011-06-01  Oliver Hunt  <oliver@apple.com>
    216
  • trunk/Source/JavaScriptCore/JavaScriptCore.pro

    r87198 r87950  
    216216lessThan(QT_GCC_MAJOR_VERSION, 5):lessThan(QT_GCC_MINOR_VERSION, 6) {
    217217    # Disable C++0x mode in JSC for those who enabled it in their Qt's mkspec.
    218     *-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x
    219 }
    220 
     218    *-g++* {
     219        CONFIG(QTDIR_build) {
     220            QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
     221            QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
     222        } else {
     223            QMAKE_CFLAGS += -Wno-c++0x-compat
     224            QMAKE_CXXFLAGS += -Wno-c++0x-compat
     225        }
     226    }
     227}
     228
  • trunk/Source/WebKit.pri

    r86083 r87950  
    9898        if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) {
    9999            # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr).
    100             QMAKE_CFLAGS += -Wno-c++0x-compat
    101             QMAKE_CXXFLAGS += -Wno-c++0x-compat
     100            CONFIG(QTDIR_build) {
     101                QMAKE_CFLAGS_WARN_ON = -Wno-c++0x-compat
     102                QMAKE_CXXFLAGS_WARN_ON = -Wno-c++0x-compat
     103            } else {
     104                QMAKE_CFLAGS += -Wno-c++0x-compat
     105                QMAKE_CXXFLAGS += -Wno-c++0x-compat
     106            }
    102107        }
    103108    }
Note: See TracChangeset for help on using the changeset viewer.