Changeset 576

Timestamp:

Feb 18, 2010, 1:39:37 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Enabled printing by default.

Location:

trunk

Files:

• README.OS2 (modified) (4 diffs)
• configure.cmd (modified) (10 diffs)

trunk/README.OS2

@@ -46 +46 @@
 
       http://unix.os2site.com/pub/binary/make/make-3_81beta1-bin-static.zip
+
+
+
+
+
+
+
+
+
+
 
   - LxLite 1.3.3 or above (not tested) if you want Qt DLLs and application
@@ -90 +100 @@
       set PATH=D:\Coding\Qt4\bin;%PATH%
       set BEGINLIBPATH=D:\Coding\Qt4\bin;%BEGINLIBPATH%
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 Note that the QTDIR environment variable used by previous Qt versions is not
@@ -317 +341 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 CURRENT LIMITATIONS
 
@@ -368 +410 @@
      relevant parts of code so they should still build.
 
-  9. No QAssistant, no printer support (QT_NO_PRINTER and QT_NO_PRINTDIALOG are
-     defined). No IPV6 support in the network module (QT_NO_IPV6 is defined).
+  9. No QAssistant
+     defined).
 
   See the project roadmap for more information on the current progress and

trunk/configure.cmd

@@ -45 +45 @@
     "QT_NO_TABLET",
     "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
-    "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6",
-    "QT_NO_PRINTER QT_NO_PRINTDIALOG"
+    "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6"
 
 G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake" /* examples demos docs translations */
@@ -271 +270 @@
     G.CFG_DECORATION_PLUGIN_AVAILABLE = ""
     G.CFG_DECORATION_PLUGIN = ""
+
+
 /* @todo do we really need this?
-    G.CFG_NIS = "auto"
-    G.CFG_CUPS = "auto"
     G.CFG_ICONV = "auto"
     G.CFG_GLIB = "auto"
@@ -593 +592 @@
     call SetEnv "QMAKE_EXEPACK_POST_FLAGS", G.QMAKE_EXEPACK_POST_FLAGS
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /*--------------------------------------------------------------------------
      post process QT_INSTALL_* variables
@@ -1061 +1089 @@
         G.QT_CONFIG = Join(G.QT_CONFIG, "system-zlib")
 
-/* @todo do we really need this?
+    if (G.CFG_CUPS == "yes") then
+        G.QT_CONFIG = Join(G.QT_CONFIG, "cups")
     if (G.CFG_NIS == "yes") then
         G.QT_CONFIG = Join(G.QT_CONFIG, "nis")
-    if (G.CFG_CUPS == "yes") then
-        G.QT_CONFIG = Join(G.QT_CONFIG, "cups")
+
+/* @todo do we really need this?
     if (G.CFG_ICONV == "yes") then
         G.QT_CONFIG = Join(G.QT_CONFIG, "iconv")
@@ -1241 +1270 @@
      * to be included in the build key */
     DEFS = ""
+
     do i = 1 to words(G.D_FLAGS)
         opt = strip(word(G.D_FLAGS, i))
@@ -1390 +1420 @@
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_GRAPHICSSYSTEM_OPENGL")
 
+
+
+
+
+
     /* X11/Unix/Mac only configs */
 /* @todo detect what's actually relevant
-    if (G.CFG_CUPS == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_CUPS")
     if (G.CFG_ICONV == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_ICONV")
@@ -1414 +1447 @@
     if (G.CFG_NAS == "no") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_NAS")
-    if (G.CFG_NIS == "no") then
-        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_NIS")
     if (G.CFG_OPENSSL == "linked") then
         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_LINKED_OPENSSL")