summaryrefslogtreecommitdiffstats
path: root/examples/richtext
diff options
context:
space:
mode:
Diffstat (limited to 'examples/richtext')
-rw-r--r--examples/richtext/calendar/calendar.pro3
-rw-r--r--examples/richtext/calendar/main.cpp6
-rw-r--r--examples/richtext/calendar/mainwindow.cpp4
-rw-r--r--examples/richtext/orderform/detailsdialog.cpp30
-rw-r--r--examples/richtext/orderform/main.cpp6
-rw-r--r--examples/richtext/orderform/orderform.pro2
-rw-r--r--examples/richtext/richtext.pro2
-rw-r--r--examples/richtext/syntaxhighlighter/main.cpp6
-rw-r--r--examples/richtext/syntaxhighlighter/syntaxhighlighter.pro2
-rw-r--r--examples/richtext/textedit/textedit.cpp2
-rw-r--r--examples/richtext/textedit/textedit.pro1
11 files changed, 1 insertions, 63 deletions
diff --git a/examples/richtext/calendar/calendar.pro b/examples/richtext/calendar/calendar.pro
index 265e0e94f6..f65e8852bd 100644
--- a/examples/richtext/calendar/calendar.pro
+++ b/examples/richtext/calendar/calendar.pro
@@ -3,7 +3,6 @@ SOURCES = main.cpp \
mainwindow.cpp
# App cannot be with name "calendar" in Symbian due to same named system component.
-symbian: TARGET = calendarapp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
@@ -11,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/calendar
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/calendar/main.cpp b/examples/richtext/calendar/main.cpp
index fa94aa3ff2..808f72480b 100644
--- a/examples/richtext/calendar/main.cpp
+++ b/examples/richtext/calendar/main.cpp
@@ -46,13 +46,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow window;
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- window.show();
-#else
window.resize(640, 256);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/richtext/calendar/mainwindow.cpp b/examples/richtext/calendar/mainwindow.cpp
index ff65b7e890..c8cb833078 100644
--- a/examples/richtext/calendar/mainwindow.cpp
+++ b/examples/richtext/calendar/mainwindow.cpp
@@ -82,11 +82,7 @@ MainWindow::MainWindow()
this, SLOT(setFontSize(int)));
//! [3]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- fontSizeSpinBox->setValue(4);
-#else
fontSizeSpinBox->setValue(10);
-#endif
//! [4]
QHBoxLayout *controlsLayout = new QHBoxLayout;
diff --git a/examples/richtext/orderform/detailsdialog.cpp b/examples/richtext/orderform/detailsdialog.cpp
index 8f54bb2615..ba395ec2bb 100644
--- a/examples/richtext/orderform/detailsdialog.cpp
+++ b/examples/richtext/orderform/detailsdialog.cpp
@@ -53,13 +53,8 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
nameEdit = new QLineEdit;
addressEdit = new QTextEdit;
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- offersCheckBox = new QCheckBox(tr("Send information about\n"
- "products and special offers"));
-#else
offersCheckBox = new QCheckBox(tr("Send information about products and "
"special offers"));
-#endif
setupItemsTable();
@@ -71,30 +66,6 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
//! [0]
//! [1]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- QWidget *widgetSubscriber = new QWidget;
- QGridLayout *subscriberLayout = new QGridLayout;
- subscriberLayout->addWidget(nameLabel, 0, 0);
- subscriberLayout->addWidget(nameEdit, 0, 1);
- subscriberLayout->addWidget(addressLabel, 1, 0);
- subscriberLayout->addWidget(addressEdit, 1, 1);
- subscriberLayout->addWidget(offersCheckBox, 2, 0, 1, 2);
- widgetSubscriber->setLayout(subscriberLayout);
-
- QWidget *widgetOrder = new QWidget;
- QVBoxLayout *orderLayout = new QVBoxLayout;
- orderLayout->addWidget(itemsTable);
- widgetOrder->setLayout(orderLayout);
-
- QTabWidget *tabWidget = new QTabWidget;
- tabWidget->addTab(widgetSubscriber, "Subscriber");
- tabWidget->addTab(widgetOrder, "Order");
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addWidget(tabWidget);
- mainLayout->addWidget(buttonBox);
- setLayout(mainLayout);
-#else
QGridLayout *mainLayout = new QGridLayout;
mainLayout->addWidget(nameLabel, 0, 0);
mainLayout->addWidget(nameEdit, 0, 1);
@@ -104,7 +75,6 @@ DetailsDialog::DetailsDialog(const QString &title, QWidget *parent)
mainLayout->addWidget(offersCheckBox, 2, 1, 1, 2);
mainLayout->addWidget(buttonBox, 3, 0, 1, 3);
setLayout(mainLayout);
-#endif
setWindowTitle(title);
}
diff --git a/examples/richtext/orderform/main.cpp b/examples/richtext/orderform/main.cpp
index 7aff81d6ad..eb8155fd9a 100644
--- a/examples/richtext/orderform/main.cpp
+++ b/examples/richtext/orderform/main.cpp
@@ -47,14 +47,8 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow window;
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- windows.show();
-#else
window.resize(640, 480);
window.show();
-#endif
window.createSample();
return app.exec();
}
diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro
index 729f66c873..999b55cb96 100644
--- a/examples/richtext/orderform/orderform.pro
+++ b/examples/richtext/orderform/orderform.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index 8b36c4ba42..053f2be3c2 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/syntaxhighlighter/main.cpp b/examples/richtext/syntaxhighlighter/main.cpp
index e0e5e4f407..eecfb12bdc 100644
--- a/examples/richtext/syntaxhighlighter/main.cpp
+++ b/examples/richtext/syntaxhighlighter/main.cpp
@@ -46,13 +46,7 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow window;
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- window.show();
-#else
window.resize(640, 512);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 9abd82f40a..0f9b447a74 100644
--- a/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -10,7 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro ex
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/syntaxhighlighter
INSTALLS += target sources
-symbian: CONFIG += qt_example
wince*: {
addFiles.files = main.cpp mainwindow.cpp
@@ -18,5 +17,4 @@ wince*: {
DEPLOYMENT += addFiles
}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/richtext/textedit/textedit.cpp b/examples/richtext/textedit/textedit.cpp
index e765f58b23..d76d9dec2d 100644
--- a/examples/richtext/textedit/textedit.cpp
+++ b/examples/richtext/textedit/textedit.cpp
@@ -67,7 +67,7 @@
#include <QPrintPreviewDialog>
#include <QMimeData>
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
const QString rsrcPath = ":/images/mac";
#else
const QString rsrcPath = ":/images/win";
diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index b364a00f98..ffbf9a7222 100644
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -20,4 +20,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
INSTALLS += target sources
QT += widgets printsupport
-symbian: CONFIG += qt_example
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 15:21:38 +0000