Changeset 879


Ignore:
Timestamp:
Jun 30, 2011, 7:39:51 PM (9 years ago)
Author:
Dmitry A. Kuminov
Message:

configure.cmd: Removed the interactive question about building WebKit?; it always builds now (unless G.CFG_WEBKIT is set to no in the script). Later we will support command line options to do it on the fly.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.cmd

    r876 r879  
    11381138    --------------------------------------------------------------------------*/
    11391139
    1140     if (G.CFG_WEBKIT == "auto") then do
    1141         if (G.CFG_GUI == "no") then
    1142             G.CFG_WEBKIT == "no"
    1143         else do
    1144             if (G.OfficialBuild) then
    1145                 G.CFG_WEBKIT = "yes"
    1146             else do
    1147                 G.CFG_WEBKIT = "no"
    1148                 call SaySay G.EOL||,
    1149 'Qt comes with the webkit module that provides a powerful framework for web-'G.EOL||,
    1150 'based applications and may be required by some of them but it takes a very 'G.EOL||,
    1151 'long time to compile and build (it will double the overall compilation time).'
    1152                 if (GetYesNo('Do you want to enable the webkit module?', 'N')) then do
    1153                     G.CFG_WEBKIT = "yes"
    1154                 end
    1155             end
    1156         end
    1157     end
     1140    if (G.CFG_WEBKIT == "auto") then
     1141        G.CFG_WEBKIT = G.CFG_GUI
    11581142
    11591143    /*--------------------------------------------------------------------------
     
    13861370
    13871371    if (G.CFG_WEBKIT == "yes") then do
    1388         G.QT_CONFIG = Join(G.QT_CONFIG, "webkit")
     1372        /* This include takes care of adding "webkit" to QT_CONFIG. */
     1373        call CopyFile G.RelPath"\src\3rdparty\webkit\WebKit\qt\qt_webkit_version.pri",,
     1374                      G.OutPath"\mkspecs\modules\qt_webkit_version.pri"
     1375        if (G.CFG_WEBKIT == "debug") then
     1376            G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "webkit-debug")
    13891377        if (G.CFG_JAVASCRIPTCORE_JIT == "yes") then
    13901378            call QMakeVar "set", "JAVASCRIPTCORE_JIT", "yes"
     
    13931381    end
    13941382    else do
     1383        call DeleteFile G.OutPath"\mkspecs\modules\qt_webkit_version.pri"
    13951384        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_WEBKIT")
    13961385    end
Note: See TracChangeset for help on using the changeset viewer.