diff options
Diffstat (limited to 'src/gui/util/qdesktopservices.h')
| -rw-r--r-- | src/gui/util/qdesktopservices.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h index af9aa7bec7..04a639437e 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -43,15 +43,12 @@ #define QDESKTOPSERVICES_H #include <QtCore/qstring.h> -#if QT_DEPRECATED_SINCE(5, 0) #include <QtCore/qstandardpaths.h> -#endif QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_DESKTOPSERVICES @@ -67,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, |