diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-17 12:35:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-17 12:35:29 +0100 |
| commit | 393fc2d4f5e0cbc6d6b3bd0e3c1624d5f9a15ee5 (patch) | |
| tree | 85588778b5cf605bf9f15a48495eea24ef401a92 /src/corelib/global | |
| parent | 50e2bc2aa0f46562936a3137c15a2c9b4f67afde (diff) | |
| parent | b63c721a0e8d637dd2a34cc5d335195349443366 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.5
Needed due to license header patch.
Change-Id: Id7e30490132a7c487687a0a376419e9f9b97ea41
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index de6f2401b8..f307e98dd7 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -297,6 +297,9 @@ #ifndef QT_NO_DESKTOPSERVICES # define QT_NO_DESKTOPSERVICES #endif +#ifndef QT_NO_MIMETYPE +# define QT_NO_MIMETYPE +#endif #ifndef QT_NO_SYSTEMTRAYICON # define QT_NO_SYSTEMTRAYICON #endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index 48c08e4f36..43ae101515 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -187,6 +187,9 @@ #ifndef QT_NO_DESKTOPSERVICES # define QT_NO_DESKTOPSERVICES #endif +#ifndef QT_NO_MIMETYPE +# define QT_NO_MIMETYPE +#endif #ifndef QT_NO_SYSTEMTRAYICON # define QT_NO_SYSTEMTRAYICON #endif diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index fb6e56ec7d..dec16eaef1 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -879,6 +879,12 @@ Section: Utilities Requires: Name: QDesktopServices +Feature: MIMETYPE +Description: Describes types of file or data, represented by a MIME type string. +Section: Utilities +Requires: +Name: QMimeType + Feature: SYSTEMTRAYICON Description: Provides an icon for an application in the system tray. Section: Utilities |