diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
| commit | ccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch) | |
| tree | 40aaca99471edc709d38e6f82153576bad86747f /src/plugins/platformthemes | |
| parent | 8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff) | |
| parent | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/plugins/platformthemes/platformthemes.pro
src/printsupport/kernel/qplatformprintdevice.cpp
Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'src/plugins/platformthemes')
| -rw-r--r-- | src/plugins/platformthemes/platformthemes.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platformthemes/platformthemes.pro b/src/plugins/platformthemes/platformthemes.pro index 06ffc4cc9f..3bcc659199 100644 --- a/src/plugins/platformthemes/platformthemes.pro +++ b/src/plugins/platformthemes/platformthemes.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs QT_FOR_CONFIG += widgets-private -qtConfig(dbus):qtConfig(regularexpression): SUBDIRS += xdgdesktopportal +qtConfig(dbus):qtConfig(regularexpression):qtConfig(mimetype): SUBDIRS += xdgdesktopportal qtHaveModule(widgets):qtConfig(gtk3): SUBDIRS += gtk3 |