Changeset 91

Timestamp:

Jul 28, 2009, 3:52:18 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Added QT_NO_TABLET, QT_NO_SESSIONMANAGER. Maintain two QT_BUILD_KEY defines in qconfig.h differentiated by the DEBUG #ifdef (for the sake of the debug-and-release build), as on Windows.

File:

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

trunk/configure.cmd

@@ -41 +41 @@
 
 G.CFG_DEV           = "no"
+
+/* All defines that express the limited functionality of the OS/2 version of Qt
+ * (mostly because the relevant features are not yet implemented) */
+G.LIMITATION_DEFS   =,
+    "QT_NO_TABLET QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
+    "QT_NO_SESSIONMANAGER"
 
 
@@ -302 +308 @@
     G.CFG_PREFIX_INSTALL = "yes"
     G.CFG_SDK = ""
-    /* @todo until the relevant classes are implemented */
-    G.D_FLAGS = "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY"
+    G.D_FLAGS = G.LIMITATION_DEFS
     G.I_FLAGS = ""
     G.L_FLAGS = ""
@@ -1088 +1093 @@
         end
         else if (opt == "debug" | opt == "release") then do
-            /* the debug build is binary incompatible with the release build */
-            BUILD_CONFIG2 = Join(BUILD_CONFIG2, opt)
+            /* the debug build is binary incompatible with the release build,
+             * but a separate build key is maintained for each, so skip it now */
+             nop
         end
         else if (opt == "stl") then do
@@ -1152 +1158 @@
 
     parse value G.PLATFORM with ."-"COMPILER
-    QT_BUILD_KEY = G.CFG_USER_BUILD_KEY G.CFG_ARCH COMPILER BUILD_OPTIONS
+    QT_BUILD_KEY_PRE = G.CFG_USER_BUILD_KEY G.CFG_ARCH COMPILER
+    QT_BUILD_KEY_POST = BUILD_OPTIONS
     if (G.QT_NAMESPACE \== "") then
-        QT_BUILD_KEY = Join(QT_BUILD_KEY, G.QT_NAMESPACE)
-
-    QT_BUILD_KEY = Normalize(QT_BUILD_KEY)
+        QT_BUILD_KEY_POST = Join(QT_BUILD_KEY_POST, G.QT_NAMESPACE)
+
+    /* we maintain two separate build keys (mainly necessary for the
+     * debug-and-release build) differentiated by the DEBUG compier define */
+    QT_BUILD_KEY_RELEASE = Normalize(QT_BUILD_KEY_PRE "release" QT_BUILD_KEY_POST)
+    QT_BUILD_KEY_DEBUG = Normalize(QT_BUILD_KEY_PRE "debug" QT_BUILD_KEY_POST)
+
+    drop QT_BUILD_KEY_PRE QT_BUILD_KEY_POST
 
     /*--------------------------------------------------------------------------
@@ -1190 +1202 @@
 '#endif'G.EOL||,
 ''G.EOL||,
-'#define QT_BUILD_KEY "'QT_BUILD_KEY'"'G.EOL||,
+'#if defined(DEBUG) || defined(_DEBUG)'G.EOL||,
+'# define QT_BUILD_KEY "'QT_BUILD_KEY_DEBUG'"'G.EOL||,
+'#else'G.EOL||,
+'# define QT_BUILD_KEY "'QT_BUILD_KEY_RELEASE'"'G.EOL||,
+'#endif'G.EOL||,
 ''G.EOL||,
 '/* Machine byte-order */'G.EOL||,