Changeset 155433 in webkit


Ignore:
Timestamp:
Sep 10, 2013 6:11:46 AM (11 years ago)
Author:
allan.jensen@digia.com
Message:

[Qt] make use of qtHaveModule()
​https://bugs.webkit.org/show_bug.cgi?id=121090

Reviewed by Jocelyn Turcotte.

Use qtHaveModule instead of our own haveQtModule.

Source/WebKit2:

  • WebProcess.pro:

Tools:

  • QtTestBrowser/QtTestBrowser.pro:
  • qmake/mkspecs/features/configure.prf:
  • qmake/mkspecs/features/features.prf:
  • qmake/mkspecs/features/functions.prf:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r155430 r155433  
     12013-09-10  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] make use of qtHaveModule()
     4        https://bugs.webkit.org/show_bug.cgi?id=121090
     5
     6        Reviewed by Jocelyn Turcotte.
     7        Patch by Oswald Buddenhagen <oswald.buddenhagen@digia.com>
     8
     9        Use qtHaveModule instead of our own haveQtModule.
     10
     11        * WebProcess.pro:
     12
    1132013-09-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    214

  • trunk/Source/WebKit2/WebProcess.pro

    r140957 r155433  
    1919macx: QT += xml
    2020
    21 haveQtModule(widgets): QT += widgets webkitwidgets
     21qtHaveModule(widgets): QT += widgets webkitwidgets
    2222
    2323build?(webkit1): DEFINES += HAVE_WEBKIT1

  • trunk/Tools/ChangeLog

    r155432 r155433  
     12013-09-10  Allan Sandfeld Jensen  <allan.jensen@digia.com>
     2
     3        [Qt] make use of qtHaveModule()
     4        https://bugs.webkit.org/show_bug.cgi?id=121090
     5
     6        Reviewed by Jocelyn Turcotte.
     7        Patch by Oswald Buddenhagen <oswald.buddenhagen@digia.com>
     8
     9        Use qtHaveModule instead of our own haveQtModule.
     10
     11        * QtTestBrowser/QtTestBrowser.pro:
     12        * qmake/mkspecs/features/configure.prf:
     13        * qmake/mkspecs/features/features.prf:
     14        * qmake/mkspecs/features/functions.prf:
     15
    1162013-09-10  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
    217

  • trunk/Tools/QtTestBrowser/QtTestBrowser.pro

    r133421 r155433  
    4949have?(FONTCONFIG): PKGCONFIG += fontconfig
    5050
    51 contains(QT_CONFIG, opengl) {
     51qtHaveModule(opengl) {
    5252    QT += opengl
    5353    DEFINES += QT_CONFIGURED_WITH_OPENGL

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

    r145813 r155433  
    5858    # is done when finalizing configure.
    5959
    60     !haveQtModule(widgets) {
     60    !qtHaveModule(widgets) {
    6161        CONFIGURE_WARNINGS += "Missing QtWidgets module, disabling WebKit1"
    6262        WEBKIT_CONFIG -= build_webkit1
    … …  
    9090
    9191    # Sanitize build options
    92     !haveQtModule(testlib) {
     92    !qtHaveModule(testlib) {
    9393        CONFIGURE_WARNINGS += "Missing QtTest module, disabling DumpRenderTree, WebKitTestRunner and tests"
    9494        WEBKIT_CONFIG -= build_drt build_wtr build_tests

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

    r152282 r155433  
    3232    #
    3333
    34     haveQtModule(quick): WEBKIT_CONFIG += have_qtquick
     34    qtHaveModule(quick): WEBKIT_CONFIG += have_qtquick
    3535    else: CONFIGURE_WARNINGS += "QtQuick module not found, QML APIs will not be built"
    3636
    37     haveQtModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
    38     haveQtModule(widgets): WEBKIT_CONFIG += have_qstyle
    39     haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
    40     haveQtModule(location): WEBKIT_CONFIG += have_qtlocation
    41     haveQtModule(sensors): WEBKIT_CONFIG += have_qtsensors
     37    qtHaveModule(printsupport): WEBKIT_CONFIG += have_qtprintsupport
     38    qtHaveModule(widgets): WEBKIT_CONFIG += have_qstyle
     39    qtHaveModule(testlib): WEBKIT_CONFIG += have_qttestlib
     40    qtHaveModule(location): WEBKIT_CONFIG += have_qtlocation
     41    qtHaveModule(sensors): WEBKIT_CONFIG += have_qtsensors
    4242
    4343    config_libxml2: WEBKIT_CONFIG += use_libxml2
    … …  
    117117    }
    118118
    119     !enable?(video):haveQtModule(multimediawidgets) {
     119    !enable?(video):qtHaveModule(multimediawidgets) {
    120120        WEBKIT_CONFIG += video use_qt_multimedia
    121121    }

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

    r150223 r155433  
    196196}
    197197
    198 defineTest(haveQtModule) {
    199     unset(module)
    200     module = $$1
    201 
    202     haveQt(5):!isEmpty(QT.$${module}.name): return(true)
    203     return(false)
    204 }
    205 
    206198defineTest(programExistsInPath) {
    207199    win32: program = $${1}.exe
Note: See TracChangeset for help on using the changeset viewer.