diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-09-29 10:46:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-15 18:45:56 +0000 |
| commit | d976cee1e524006a3c813c23d46fd0404d1cac08 (patch) | |
| tree | f5579050748cdacff85418660f4667c6a6f5bdb5 /src/platformsupport/themes | |
| parent | f25afef61da17088fc9cdeb15be7144ef0c7c867 (diff) | |
make use of QT_REQUIRE_CONFIG() in platformsupport modules
Change-Id: I26fbe75c65c10d68454e64e306f7155367e66cf6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/platformsupport/themes')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h index a383ef86fc..234ff60584 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h @@ -52,9 +52,9 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> -#ifndef QT_NO_SYSTEMTRAYICON +QT_REQUIRE_CONFIG(systemtrayicon); #include <QIcon> #include <QTemporaryFile> @@ -165,5 +165,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_SYSTEMTRAYICON #endif // QDBUSTRAYICON_H diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h index 1bdc855c3c..3f75555579 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustraytypes_p.h @@ -52,7 +52,9 @@ // We mean it. // -#ifndef QT_NO_SYSTEMTRAYICON +#include <QtGui/private/qtguiglobal_p.h> + +QT_REQUIRE_CONFIG(systemtrayicon); #include <QObject> #include <QString> @@ -104,5 +106,4 @@ Q_DECLARE_METATYPE(QXdgDBusImageStruct) Q_DECLARE_METATYPE(QXdgDBusImageVector) Q_DECLARE_METATYPE(QXdgDBusToolTipStruct) -#endif // QT_NO_SYSTEMTRAYICON #endif // QDBUSTRAYTYPES_P_H diff --git a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h index 776e1b23ef..3f8fca7ac0 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qstatusnotifieritemadaptor_p.h @@ -62,9 +62,9 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> -#ifndef QT_NO_SYSTEMTRAYICON +QT_REQUIRE_CONFIG(systemtrayicon); #include <QtCore/QObject> #include <QtDBus/QtDBus> @@ -200,5 +200,5 @@ private: }; QT_END_NAMESPACE -#endif // QT_NO_SYSTEMTRAYICON + #endif // QSTATUSNOTIFIERITEMADAPTER_P_H |