Changeset 991

Timestamp:

Aug 16, 2011, 3:37:05 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Make sure Qt will build with QT_BUILD_INTERNAL.

Location:

trunk

Files:

• configure.cmd (modified) (1 diff)
• src/corelib/global/qglobal.h (modified) (1 diff)

trunk/configure.cmd

@@ -1718 +1718 @@
 
     if (G.CFG_DEV == "yes") then
-        call charout qconfig_h_new, '"#define QT_BUILD_INTERNAL'G.EOL||G.EOL
+        call charout qconfig_h_new, '#define QT_BUILD_INTERNAL'G.EOL||G.EOL
 
     /* Add turned on SQL drivers */

trunk/src/corelib/global/qglobal.h

@@ -1383 +1383 @@
    symbols that can vanish from version to version, feel free to define QT_BUILD_INTERNAL.
 */
-#if defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_MAKEDLL)
+#if defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)) && defined(QT_MAKEDLL)
 #    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
-#elif defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_DLL)
+#elif defined(QT_BUILD_INTERNAL) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)) && defined(QT_DLL)
 #    define Q_AUTOTEST_EXPORT Q_DECL_IMPORT
-#elif defined(QT_BUILD_INTERNAL) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && defined(QT_SHARED)
+#elif defined(QT_BUILD_INTERNAL) && !(defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)) && defined(QT_SHARED)
 #    define Q_AUTOTEST_EXPORT Q_DECL_EXPORT
 #else