From 189c0c1ad9ae2dee6359ec0cde6049fdf4c6aaf1 Mon Sep 17 00:00:00 2001
From: Gatis Paeglis <gatis.paeglis@qt.io>
Date: Tue, 19 Sep 2017 14:08:16 +0200
Subject: examples: remove traces of the Maemo and Q_WS_SIMULATOR

Maemo part:

This kind of amends what was done in qtbase 2 years and 7 months
ago by 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098.

Q_WS_SIMULATOR part:

This was all dead code, because nothing sets Q_WS_SIMULATOR in Qt 5.

Change-Id: I8af66123e332cd8911a73c11893d674b8102e474
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../recipes/forms/querywidget_mobiles.ui           | 87 ----------------------
 examples/xmlpatterns/recipes/querymainwindow.h     |  6 +-
 examples/xmlpatterns/recipes/recipes.pro           |  6 +-
 3 files changed, 2 insertions(+), 97 deletions(-)
 delete mode 100644 examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui

(limited to 'examples/xmlpatterns/recipes')

diff --git a/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui b/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui
deleted file mode 100644
index b4600e9..0000000
--- a/examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QueryWidget</class>
- <widget class="QMainWindow" name="QueryWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>453</width>
-    <height>583</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Recipes XQuery Example</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout_2">
-    <item>
-     <widget class="QTabWidget" name="tabWidget">
-      <property name="currentIndex">
-       <number>0</number>
-      </property>
-      <property name="tabsClosable">
-       <bool>false</bool>
-      </property>
-      <widget class="QWidget" name="tab_1">
-       <attribute name="title">
-        <string>Input Document</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QTextBrowser" name="inputTextEdit">
-          <property name="textInteractionFlags">
-           <set>Qt::NoTextInteraction</set>
-          </property>
-          <property name="openLinks">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="tab_2">
-       <attribute name="title">
-        <string>Query selection</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QComboBox" name="defaultQueries"/>
-        </item>
-        <item>
-         <widget class="QTextBrowser" name="queryTextEdit">
-          <property name="textInteractionFlags">
-           <set>Qt::NoTextInteraction</set>
-          </property>
-          <property name="openLinks">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-      <widget class="QWidget" name="tab_3">
-       <attribute name="title">
-        <string>Output Document</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout_4">
-        <item>
-         <widget class="QTextBrowser" name="outputTextEdit">
-          <property name="textInteractionFlags">
-           <set>Qt::NoTextInteraction</set>
-          </property>
-          <property name="openLinks">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/examples/xmlpatterns/recipes/querymainwindow.h b/examples/xmlpatterns/recipes/querymainwindow.h
index 4f8119a..25ffaab 100644
--- a/examples/xmlpatterns/recipes/querymainwindow.h
+++ b/examples/xmlpatterns/recipes/querymainwindow.h
@@ -43,11 +43,7 @@
 
 #include <QMainWindow>
 
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-    #include "ui_querywidget_mobiles.h"
-#else
-    #include "ui_querywidget.h"
-#endif
+#include "ui_querywidget.h"
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro
index 633138b..b564e0a 100644
--- a/examples/xmlpatterns/recipes/recipes.pro
+++ b/examples/xmlpatterns/recipes/recipes.pro
@@ -1,6 +1,5 @@
 QT          += widgets xmlpatterns
-FORMS       += forms/querywidget.ui \
-               forms/querywidget_mobiles.ui
+FORMS       += forms/querywidget.ui
 HEADERS     = querymainwindow.h ../shared/xmlsyntaxhighlighter.h
 RESOURCES   = recipes.qrc
 SOURCES     = main.cpp querymainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
@@ -8,6 +7,3 @@ INCLUDEPATH += ../shared/
 
 target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes
 INSTALLS += target
-
-maemo5: CONFIG += qt_example
-
-- 
cgit v1.2.1