diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/gui/util | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qdesktopservices.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp index ca284eecd5..94a3343164 100644 --- a/src/gui/util/qdesktopservices.cpp +++ b/src/gui/util/qdesktopservices.cpp @@ -250,6 +250,8 @@ void QDesktopServices::unsetUrlHandler(const QString &scheme) /*! \enum QDesktopServices::StandardLocation \since 4.4 + \obsolete + Use QStandardPaths::StandardLocation This enum describes the different locations that can be queried by QDesktopServices::storageLocation and QDesktopServices::displayName. |