summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-03-10 16:11:47 (GMT)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-03-10 16:16:00 (GMT)
commit1436c4f2e41100b45eed58edc5fc290fa94c976b (patch)
tree6e2480baa588f53a0a03bb42d7f9e3485f5366c5 /src/gui
parentb80466364fe6c6ca030b884f2d8df94bdfa477b9 (diff)
downloadQt-1436c4f2e41100b45eed58edc5fc290fa94c976b.zip
Qt-1436c4f2e41100b45eed58edc5fc290fa94c976b.tar.gz
Qt-1436c4f2e41100b45eed58edc5fc290fa94c976b.tar.bz2
Fixed "inconsistent dll linkage" warning on Windows.
qt_memrotate90() was declared twice, once with and once without Q_GUI_EXPORT. Reviewed-by: Trond
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qmemrotate_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index 8df0520..2911860 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -82,8 +82,9 @@ QT_BEGIN_NAMESPACE
void Q_GUI_QWS_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int)
void Q_GUI_EXPORT qt_memrotate90(const quint32*, int, int, int, quint32*, int);
+void Q_GUI_QWS_EXPORT qt_memrotate180(const quint32*, int, int, int, quint32*, int);
+void Q_GUI_QWS_EXPORT qt_memrotate270(const quint32*, int, int, int, quint32*, int);
-QT_DECL_MEMROTATE(quint32, quint32);
QT_DECL_MEMROTATE(quint32, quint16);
QT_DECL_MEMROTATE(quint16, quint32);
QT_DECL_MEMROTATE(quint16, quint16);