diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-05 10:49:33 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-05 10:56:30 (GMT) |
| commit | 4dc5dafb4c5185a81446463382e7eab2c3a0b21e (patch) | |
| tree | eb25d8d59f6420a7be762ef958221f9f6721d942 /src/declarative | |
| parent | 0e12c56a972320a608bbb8c31b7726674f000bb1 (diff) | |
| download | Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.zip Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.tar.gz Qt-4dc5dafb4c5185a81446463382e7eab2c3a0b21e.tar.bz2 | |
Put all the declarations of qt_defaultDpi{,X,Y}() in one place
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextlayout.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp index 31819f5..987aa23 100644 --- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp @@ -63,9 +63,6 @@ public: QVector<QChar> chars; }; -Q_GUI_EXPORT extern int qt_defaultDpiX(); -Q_GUI_EXPORT extern int qt_defaultDpiY(); - namespace { class DrawTextItemRecorder: public QPaintEngine { diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 0f884b6..5b83b4e 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -42,13 +42,12 @@ #include "private/qdeclarativevaluetype_p.h" #include "private/qdeclarativemetatype_p.h" +#include "private/qfont_p.h" #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE -Q_GUI_EXPORT int qt_defaultDpi(); - template<typename T> int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName) { |