9 files changed, 14 insertions, 31 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 55f1e0d379..b805a3297f 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -70,7 +70,7 @@ struct QImageData;
 class QImageDataMisc; // internal
 #ifndef QT_NO_IMAGE_TEXT
 #if QT_DEPRECATED_SINCE(5, 0)
-class Q_GUI_EXPORT QImageTextKeyLang {
+class QT_DEPRECATED QImageTextKeyLang {
 public:
     QImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
     QImageTextKeyLang() { }
@@ -270,11 +270,11 @@ public:
     void setText(const QString &key, const QString &value);
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    inline QString text(const char* key, const char* lang=0) const;
-    inline QList<QImageTextKeyLang> textList() const;
-    inline QStringList textLanguages() const;
-    inline QString text(const QImageTextKeyLang&) const;
-    inline void setText(const char* key, const char* lang, const QString&);
+    QT_DEPRECATED inline QString text(const char* key, const char* lang=0) const;
+    QT_DEPRECATED inline QList<QImageTextKeyLang> textList() const;
+    QT_DEPRECATED inline QStringList textLanguages() const;
+    QT_DEPRECATED inline QString text(const QImageTextKeyLang&) const;
+    QT_DEPRECATED inline void setText(const char* key, const char* lang, const QString&);
 #endif
 #endif
 
@@ -382,6 +382,7 @@ inline void QImage::setText(const char* key, const char* lang, const QString &s)
     setText(k, s);
 }
 #endif
+
 inline int QImage::numColors() const
 {
     return colorCount();
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index a3844ca3ff..de76321f0a 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -145,7 +145,7 @@ public:
     inline void scroll(int dx, int dy, int x, int y, int width, int height, QRegion *exposed = 0);
     void scroll(int dx, int dy, const QRect &rect, QRegion *exposed = 0);
 
-#ifdef QT_DEPRECATED
+#if QT_DEPRECATED_SINCE(5, 0)
     QT_DEPRECATED int serialNumber() const;
 #endif
     qint64 cacheKey() const;
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 7a3eb48235..93dea41de9 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -764,10 +764,12 @@ public:
         friend class QApplicationPrivate;
     };
 
+#if QT_DEPRECATED_SINCE(5, 0)
     QT_DEPRECATED enum DeviceType {
         TouchScreen,
         TouchPad
     };
+#endif
 
     QTouchEvent(QEvent::Type eventType,
                 QTouchDevice *device = 0,
@@ -778,7 +780,9 @@ public:
 
     inline QWindow *window() const { return _window; }
     inline QObject *target() const { return _target; }
+#if QT_DEPRECATED_SINCE(5, 0)
     QT_DEPRECATED inline QTouchEvent::DeviceType deviceType() const { return static_cast<DeviceType>(int(_device->type())); }
+#endif
     inline Qt::TouchPointStates touchPointStates() const { return _touchPointStates; }
     inline const QList<QTouchEvent::TouchPoint> &touchPoints() const { return _touchPoints; }
     inline QTouchDevice *device() const { return _device; }
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 057778d488..b80fc86f45 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -1088,7 +1088,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QMatrix4x4 &);
 Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QMatrix4x4 &);
 #endif
 
-#ifdef QT_DEPRECATED
+#if QT_DEPRECATED_SINCE(5, 0)
 template <int N, int M>
 QT_DEPRECATED QMatrix4x4 qGenericMatrixToMatrix4x4(const QGenericMatrix<N, M, qreal>& matrix)
 {
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index 1da5982c28..6b5eb14f5f 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -923,15 +923,6 @@ QMatrix &QMatrix::rotate(qreal a)
 */
 
 /*!
-    \obsolete
-    \fn qreal QMatrix::det() const
-
-    Returns the matrix's determinant.
-
-    \sa determinant()
-*/
-
-/*!
     \since 4.6
     \fn qreal QMatrix::determinant() const
 
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 2b438aae11..7acc962afa 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -101,9 +101,6 @@ public:
 
     bool isInvertible() const { return !qFuzzyIsNull(_m11*_m22 - _m12*_m21); }
     qreal determinant() const { return _m11*_m22 - _m12*_m21; }
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED qreal det() const { return _m11*_m22 - _m12*_m21; }
-#endif
 
     QMatrix inverted(bool *invertible = 0) const;
 
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 865e226f1c..48b0c00014 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -4257,11 +4257,6 @@ void QRegion::setRects(const QRect *rects, int num)
     }
 }
 
-int QRegion::numRects() const
-{
-    return (d->qt_rgn ? d->qt_rgn->numRects : 0);
-}
-
 int QRegion::rectCount() const
 {
     return (d->qt_rgn ? d->qt_rgn->numRects : 0);
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 1aaa4279d2..aa8b21b624 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -113,9 +113,6 @@ public:
     QRect boundingRect() const;
     QVector<QRect> rects() const;
     void setRects(const QRect *rect, int num);
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED int numRects() const;
-#endif
     int rectCount() const;
 
     const QRegion operator|(const QRegion &r) const;
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 87e850d09c..04a639437e 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -43,9 +43,7 @@
 #define QDESKTOPSERVICES_H
 
 #include <QtCore/qstring.h>
-#if QT_DEPRECATED_SINCE(5, 0)
 #include <QtCore/qstandardpaths.h>
-#endif
 
 QT_BEGIN_HEADER
 
@@ -66,7 +64,7 @@ public:
     static void unsetUrlHandler(const QString &scheme);
 
 #if QT_DEPRECATED_SINCE(5, 0)
-    enum StandardLocation {
+    QT_DEPRECATED enum StandardLocation {
         DesktopLocation,
         DocumentsLocation,
         FontsLocation,