Changeset 95 for trunk/src/gui/text

Timestamp:

Jul 31, 2009, 1:13:57 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added OS/2 stubs for platform-specific parts of all key GUI classes. Non-key classes are temporarily disabled with QT_NO_ defines.

Location:

trunk/src/gui/text

Files:

• qfont_pm.cpp (added)
• qfontdatabase.cpp (modified) (2 diffs)
• qfontdatabase_pm.cpp (added)
• qfontengine_p.h (modified) (1 diff)
• text.pri (modified) (1 diff)

trunk/src/gui/text/qfontdatabase.cpp

@@ -876 +876 @@
 #elif defined(Q_WS_WIN)
 #  include "qfontdatabase_win.cpp"
+
+
 #elif defined(Q_WS_QWS)
 #  include "qfontdatabase_qws.cpp"
@@ -2419 +2421 @@
 */
 
-/*! 
+/*!
     \fn bool QFontDatabase::supportsThreadedFontRendering()
     \since 4.4

trunk/src/gui/text/qfontengine_p.h

@@ -323 +323 @@
     virtual void recalcAdvances(QGlyphLayout *, QTextEngine::ShaperFlags) const;
 
-#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
+#if !defined(Q_WS_X11) && !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
     void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si);
 #endif

trunk/src/gui/text/text.pri

@@ -74 +74 @@
                 text/qfontengine_win.cpp
         HEADERS += text/qfontengine_win_p.h
+
+
+
+
+
 }