Changeset 170 for trunk/src/gui/text/qfontsubset.cpp

Timestamp:

Sep 9, 2009, 1:25:02 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Provided a temporary workaround for the mystic failure to build qfontsubset.cpp with QT_NO_FREETYPE removed.

File:

• trunk/src/gui/text/qfontsubset.cpp (modified) (1 diff)

trunk/src/gui/text/qfontsubset.cpp

@@ -52 +52 @@
 #ifndef QT_NO_FREETYPE
 #if defined(Q_WS_X11) || defined(Q_WS_QWS)
-#    include "private/qfontengine_ft_p.h"
+#   include "private/qfontengine_ft_p.h"
 #endif
-#include <ft2build.h>
-#include FT_FREETYPE_H
+#if defined(Q_OS_OS2) && defined(__GNUC__)
+#   ifndef QT_NO_PRINTER
+        // GCC for OS/2 version 3.3.5 CSD3 doesn't like the style of the
+        // comments in the ../3rdparty/freetype/include/freetype/freetype.h file
+        // (included by the FT_FREETYPE_H argument below). This sed command
+        //   sed -e "/^ *\/\*.*\*\/ *$/ d" freetype.h >freetype.new
+        // proves it: freetype.new stops showing the mystic "Invalid argument"
+        // compiler error generated for the original. Looks like a compiler bug.
+        // We don't fix the original this way though because it's possible that
+        // we change the compiler to a higher version lacking this bug by the
+        // time we want to remove QT_NO_PRINTER from the configuration.
+#       error "Please check the comment above this line!"
+#   endif
+#else
+#   include <ft2build.h>
+#   include FT_FREETYPE_H
+#endif
 #endif