Changeset 121964 in webkit


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

[Qt] Add top-level .qmake.conf

With Qt5, this makes setting $QMAKEPATH externally unnecessary.

The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
hurt, and is still required for Qt4.

​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ø.

.:

  • .qmake.conf: Added.
  • WebKit.pro:

Tools:

  • qmake/mkspecs/features/default_pre.prf:
Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r121962 r121964  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Add top-level .qmake.conf
     4
     5        With Qt5, this makes setting $QMAKEPATH externally unnecessary.
     6
     7        The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
     8        hurt, and is still required for Qt4.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=90461
     11
     12        Reviewed by Tor Arne Vestbø.
     13
     14        * .qmake.conf: Added.
     15        * WebKit.pro:
     16
    1172012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
    218

  • trunk/Tools/ChangeLog

    r121963 r121964  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Add top-level .qmake.conf
     4
     5        With Qt5, this makes setting $QMAKEPATH externally unnecessary.
     6
     7        The magic in the perl scripts to set QMAKEPATH is still there, as it doesn't
     8        hurt, and is still required for Qt4.
     9
     10        https://bugs.webkit.org/show_bug.cgi?id=90461
     11
     12        Reviewed by Tor Arne Vestbø.
     13
     14        * qmake/mkspecs/features/default_pre.prf:
     15
    1162012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
    217

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

    r121958 r121964  
    7070}
    7171
    72 # Make sure QMAKEPATH is set for recursive targets
    73 win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
    74 else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
     72haveQt(4) {
     73    # Make sure QMAKEPATH is set for recursive targets
     74    win_cmd_shell: QMAKE_QMAKE = \(set QMAKEPATH=$$(QMAKEPATH)\) && $$QMAKE_QMAKE
     75    else: QMAKE_QMAKE = QMAKEPATH=$$(QMAKEPATH) $$QMAKE_QMAKE
     76}
    7577
    7678# Default location of generated sources

  • trunk/WebKit.pro

    r121910 r121964  
    66# -------------------------------------------------------------------
    77
     8haveQt(4) {
     9    QMAKEPATH = $$(QMAKEPATH)
     10    isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
     11        error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
     12        # Otherwise we won't pick up the feature prf files needed for the build
     13    }
     14}
     15
    816TEMPLATE = subdirs
    917CONFIG += ordered
    10 
    11 QMAKEPATH = $$(QMAKEPATH)
    12 isEmpty(QMAKEPATH)|!exists($${QMAKEPATH}/mkspecs) {
    13     error("The environment variable QMAKEPATH needs to point to $WEBKITSRC/Tools/qmake")
    14     # Otherwise we won't pick up the feature prf files needed for the build
    15 }
    1618
    1719WTF.file = Source/WTF/WTF.pro
Note: See TracChangeset for help on using the changeset viewer.