Changeset 221

Timestamp:

Oct 12, 2009, 11:38:50 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: fontconfig related cleanup.

File:

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

trunk/configure.cmd

@@ -45 +45 @@
  * (mostly because the relevant features are not yet implemented) */
 G.LIMITATION_DEFS   =,
-    "QT_NO_TABLET QT_NO_FONTCONFIG",
+    "QT_NO_TABLET",
     "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
     "QT_NO_SESSIONMANAGER QT_NO_SYSTEMTRAYICON",
@@ -229 +229 @@
     G.CFG_SSE = "auto"
     G.CFG_FONTCONFIG = "auto"
-    G.CFG_QWS_FREETYPE = "auto"
     G.CFG_LIBFREETYPE = "auto"
     G.CFG_SQL_AVAILABLE = ""
@@ -944 +943 @@
         G.QT_CONFIG = Join(G.QT_CONFIG, "tiff")
 
+    if (G.CFG_FONTCONFIG == "yes") then
+        G.QT_CONFIG = Join(G.QT_CONFIG, "fontconfig")
+
     if (G.CFG_LIBFREETYPE == "no") then
         G.QT_CONFIG = Join(G.QT_CONFIG, "no-freetype")
@@ -1320 +1322 @@
     if (G.CFG_XFIXES == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XFIXES")
-    if (G.CFG_FONTCONFIG == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_FONTCONFIG")
     if (G.CFG_XINERAMA == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_XINERAMA")