diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 11:40:49 +1000 |
commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /src/opengl/qglframebufferobject.cpp | |
parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
download | qt4-tools-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
-rw-r--r-- | src/opengl/qglframebufferobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 3ccefbf238..6161d9bac8 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1171,8 +1171,8 @@ void QGLFramebufferObject::drawTexture(const QPointF &point, QMacCompatGLuint te } #endif -Q_DECL_IMPORT extern int qt_defaultDpiX(); -Q_DECL_IMPORT extern int qt_defaultDpiY(); +Q_GUI_EXPORT int qt_defaultDpiX(); +Q_GUI_EXPORT int qt_defaultDpiY(); /*! \reimp */ int QGLFramebufferObject::metric(PaintDeviceMetric metric) const |