diff options
| author | aavit <qt-info@nokia.com> | 2011-04-28 07:24:15 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-28 07:24:15 (GMT) |
| commit | b3f06ba0dbe2cddcd30d2176ed4dccbc7b3414b0 (patch) | |
| tree | 7bce3ac02a739e545eb4c88da4e940363afbff21 /src/corelib/global | |
| parent | ff8c99eb54f33108709f9f3107b35780a80f3f17 (diff) | |
| parent | d1c26fa169196a7c597198cd971f21588dca7051 (diff) | |
| download | Qt-b3f06ba0dbe2cddcd30d2176ed4dccbc7b3414b0.zip Qt-b3f06ba0dbe2cddcd30d2176ed4dccbc7b3414b0.tar.gz Qt-b3f06ba0dbe2cddcd30d2176ed4dccbc7b3414b0.tar.bz2 | |
Merge remote branch 'qt-fire-review/master'
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c2244cd..1b20283 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2752,7 +2752,8 @@ QT_LICENSED_MODULE(DBus) #if !(defined(Q_WS_WIN) && !defined(Q_WS_WINCE)) \ && !(defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) \ - && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE)) + && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE)) \ + && !(defined(Q_WS_QPA)) # define QT_NO_RAWFONT #endif |