Changeset 879

Timestamp:

Jun 30, 2011, 9:39:51 PM (14 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:

• trunk/configure.cmd (modified) (3 diffs)

trunk/configure.cmd

@@ -1138 +1138 @@
     --------------------------------------------------------------------------*/
 
-    if (G.CFG_WEBKIT == "auto") then do
-        if (G.CFG_GUI == "no") then
-            G.CFG_WEBKIT == "no"
-        else do
-            if (G.OfficialBuild) then
-                G.CFG_WEBKIT = "yes"
-            else do
-                G.CFG_WEBKIT = "no"
-                call SaySay G.EOL||,
-'Qt comes with the webkit module that provides a powerful framework for web-'G.EOL||,
-'based applications and may be required by some of them but it takes a very 'G.EOL||,
-'long time to compile and build (it will double the overall compilation time).'
-                if (GetYesNo('Do you want to enable the webkit module?', 'N')) then do
-                    G.CFG_WEBKIT = "yes"
-                end
-            end
-        end
-    end
+    if (G.CFG_WEBKIT == "auto") then
+        G.CFG_WEBKIT = G.CFG_GUI
 
     /*--------------------------------------------------------------------------
@@ -1386 +1370 @@
 
     if (G.CFG_WEBKIT == "yes") then do
-        G.QT_CONFIG = Join(G.QT_CONFIG, "webkit")
+        /* This include takes care of adding "webkit" to QT_CONFIG. */
+        call CopyFile G.RelPath"\src\3rdparty\webkit\WebKit\qt\qt_webkit_version.pri",,
+                      G.OutPath"\mkspecs\modules\qt_webkit_version.pri"
+        if (G.CFG_WEBKIT == "debug") then
+            G.QMAKE_CONFIG = Join(G.QMAKE_CONFIG, "webkit-debug")
         if (G.CFG_JAVASCRIPTCORE_JIT == "yes") then
             call QMakeVar "set", "JAVASCRIPTCORE_JIT", "yes"
@@ -1393 +1381 @@
     end
     else do
+        call DeleteFile G.OutPath"\mkspecs\modules\qt_webkit_version.pri"
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_WEBKIT")
     end