diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 12:42:32 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-06-23 12:44:08 (GMT) |
| commit | f65ed7b51a573dd8429feecc19c7abe8a0a36114 (patch) | |
| tree | 5ce70bc3ca67573b4a3b07c13e1a8a8be520f4bd /src/gui/text/qfontdatabase.cpp | |
| parent | 3464a05a94c4e638d91b2151d6aad70f78ea3087 (diff) | |
| download | Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.zip Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.tar.gz Qt-f65ed7b51a573dd8429feecc19c7abe8a0a36114.tar.bz2 | |
Remove some warnings in the Cocoa build.
After discussing with some of the Objective-C
people I have finally got a fair number of the
warnings to disappear in both 10.5 and 10.6. I
also took the opportunity to remove a bunch of
other warnings.
Reviewed by: Morten Sørvig
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 52f4b34..06d4a36 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -442,7 +442,7 @@ QtFontFoundry *QtFontFamily::foundry(const QString &f, bool create) // ### copied to tools/makeqpf/qpf2.cpp -#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN) || defined(Q_WS_MAC) +#if (defined(Q_WS_QWS) && !defined(QT_NO_FREETYPE)) || defined(Q_WS_WIN) || (defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA)) // see the Unicode subset bitfields in the MSDN docs static int requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] = { // Any, |