manual test, menus: use Popup.popupType

Now that Popup has a popupType API, use it in favor
of AA_DontUseNativeMenuWindows.

Change-Id: I6b666e9c36f5d8b95701ac6a94c29ac3d7a6d206
Reviewed-by: Mitch Curtis <[email protected]>

1 files changed, 14 insertions, 17 deletions

diff --git a/tests/manual/quickcontrols/menus/cppsettings.cpp b/tests/manual/quickcontrols/menus/cppsettings.cpp
index e06c59247f..589cea916b 100644
--- a/tests/manual/quickcontrols/menus/cppsettings.cpp
+++ b/tests/manual/quickcontrols/menus/cppsettings.cpp
@@ -9,26 +9,9 @@ CppSettings::CppSettings(QObject *parent) :
     QObject(parent),
     mSettings("QtProject", "menus")
 {
-    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuWindows, dontUseNativeMenuWindows());
     QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, dontUseNativeMenuBar());
 }
 
-bool CppSettings::dontUseNativeMenuWindows() const
-{
-    return mSettings.value("dontUseNativeMenuWindows").toBool();
-}
-
-void CppSettings::setDontUseNativeMenuWindows(bool dontUseNativeMenuWindows)
-{
-    const bool oldValue = this->dontUseNativeMenuWindows();
-    if (dontUseNativeMenuWindows == oldValue)
-        return;
-
-    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuWindows, dontUseNativeMenuWindows);
-    mSettings.setValue("dontUseNativeMenuWindows", dontUseNativeMenuWindows);
-    emit dontUseNativeMenuWindowsChanged();
-}
-
 bool CppSettings::dontUseNativeMenuBar() const
 {
     return mSettings.value("dontUseNativeMenuBar").toBool();
@@ -44,3 +27,17 @@ void CppSettings::setDontUseNativeMenuBar(bool dontUseNativeMenuBar)
     mSettings.setValue("dontUseNativeMenuBar", dontUseNativeMenuBar);
     emit dontUseNativeMenuBarChanged();
 }
+
+int CppSettings::popupType() const
+{
+    return mSettings.value("popupType").toInt();
+}
+
+void CppSettings::setPopupType(int newPopupType)
+{
+    const int oldValue = popupType();
+    if (oldValue == newPopupType)
+        return;
+    mSettings.setValue("popupType", newPopupType);
+    emit popupTypeChanged();
+}