summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2017-09-19 12:08:16 (GMT)
committerGatis Paeglis <gatis.paeglis@qt.io>2017-09-26 08:46:22 (GMT)
commit189c0c1ad9ae2dee6359ec0cde6049fdf4c6aaf1 (patch)
treeff610281f3be883435319c85e2668c7e4ba89620
parentf8a92101077943131b22011ae48b69687f51a7f1 (diff)
downloadqtxmlpatterns-189c0c1ad9ae2dee6359ec0cde6049fdf4c6aaf1.tar.gz
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>
-rw-r--r--examples/xmlpatterns/filetree/filetree.pro5
-rw-r--r--examples/xmlpatterns/recipes/forms/querywidget_mobiles.ui87
-rw-r--r--examples/xmlpatterns/recipes/querymainwindow.h6
-rw-r--r--examples/xmlpatterns/recipes/recipes.pro6
-rw-r--r--examples/xmlpatterns/schema/mainwindow.h6
-rw-r--r--examples/xmlpatterns/schema/schema.pro5
-rw-r--r--examples/xmlpatterns/schema/schema_mobiles.ui130
-rw-r--r--examples/xmlpatterns/xquery/xquery.pro2
8 files changed, 4 insertions, 243 deletions
diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro
index 4b7d5f8..cb78c40 100644
--- a/examples/xmlpatterns/filetree/filetree.pro
+++ b/examples/xmlpatterns/filetree/filetree.pro
@@ -7,8 +7,3 @@ INCLUDEPATH += ../shared/
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree
INSTALLS += target
-
-maemo5: CONFIG += qt_example
-
-maemo5: warning(This example might not fully work on Maemo platform)
-simulator: warning(This example might not fully work on Simulator platform)
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
-
diff --git a/examples/xmlpatterns/schema/mainwindow.h b/examples/xmlpatterns/schema/mainwindow.h
index e36665a..d34f145 100644
--- a/examples/xmlpatterns/schema/mainwindow.h
+++ b/examples/xmlpatterns/schema/mainwindow.h
@@ -43,11 +43,7 @@
#include <QMainWindow>
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- #include "ui_schema_mobiles.h"
-#else
- #include "ui_schema.h"
-#endif
+#include "ui_schema.h"
//! [0]
class MainWindow : public QMainWindow,
diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro
index dd56375..ded65a1 100644
--- a/examples/xmlpatterns/schema/schema.pro
+++ b/examples/xmlpatterns/schema/schema.pro
@@ -1,5 +1,5 @@
QT += widgets xmlpatterns
-FORMS += schema.ui schema_mobiles.ui
+FORMS += schema.ui
HEADERS = mainwindow.h ../shared/xmlsyntaxhighlighter.h
RESOURCES = schema.qrc
SOURCES = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
@@ -7,6 +7,3 @@ INCLUDEPATH += ../shared/
target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema
INSTALLS += target
-
-maemo5: CONFIG += qt_example
-
diff --git a/examples/xmlpatterns/schema/schema_mobiles.ui b/examples/xmlpatterns/schema/schema_mobiles.ui
deleted file mode 100644
index 009d0aa..0000000
--- a/examples/xmlpatterns/schema/schema_mobiles.ui
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SchemaMainWindow</class>
- <widget class="QMainWindow" name="SchemaMainWindow">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>187</width>
- <height>179</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>XML Schema Validation</string>
- </property>
- <widget class="QWidget" name="centralwidget">
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="sizeConstraint">
- <enum>QLayout::SetNoConstraint</enum>
- </property>
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>1</number>
- </property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>XML Schema</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QComboBox" name="schemaSelection">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maxVisibleItems">
- <number>3</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QTextBrowser" name="schemaView"/>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>XML Instance</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetNoConstraint</enum>
- </property>
- <item>
- <widget class="QComboBox" name="instanceSelection">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maxVisibleItems">
- <number>3</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QTextBrowser" name="instanceEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>8</pointsize>
- </font>
- </property>
- <property name="readOnly">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="validationStatus">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Not validated</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="validateButton">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Validate</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro
index ee1c9c8..09d0c4d 100644
--- a/examples/xmlpatterns/xquery/xquery.pro
+++ b/examples/xmlpatterns/xquery/xquery.pro
@@ -1,4 +1,2 @@
TEMPLATE = aux
EXAMPLE_FILES = globalVariables
-
-maemo5: CONFIG += qt_example