diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-28 18:47:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-28 18:47:18 (GMT) |
| commit | bc0d5838a3bb884c1de782145ce0d8501710c883 (patch) | |
| tree | bccda364e78f28424f8481aea498847f5a1a9eb4 /src/corelib | |
| parent | 5bda8bf138d4dab5d31496a8472044ad34589d3f (diff) | |
| parent | b3f06ba0dbe2cddcd30d2176ed4dccbc7b3414b0 (diff) | |
| download | Qt-bc0d5838a3bb884c1de782145ce0d8501710c883.zip Qt-bc0d5838a3bb884c1de782145ce0d8501710c883.tar.gz Qt-bc0d5838a3bb884c1de782145ce0d8501710c883.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (31 commits)
Make QtQuick2 compile on QPA
Use maximum ascent/descent/leading from fallback fonts in shaping
Another ugly hack to make bidi cursor work with Core Text
Make sure layoutData exist before checking for string direction
Removed warning from QPixmap::handle().
Take leading space width into account for painting and selection
doc: Simplify language in QGlyphs docs
doc: Minor cleanup in QGlyphs docs
Remove extra comma at the end of enum list
Fix compilation with Qt3Support
Don't transform glyph positions for Core Graphics paint engine
Skip linearGradientSymmetry test on QWS.
Turn on HarfBuzz support for Mac/Cocoa
Support visual cursor movement for BIDI text
Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac
Revert "Switch the default graphics system to raster on Mac."
Fix an race condition in the auto test.
Made linearGradientSymmetry test pass on qreal=float platforms.
Make sure #ifdef'd tests still have main() function
Long live QRawFont!
...
Diffstat (limited to 'src/corelib')
| -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 9434eb2..49f5f98 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2755,7 +2755,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 |