summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-02-01 10:19:07 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 11:06:19 +0100
commitb44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 (patch)
treefd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b /src/gui/text/qfontdatabase.cpp
parent9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393 (diff)
Windows: Fix inclusion of <windows.h>
- Always use <qt_windows.h> as the last file to be included. - Remove it from some headers, use Qt::HANDLE instead of HANDLE. - Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE. - Add NOMINMAX to qt_windows.h to avoid problems with the min/max macros. - Remove <windows.h> from qplatformdefs.h (VS2005) Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
-rw-r--r--src/gui/text/qfontdatabase.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 189e111f38..3ef28b8e50 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -552,11 +552,6 @@ public:
struct ApplicationFont {
QString fileName;
QByteArray data;
-#if defined(Q_OS_WIN)
- HANDLE handle;
- bool memoryFont;
- QVector<FONTSIGNATURE> signatures;
-#endif
QStringList families;
};
QVector<ApplicationFont> applicationFonts;