From 30c55c063d9946de319821f52db6643a9375dc43 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Aug 2020 09:12:24 +0200 Subject: [PATCH] Help/Android: Compile with namespaced Qt Task-number: QTCREATORBUG-24544 Change-Id: Id06cc623b8a0bfe365dda928cda52a97321732b2 Reviewed-by: Eike Ziller --- src/plugins/android/androidservicewidget.h | 2 ++ src/plugins/help/filtersettingspage.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/plugins/android/androidservicewidget.h b/src/plugins/android/androidservicewidget.h index cc30003b655..7a80234e4dd 100644 --- a/src/plugins/android/androidservicewidget.h +++ b/src/plugins/android/androidservicewidget.h @@ -29,8 +29,10 @@ #include #include +QT_BEGIN_NAMESPACE class QPushButton; class QTableView; +QT_END_NAMESPACE namespace Android { namespace Internal { diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 6d98f096d87..469df0d23d2 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -32,7 +32,9 @@ #ifndef HELP_NEW_FILTER_ENGINE #include "ui_filtersettingspage.h" #else +QT_BEGIN_NAMESPACE class QHelpFilterSettingsWidget; +QT_END_NAMESPACE #endif namespace Help {