Changeset 121960 in webkit


Ignore:
Timestamp:
Jul 6, 2012 6:13:07 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt] Remove redundant CONFIG+=module

qt_module_config takes care of that.

In api.pri we are actually testing the flag ourselves, so now we need to
test a related flag qt_module_config sets instead.

.:

​https://bugs.webkit.org/show_bug.cgi?id=90461

Patch by Oswald Buddenhagen <​oswald.buddenhagen@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.

  • Source/api.pri:

Tools:

Patch by Oswald Buddenhagen <​oswald.buddenhagen@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.

  • qmake/mkspecs/features/default_post.prf:
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r121959 r121960  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Remove redundant CONFIG+=module
     4
     5        qt_module_config takes care of that.
     6
     7        In api.pri we are actually testing the flag ourselves, so now we need to
     8        test a related flag qt_module_config sets instead.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=90461
     11
     12        Reviewed by Tor Arne Vestbø.
     13
     14        * Source/api.pri:
     15
    1162012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
    217

  • trunk/Source/api.pri

    r121851 r121960  
    1515    MODULE = webkit
    1616    MODULE_PRI = $$QT.webkit.module_pri
    17     CONFIG += module
    1817
    1918    BASE_TARGET = $$TARGET

  • trunk/Tools/ChangeLog

    r121958 r121960  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Remove redundant CONFIG+=module
     4
     5        qt_module_config takes care of that.
     6
     7        In api.pri we are actually testing the flag ourselves, so now we need to
     8        test a related flag qt_module_config sets instead.
     9
     10        Reviewed by Tor Arne Vestbø.
     11
     12        * qmake/mkspecs/features/default_post.prf:
     13
    1142012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
    215

  • trunk/Tools/qmake/mkspecs/features/default_post.prf

    r121777 r121960  
    132132    # Prevent name clashes when building both debug and release. Qt5's module
    133133    # system already takes care of this for the top level QtWebKit library.
    134     !module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
     134    !qt_install_module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET)
    135135
    136136    isEmpty(DESTDIR): DESTDIR = $$activeBuildConfig()
Note: See TracChangeset for help on using the changeset viewer.