Changeset 121958 in webkit


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

[Qt] Switch to new-style Qt 5 configure tests

Use explicit project file action instead of syncqt magic.

​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/WebCore:

  • WebCore.pri:

Tools:

  • Scripts/webkitdirs.pm:

(buildQMakeProjects):

  • qmake/configure.pri: Copied from Tools/qmake/configure.pro.
  • qmake/configure.pro:
  • qmake/mkspecs/features/default_pre.prf:
  • qmake/mkspecs/features/features.prf:
  • qmake/sync.profile: Removed.
Location:
trunk
Files:
1 deleted
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r121957 r121958  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Switch to new-style Qt 5 configure tests
     4
     5        Use explicit project file action instead of syncqt magic.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=90461
     8
     9        Reviewed by Tor Arne Vestbø.
     10
     11        * WebCore.pri:
     12
    1132012-07-06  Pavel Feldman  <pfeldman@chromium.org>
    214

  • trunk/Source/WebCore/WebCore.pri

    r121882 r121958  
    236236haveQt(5) {
    237237    # Qt5 allows us to use config tests to check for the presence of these libraries
    238     contains(config_test_libjpeg, yes) {
     238    config_libjpeg {
    239239        DEFINES += WTF_USE_LIBJPEG=1
    240240        LIBS += -ljpeg
    … …  
    242242        warning("JPEG library not found! QImageDecoder will decode JPEG images.")
    243243    }
    244     contains(config_test_libpng, yes) {
     244    config_libpng {
    245245        DEFINES += WTF_USE_LIBPNG=1
    246246        LIBS += -lpng
    … …  
    248248        warning("PNG library not found! QImageDecoder will decode PNG images.")
    249249    }
    250     contains(config_test_libwebp, yes) {
     250    config_libwebp {
    251251        DEFINES += WTF_USE_WEBP=1
    252252        LIBS += -lwebp

  • trunk/Tools/ChangeLog

    r121941 r121958  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Switch to new-style Qt 5 configure tests
     4
     5        Use explicit project file action instead of syncqt magic.
     6
     7        https://bugs.webkit.org/show_bug.cgi?id=90461
     8
     9        Reviewed by Tor Arne Vestbø.
     10
     11        * Scripts/webkitdirs.pm:
     12        (buildQMakeProjects):
     13        * qmake/configure.pri: Copied from Tools/qmake/configure.pro.
     14        * qmake/configure.pro:
     15        * qmake/mkspecs/features/default_pre.prf:
     16        * qmake/mkspecs/features/features.prf:
     17        * qmake/sync.profile: Removed.
     18
    1192012-07-05  Jason Liu  <jason.liu@torchmobile.com.cn>
    220

  • trunk/Tools/Scripts/webkitdirs.pm

    r121785 r121958  
    23742374            File::Path::mkpath($dir);
    23752375            chdir $dir or die "Failed to cd into " . $dir . "\n";
    2376 
    2377             # After removing WebKitBuild directory, we have to call qtFeatureDefaults()
    2378             # to run config tests and generate the removed Tools/qmake/.qmake.cache again.
    2379             qtFeatureDefaults(\@buildArgs, \$qconfigs);
    23802376        #}
    23812377

  • trunk/Tools/Tools.pro

    r121854 r121958  
    3636    $$files(Scripts/webkitperl/*.p[l|m], true) \
    3737    qmake/README \
    38     qmake/configure.pro \
    39     qmake/sync.profile \
     38    qmake/configure.* \
    4039    qmake/qt_webkit.pri \
    4140    qmake/config.tests/README \

  • trunk/Tools/qmake/configure.pri

    r121957 r121958  
    66# -------------------------------------------------------------------
    77
    8 # Will compute features based on command line arguments, config tests,
    9 # dependency availability, and defaults.
     8haveQt(5) {
     9    load(configure)
     10    QMAKE_CONFIG_TESTS_DIR = $$PWD/config.tests
     11
     12    CONFIG_TESTS = \
     13        fontconfig \
     14        gccdepends \
     15        libpng \
     16        libjpeg \
     17        libwebp \
     18        libxml2 \
     19        libxslt \
     20        libzlib
     21
     22    for(test, CONFIG_TESTS): qtCompileTest($$test)
     23}
     24
    1025load(features)
    11 
    12 # Compute delta
    13 CONFIG -= $$BASE_CONFIG
    14 DEFINES -= $$BASE_DEFINES
    15 
    16 message(CONFIG: $$CONFIG)
    17 message(DEFINES: $$DEFINES)
    18 error("Done computing defaults")

  • trunk/Tools/qmake/configure.pro

    r121777 r121958  
    88# Will compute features based on command line arguments, config tests,
    99# dependency availability, and defaults.
    10 load(features)
     10include(configure.pri)
    1111
    1212# Compute delta

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

    r121856 r121958  
    4545QTDIR=$$old_qtdir
    4646
    47 # Load results of config tests (only supported in Qt 5)
    48 haveQt(5): include($${ROOT_BUILD_DIR}/Tools/qmake/.qmake.cache, , true)
    49 
    50 unix:contains(config_test_gccdepends, yes) {
     47unix:config_gccdepends {
    5148    # We have a compiler that supports the -MD option (and neither
    5249    # teambuilder nor icecream is messing up the .d file output).

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

    r121847 r121958  
    4848# We need fontconfig to set up the test fonts for DumpRenderTree and WebKitTestRunner.
    4949haveQt(5) {
    50     contains(config_test_fontconfig, yes):!mac {
     50    config_fontconfig:!mac {
    5151        DEFINES += HAVE_FONTCONFIG=1
    5252    }
    … …  
    6060# We need libxml2 config test to determine to use libxml2 or not
    6161!contains(DEFINES, WTF_USE_LIBXML2=.) {
    62     haveQt(5):contains(config_test_libxml2, yes): DEFINES += WTF_USE_LIBXML2=1
     62    config_libxml2: DEFINES += WTF_USE_LIBXML2=1
    6363}
    6464
    6565# We need libxslt config test to determine to use libxslt or not
    6666!contains(DEFINES, ENABLE_XSLT=.) {
    67     haveQt(5):contains(config_test_libxslt, yes): DEFINES += ENABLE_XSLT=1
     67    config_libxslt: DEFINES += ENABLE_XSLT=1
    6868}
    6969
    7070# We need libzlib config test to determine to use enable websocket extension or not
    7171!contains(DEFINES, WTF_USE_ZLIB=.) {
    72     haveQt(5):contains(config_test_libzlib, yes): DEFINES += WTF_USE_ZLIB=1
     72    config_libzlib: DEFINES += WTF_USE_ZLIB=1
    7373}
    7474
Note: See TracChangeset for help on using the changeset viewer.