Changeset 146593 in webkit


Ignore:
Timestamp:
Mar 22, 2013 5:24:48 AM (11 years ago)
Author:
jocelyn.turcotte@digia.com
Message:

[Qt] Fix the TestWebKitAPI build
https://bugs.webkit.org/show_bug.cgi?id=113044

Reviewed by Tor Arne Vestbø.

The generate-forwarding-headers script would only be run
after the targets in InjectedBundle.pri since the second
addStrictSubdirOrderBetween call in
Tools/TestWebKitAPI/TestWebKitAPI.pro would overwrite
the derived_sources -> injected_bundle order in SUBDIRS.

Fix it by only moving the dependent target at the end of
SUBDIRS, don't touch its dependency.

  • qmake/mkspecs/features/functions.prf:
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r146581 r146593  
     12013-03-22  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
     2
     3        [Qt] Fix the TestWebKitAPI build
     4        https://bugs.webkit.org/show_bug.cgi?id=113044
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        The generate-forwarding-headers script would only be run
     9        after the targets in InjectedBundle.pri since the second
     10        addStrictSubdirOrderBetween call in
     11        Tools/TestWebKitAPI/TestWebKitAPI.pro would overwrite
     12        the derived_sources -> injected_bundle order in SUBDIRS.
     13
     14        Fix it by only moving the dependent target at the end of
     15        SUBDIRS, don't touch its dependency.
     16
     17        * qmake/mkspecs/features/functions.prf:
     18
    1192013-03-22  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
    220
  • trunk/Tools/qmake/mkspecs/features/functions.prf

    r143326 r146593  
    134134
    135135    # Make sure the order is right
    136     SUBDIRS -= $$firstSubdir $$secondSubdir
    137     SUBDIRS += $$firstSubdir $$secondSubdir
     136    SUBDIRS -= $$secondSubdir
     137    SUBDIRS += $$secondSubdir
    138138    NO_RECURSIVE_QMAKE_SUBDIRS += $$firstSubdir $$secondSubdir
    139139    CONFIG *= ordered
Note: See TracChangeset for help on using the changeset viewer.