whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtBase examples: Remove Maemo/Symbian-specific code. 

- Maemo/Symbian are no longer supported and QWidget-based examples
  are no longer supposed to run on mobile platforms, so, remove any
  Maemo/Symbian or mobile-specific code from source files and
  profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.

Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
bb10
Friedemann Kleint 2011-10-18 09:54:31 +02:00 committed by Qt by Nokia
parent 08e2485860
commit 87274e272d
501 changed files with 26 additions and 4019 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/animation/animatedtiles/animatedtiles.pro
View File

@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000D7D1
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

4
examples/animation/animatedtiles/main.cpp
View File

@ -210,11 +210,7 @@ int main(int argc, char **argv)
view->setBackgroundBrush(bgPix);
view->setCacheMode(QGraphicsView::CacheBackground);
view->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
#ifdef Q_OS_SYMBIAN
view->showMaximized();
#else
view->show();
#endif
QStateMachine states;
states.addState(rootState);

5
examples/animation/appchooser/appchooser.pro
View File

@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000E3F5
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

4
examples/animation/appchooser/main.cpp
View File

@ -164,12 +164,8 @@ int main(int argc, char **argv)
machine.setInitialState(group);
machine.start();
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
window.showMaximized();
#else
window.resize(300, 300);
window.show();
#endif
return app.exec();
}

5
examples/animation/easing/easing.pro
View File

@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000E3F6
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

6
examples/animation/easing/main.cpp
View File

@ -47,14 +47,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
Window w;
#if defined(Q_OS_SYMBIAN)
w.showMaximized();
#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
w.show();
#else
w.resize(400, 400);
w.show();
#endif
return app.exec();
}

4
examples/animation/easing/window.cpp
View File

@ -42,11 +42,7 @@
Window::Window(QWidget *parent)
: QWidget(parent),
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
m_iconSize(32, 32)
#else
m_iconSize(64, 64)
#endif
{
m_ui.setupUi(this);
QButtonGroup *buttonGroup = findChild<QButtonGroup *>(); // ### workaround for uic in 4.4

5
examples/animation/moveblocks/main.cpp
View File

@ -310,13 +310,8 @@ int main(int argc, char **argv)
machine.start();
//![9]
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
window.showMaximized();
window.fitInView(scene.sceneRect() );
#else
window.resize(300, 300);
window.show();
#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));

5
examples/animation/moveblocks/moveblocks.pro
View File

@ -6,9 +6,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000E3F7
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

4
examples/animation/states/main.cpp
View File

@ -277,11 +277,7 @@ int main(int argc, char *argv[])
GraphicsView view(&scene);
#if defined(Q_OS_SYMBIAN)
view.showMaximized();
#else
view.show();
#endif
return app.exec();
}

5
examples/animation/states/states.pro
View File

@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000E3F8
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

25
examples/animation/stickman/main.cpp
View File

@ -56,11 +56,6 @@ int main(int argc, char **argv)
StickMan *stickMan = new StickMan;
stickMan->setDrawSticks(false);
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
RectButton *buttonJump = new RectButton("Jump"); buttonJump->setPos(100, 125);
RectButton *buttonDance = new RectButton("Dance"); buttonDance->setPos(100, 200);
RectButton *buttonChill = new RectButton("Chill"); buttonChill->setPos(100, 275);
#else
QGraphicsTextItem *textItem = new QGraphicsTextItem();
textItem->setHtml("<font color=\"white\"><b>Stickman</b>"
"<p>"
@ -77,18 +72,11 @@ int main(int argc, char **argv)
qreal w = textItem->boundingRect().width();
QRectF stickManBoundingRect = stickMan->mapToScene(stickMan->boundingRect()).boundingRect();
textItem->setPos(-w / 2.0, stickManBoundingRect.bottom() + 25.0);
#endif
QGraphicsScene scene;
scene.addItem(stickMan);
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
scene.addItem(buttonJump);
scene.addItem(buttonDance);
scene.addItem(buttonChill);
#else
scene.addItem(textItem);
#endif
scene.setBackgroundBrush(Qt::black);
GraphicsView view;
@ -101,28 +89,15 @@ int main(int argc, char **argv)
view.resize(sceneRect.width() + 100, sceneRect.height() + 100);
view.setSceneRect(sceneRect);
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
view.showMaximized();
view.fitInView(scene.sceneRect(), Qt::KeepAspectRatio);
#else
view.show();
view.setFocus();
#endif
LifeCycle cycle(stickMan, &view);
cycle.setDeathAnimation(":/animations/dead");
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
cycle.addActivity(":/animations/jumping", Qt::Key_J, buttonJump, SIGNAL(clicked()));
cycle.addActivity(":/animations/dancing", Qt::Key_D, buttonDance, SIGNAL(clicked()));
cycle.addActivity(":/animations/chilling", Qt::Key_C, buttonChill, SIGNAL(clicked()));
#else
cycle.addActivity(":/animations/jumping", Qt::Key_J);
cycle.addActivity(":/animations/dancing", Qt::Key_D);
cycle.addActivity(":/animations/chilling", Qt::Key_C);
#endif
cycle.start();

5
examples/animation/stickman/stickman.pro
View File

@ -20,9 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000E3F9
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

3
examples/dbus/complexpingpong/complexping.pro
View File

@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/complexpingpong/complexpong.pro
View File

@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/dbus-chat/dbus-chat.pro
View File

@ -17,8 +17,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

2
examples/dbus/dbus.pro
View File

@ -14,6 +14,4 @@ sources.files = *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus
INSTALLS += sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

3
examples/dbus/listnames/listnames.pro
View File

@ -14,7 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/pingpong/ping.pro
View File

@ -15,7 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/pingpong/pong.pro
View File

@ -15,7 +15,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/remotecontrolledcar/car/car.pro
View File

@ -18,8 +18,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

3
examples/dbus/remotecontrolledcar/controller/controller.pro
View File

@ -19,8 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
simulator: warning(This example does not work on Simulator platform)

2
examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
View File

@ -7,6 +7,4 @@ sources.files = *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar
INSTALLS += sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

2
examples/desktop/desktop.pro
View File

@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

4
examples/desktop/screenshot/screenshot.pro
View File

@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/desktop/screenshot
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

4
examples/dialogs/classwizard/classwizard.pro
View File

@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

4
examples/dialogs/configdialog/configdialog.pro
View File

@ -11,11 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
INSTALLS += target sources
symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

4
examples/dialogs/dialogs.pro
View File

@ -5,7 +5,7 @@ SUBDIRS = classwizard \
tabdialog \
trivialwizard
!symbian:!wince*: SUBDIRS += licensewizard \
!wince*: SUBDIRS += licensewizard \
extension \
findfiles
@ -16,6 +16,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
INSTALLS += sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

2
examples/dialogs/extension/extension.pro
View File

@ -8,7 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

35
examples/dialogs/extension/finddialog.cpp
View File

@ -74,42 +74,11 @@ FindDialog::FindDialog(QWidget *parent)
//! [2]
//! [3]
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
// Create menu
QMenu *menu = new QMenu(this);
// Create Find menu item
menu->addAction(tr("Find"));
// Create More menu item
QAction *moreAction = menu->addAction(tr("More"));
moreAction->setCheckable(true);
// Create Options CBA
QAction *optionAction = new QAction(tr("Options"), this);
// Set defined menu into Options button
optionAction->setMenu(menu);
optionAction->setSoftKeyRole(QAction::PositiveSoftKey);
addAction(optionAction);
// Connect More menu item to setVisible slot
connect(moreAction, SIGNAL(triggered(bool)), extension, SLOT(setVisible(bool)));
// Create Exit CBA
QAction *backSoftKeyAction = new QAction(QString(tr("Exit")), this);
backSoftKeyAction->setSoftKeyRole(QAction::NegativeSoftKey);
// Exit button closes the application
connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
addAction(backSoftKeyAction);
#else
buttonBox = new QDialogButtonBox(Qt::Vertical);
buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
#endif
QVBoxLayout *extensionLayout = new QVBoxLayout;
extensionLayout->setMargin(0);
@ -130,13 +99,9 @@ FindDialog::FindDialog(QWidget *parent)
leftLayout->addWidget(fromStartCheckBox);
QGridLayout *mainLayout = new QGridLayout;
#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
mainLayout->setSizeConstraint(QLayout::SetFixedSize);
#endif
mainLayout->addLayout(leftLayout, 0, 0);
#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_SIMULATOR)
mainLayout->addWidget(buttonBox, 0, 1);
#endif
mainLayout->addWidget(extension, 1, 0, 1, 2);
mainLayout->setRowStretch(2, 1);

4
examples/dialogs/extension/main.cpp
View File

@ -47,11 +47,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
FindDialog dialog;
#ifdef Q_OS_SYMBIAN
dialog.showMaximized();
#else
dialog.show();
#endif
return app.exec();
}

2
examples/dialogs/findfiles/findfiles.pro
View File

@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

4
examples/dialogs/findfiles/main.cpp
View File

@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Window window;
#ifdef Q_OS_SYMBIAN
window.showMaximized();
#else
window.show();
#endif
return app.exec();
}

9
examples/dialogs/findfiles/window.cpp
View File

@ -77,9 +77,7 @@ Window::Window(QWidget *parent)
setLayout(mainLayout);
setWindowTitle(tr("Find Files"));
#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
resize(700, 300);
#endif
}
//! [1]
@ -193,11 +191,7 @@ void Window::showFiles(const QStringList &files)
filesTable->setItem(row, 1, sizeItem);
}
filesFoundLabel->setText(tr("%1 file(s) found").arg(files.size()) +
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
(" (Select file to open it)"));
#else
(" (Double click on a file to open it)"));
#endif
filesFoundLabel->setWordWrap(true);
}
//! [8]
@ -218,9 +212,6 @@ QComboBox *Window::createComboBox(const QString &text)
comboBox->setEditable(true);
comboBox->addItem(text);
comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
comboBox->setMinimumContentsLength(3);
#endif
return comboBox;
}
//! [10]

2
examples/dialogs/licensewizard/licensewizard.cpp
View File

@ -60,7 +60,7 @@ LicenseWizard::LicenseWizard(QWidget *parent)
//! [2]
//! [3]
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
//! [3] //! [4]
setWizardStyle(ModernStyle);
#endif

4
examples/dialogs/licensewizard/licensewizard.pro
View File

@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets printsupport
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

4
examples/dialogs/sipdialog/sipdialog.pro
View File

@ -8,12 +8,8 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
INSTALLS += target sources
symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

12
examples/dialogs/standarddialogs/dialog.cpp
View File

@ -184,19 +184,7 @@ Dialog::Dialog(QWidget *parent)
layout->addWidget(errorButton, 14, 0);
layout->addWidget(errorLabel, 14, 1);
layout->addWidget(native, 15, 0);
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
QWidget *widget = new QWidget;
widget->setLayout(layout);
QScrollArea *scrollArea = new QScrollArea(this);
scrollArea->setWidget(widget);
QHBoxLayout *mainLayout = new QHBoxLayout;
mainLayout->addWidget(scrollArea);
setLayout(mainLayout);
#else
setLayout(layout);
#endif
setWindowTitle(tr("Standard Dialogs"));
}

4
examples/dialogs/standarddialogs/main.cpp
View File

@ -56,11 +56,7 @@ int main(int argc, char *argv[])
app.installTranslator(translator);
Dialog dialog;
#ifdef Q_OS_SYMBIAN
dialog.showMaximized();
#else
dialog.show();
#endif
return app.exec();
}

2
examples/dialogs/standarddialogs/standarddialogs.pro
View File

@ -8,8 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
INSTALLS += target sources
symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
QT += widgets
maemo5: CONFIG += qt_example

4
examples/dialogs/tabdialog/main.cpp
View File

@ -53,11 +53,7 @@ int main(int argc, char *argv[])
fileName = ".";
TabDialog tabdialog(fileName);
#ifdef Q_OS_SYMBIAN
tabdialog.showMaximized();
#else
tabdialog.show();
#endif
return app.exec();
}

4
examples/dialogs/tabdialog/tabdialog.pro
View File

@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
INSTALLS += target sources
symbian: CONFIG += qt_example
wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)

4
examples/dialogs/trivialwizard/trivialwizard.cpp
View File

@ -128,11 +128,7 @@ int main(int argc, char *argv[])
wizard.addPage(createConclusionPage());
wizard.setWindowTitle("Trivial Wizard");
#ifdef Q_OS_SYMBIAN
wizard.showMaximized();
#else
wizard.show();
#endif
return app.exec();
}

3
examples/dialogs/trivialwizard/trivialwizard.pro
View File

@ -6,8 +6,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
simulator: warning(This example might not fully work on Simulator platform)

1
examples/draganddrop/draganddrop.pro
View File

@ -6,7 +6,6 @@ SUBDIRS = draggableicons \
puzzle
wince*: SUBDIRS -= dropsite
symbian: SUBDIRS -= dropsite
# install
sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop

5
examples/draganddrop/draggableicons/draggableicons.pro
View File

@ -9,9 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggableicons
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000C615
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

3
examples/draganddrop/draggableicons/dragwidget.cpp
View File

@ -46,10 +46,7 @@
DragWidget::DragWidget(QWidget *parent)
: QFrame(parent)
{
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
#else
setMinimumSize(200, 200);
#endif
setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
setAcceptDrops(true);

4
examples/draganddrop/draggableicons/main.cpp
View File

@ -55,11 +55,7 @@ int main(int argc, char *argv[])
mainWidget.setLayout(horizontalLayout);
mainWidget.setWindowTitle(QObject::tr("Draggable Icons"));
#ifdef Q_OS_SYMBIAN
mainWidget.showMaximized();
#else
mainWidget.show();
#endif
return app.exec();
}

7
examples/draganddrop/draggabletext/draggabletext.pro
View File

@ -11,10 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/draggabletext
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000CF64
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

4
examples/draganddrop/draggabletext/main.cpp
View File

@ -47,10 +47,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
DragWidget window;
#ifdef Q_OS_SYMBIAN
window.showMaximized();
#else
window.show();
#endif
return app.exec();
}

4
examples/draganddrop/dropsite/dropsite.pro
View File

@ -10,9 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/dropsite
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

6
examples/draganddrop/fridgemagnets/dragwidget.cpp
View File

@ -65,11 +65,7 @@ DragWidget::DragWidget(QWidget *parent)
wordLabel->show();
wordLabel->setAttribute(Qt::WA_DeleteOnClose);
x += wordLabel->width() + 2;
#if defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
if (x >= 345) {
#else
if (x >= 245) {
#endif
x = 5;
y += wordLabel->height() + 2;
}
@ -78,12 +74,10 @@ DragWidget::DragWidget(QWidget *parent)
//! [1]
//! [2]
#ifndef Q_WS_S60
//Fridge magnets is used for demoing Qt on S60 and themed backgrounds look better than white
QPalette newPalette = palette();
newPalette.setColor(QPalette::Window, Qt::white);
setPalette(newPalette);
#endif
setMinimumSize(400, qMax(200, y));
setWindowTitle(tr("Fridge Magnets"));

6
examples/draganddrop/fridgemagnets/fridgemagnets.pro
View File

@ -11,11 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/fridgemagnets
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000C610
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example

4
examples/draganddrop/fridgemagnets/main.cpp
View File

@ -51,15 +51,11 @@ int main(int argc, char *argv[])
#endif
DragWidget window;
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
window.showMaximized();
#else
bool smallScreen = QApplication::arguments().contains("-small-screen");
if (smallScreen)
window.showFullScreen();
else
window.show();
#endif
return app.exec();
}

4
examples/draganddrop/puzzle/main.cpp
View File

@ -49,10 +49,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
MainWindow window;
window.openImage(":/images/example.jpg");
#ifdef Q_OS_SYMBIAN
window.showMaximized();
#else
window.show();
#endif
return app.exec();
}

4
examples/draganddrop/puzzle/mainwindow.cpp
View File

@ -138,11 +138,7 @@ void MainWindow::setupWidgets()
{
QFrame *frame = new QFrame;
QHBoxLayout *frameLayout = new QHBoxLayout(frame);
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
puzzleWidget = new PuzzleWidget(260);
#else
puzzleWidget = new PuzzleWidget(400);
#endif
piecesList = new PiecesList(puzzleWidget->pieceSize(), this);

8
examples/draganddrop/puzzle/puzzle.pro
View File

@ -15,17 +15,9 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/draganddrop/puzzle
INSTALLS += target sources
symbian:{
TARGET.UID3 = 0xA000CF65
CONFIG += qt_example
addFile.files = example.jpg
addFile.path = .
DEPLOYMENT += addFile
}
wince*: {
addFile.files = example.jpg
addFile.path = .
DEPLOYMENT += addFile
}
QT += widgets
maemo5: CONFIG += qt_example

3
examples/effects/blurpicker/blurpicker.cpp
View File

@ -139,9 +139,6 @@ void BlurPicker::keyPressEvent(QKeyEvent *event)
void BlurPicker::resizeEvent(QResizeEvent */*event*/)
{
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
fitInView(sceneRect(), Qt::KeepAspectRatio);
#endif
}
void BlurPicker::mousePressEvent(QMouseEvent *event)

2
examples/effects/blurpicker/blurpicker.pro
View File

@ -9,5 +9,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker
INSTALLS += target sources
QT += widgets
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example

4
examples/effects/blurpicker/main.cpp
View File

@ -48,12 +48,8 @@ int main(int argc, char **argv)
BlurPicker blurPicker;
blurPicker.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Application Picker"));
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
blurPicker.showMaximized();
#else
blurPicker.setFixedSize(400, 300);
blurPicker.show();
#endif
return app.exec();
}

4
examples/effects/fademessage/fademessage.cpp
View File

@ -124,9 +124,5 @@ void FadeMessage::setupScene()
connect(press, SIGNAL(clicked()), SLOT(togglePopup()));
m_scene.addWidget(press);
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
press->move(200, 210);
#else
press->move(300, 500);
#endif
}

2
examples/effects/fademessage/fademessage.pro
View File

@ -12,8 +12,6 @@ sources.files = $$SOURCES \
fademessage.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
QT += widgets
simulator: warning(This example might not fully work on Simulator platform)

4
examples/effects/fademessage/main.cpp
View File

@ -48,12 +48,8 @@ int main(int argc, char **argv)
FadeMessage widget;
widget.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Popup Message with Effect"));
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
widget.showMaximized();
#else
widget.setFixedSize(400, 600);
widget.show();
#endif
return app.exec();
}

3
examples/effects/lighting/lighting.cpp
View File

@ -136,7 +136,4 @@ void Lighting::animate()
void Lighting::resizeEvent(QResizeEvent */*event*/)
{
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
fitInView(sceneRect(), Qt::KeepAspectRatio);
#endif
}

2
examples/effects/lighting/lighting.pro
View File

@ -8,6 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/lighting
INSTALLS += target sources
QT += widgets
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example

4
examples/effects/lighting/main.cpp
View File

@ -48,12 +48,8 @@ int main(int argc, char **argv)
Lighting lighting;
lighting.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Lighting and Shadows"));
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
lighting.showMaximized();
#else
lighting.resize(640, 480);
lighting.show();
#endif
return app.exec();
}

16
examples/embedded/digiflip/digiflip.cpp
View File

@ -117,10 +117,6 @@ protected:
QPixmap drawDigits(int n, const QRect &rect) {
int scaleFactor = 2;
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
if (rect.height() > 240)
scaleFactor = 1;
#endif
QString str = QString::number(n);
if (str.length() == 1)
@ -192,10 +188,8 @@ protected:
void paintFlip() {
QPainter p(this);
#if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WINCE_WM)
p.setRenderHint(QPainter::SmoothPixmapTransform, true);
p.setRenderHint(QPainter::Antialiasing, true);
#endif
p.fillRect(rect(), Qt::black);
int hw = width() / 2;
@ -319,16 +313,10 @@ public:
connect(slideAction, SIGNAL(triggered()), SLOT(chooseSlide()));
connect(flipAction, SIGNAL(triggered()), SLOT(chooseFlip()));
connect(rotateAction, SIGNAL(triggered()), SLOT(chooseRotate()));
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
menuBar()->addAction(slideAction);
menuBar()->addAction(flipAction);
menuBar()->addAction(rotateAction);
#else
addAction(slideAction);
addAction(flipAction);
addAction(rotateAction);
setContextMenuPolicy(Qt::ActionsContextMenu);
#endif
}
void updateTime() {
@ -414,12 +402,8 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
DigiFlip time;
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
time.showMaximized();
#else
time.resize(320, 240);
time.show();
#endif
return app.exec();
}

5
examples/embedded/digiflip/digiflip.pro
View File

@ -1,10 +1,5 @@
SOURCES = digiflip.cpp
symbian {
TARGET.UID3 = 0xA000CF72
CONFIG += qt_example
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/digiflip

1
examples/embedded/embedded.pro
View File

@ -9,5 +9,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded
INSTALLS += sources
symbian: CONFIG += qt_demo
QT += widgets widgets

5
examples/embedded/flickable/flickable.pro
View File

@ -1,11 +1,6 @@
SOURCES = flickable.cpp main.cpp
HEADERS = flickable.h
symbian {
TARGET.UID3 = 0xA000CF73
CONFIG += qt_example
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flickable

4
examples/embedded/flickable/main.cpp
View File

@ -222,12 +222,8 @@ int main(int argc, char *argv[])
ColorList list;
list.setWindowTitle("Kinetic Scrolling");
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
list.showMaximized();
#else
list.resize(320, 320);
list.show();
#endif
return app.exec();
}

10
examples/embedded/flightinfo/flightinfo.cpp
View File

@ -126,16 +126,10 @@ public:
connect(randomAction, SIGNAL(triggered()), SLOT(randomFlight()));
connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(handleNetworkData(QNetworkReply*)));
#if defined(Q_OS_SYMBIAN)
menuBar()->addAction(searchTodayAction);
menuBar()->addAction(searchYesterdayAction);
menuBar()->addAction(randomAction);
#else
addAction(searchTodayAction);
addAction(searchYesterdayAction);
addAction(randomAction);
setContextMenuPolicy(Qt::ActionsContextMenu);
#endif
}
private slots:
@ -388,12 +382,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
FlightInfo w;
#if defined(Q_OS_SYMBIAN)
w.showMaximized();
#else
w.resize(360, 504);
w.show();
#endif
return app.exec();
}

6
examples/embedded/flightinfo/flightinfo.pro
View File

@ -5,12 +5,6 @@ FORMS += form.ui
RESOURCES = flightinfo.qrc
QT += network widgets
symbian {
TARGET.UID3 = 0xA000CF74
CONFIG += qt_example
TARGET.CAPABILITY = NetworkServices
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/flightinfo

5
examples/embedded/lightmaps/lightmaps.cpp
View File

@ -122,11 +122,6 @@ void LightMaps::paintEvent(QPaintEvent *event)
p.begin(this);
m_normalMap->render(&p, event->rect());
p.setPen(Qt::black);
#if defined(Q_OS_SYMBIAN)
QFont font = p.font();
font.setPixelSize(13);
p.setFont(font);
#endif
p.drawText(rect(), Qt::AlignBottom | Qt::TextWordWrap,
"Map data CCBYSA 2009 OpenStreetMap.org contributors");
p.end();

7
examples/embedded/lightmaps/lightmaps.pro
View File

@ -8,13 +8,6 @@ SOURCES = lightmaps.cpp \
slippymap.cpp
QT += network widgets
symbian {
TARGET.UID3 = 0xA000CF75
CONFIG += qt_example
TARGET.CAPABILITY = NetworkServices
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/lightmaps

7
examples/embedded/lightmaps/main.cpp
View File

@ -44,20 +44,13 @@
int main(int argc, char **argv)
{
#if defined(Q_WS_X11)
QApplication::setGraphicsSystem("raster");
#endif
QApplication app(argc, argv);
app.setApplicationName("LightMaps");
MapZoom w;
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
w.showMaximized();
#else
w.resize(600, 450);
w.show();
#endif
return app.exec();
}

8
examples/embedded/lightmaps/mapzoom.cpp
View File

@ -64,13 +64,6 @@ MapZoom::MapZoom()
connect(nightModeAction, SIGNAL(triggered()), map, SLOT(toggleNightMode()));
connect(osmAction, SIGNAL(triggered()), SLOT(aboutOsm()));
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
menuBar()->addAction(osloAction);
menuBar()->addAction(berlinAction);
menuBar()->addAction(jakartaAction);
menuBar()->addAction(nightModeAction);
menuBar()->addAction(osmAction);
#else
QMenu *menu = menuBar()->addMenu(tr("&Options"));
menu->addAction(osloAction);
menu->addAction(berlinAction);
@ -78,7 +71,6 @@ MapZoom::MapZoom()
menu->addSeparator();
menu->addAction(nightModeAction);
menu->addAction(osmAction);
#endif
QNetworkConfigurationManager manager;
if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {

4
examples/embedded/raycasting/raycasting.cpp
View File

@ -380,12 +380,8 @@ int main(int argc, char **argv)
Raycasting w;
w.setWindowTitle("Raycasting");
#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE_WM)
w.showMaximized();
#else
w.resize(640, 480);
w.show();
#endif
return app.exec();
}

5
examples/embedded/raycasting/raycasting.pro
View File

@ -2,11 +2,6 @@ TEMPLATE = app
SOURCES = raycasting.cpp
RESOURCES += raycasting.qrc
symbian {
TARGET.UID3 = 0xA000CF76
CONFIG += qt_example
}
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/raycasting

4
examples/embedded/styleexample/styleexample.pro
View File

@ -11,8 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A63F
CONFIG += qt_example
}
QT += widgets widgets

17
examples/examples.pro
View File

@ -31,22 +31,9 @@ SUBDIRS = \
gestures
}
symbian: SUBDIRS = \
graphicsview \
itemviews \
network \
painting \
widgets \
draganddrop \
mainwindows \
sql \
animation \
gestures \
xml
qpa:SUBDIRS += qpa
wince*|symbian|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
embedded:SUBDIRS += qws
contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib
@ -60,6 +47,4 @@ sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES]
INSTALLS += sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example

9
examples/gestures/imagegestures/imagegestures.pro
View File

@ -15,12 +15,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/gestures/imagegestures
INSTALLS += target \
sources
symbian {
TARGET.UID3 = 0xA000D7D0
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example
symbian: warning(This example does not work on Symbian platform)
maemo5: warning(This example does not work on Maemo platform)
simulator: warning(This example does not work on Simulator platform)

2
examples/graphicsview/anchorlayout/anchorlayout.pro
View File

@ -9,7 +9,5 @@ INSTALLS += target sources
TARGET = anchorlayout
QT += widgets
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

4
examples/graphicsview/anchorlayout/main.cpp
View File

@ -123,11 +123,7 @@ int main(int argc, char **argv)
scene.setBackgroundBrush(Qt::darkGreen);
QGraphicsView view(&scene);
#if defined(Q_WS_S60)
view.showMaximized();
#else
view.show();
#endif
return app.exec();
}

6
examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro
View File

@ -11,10 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/basicgraphicslayouts
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A645
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

4
examples/graphicsview/basicgraphicslayouts/main.cpp
View File

@ -51,12 +51,8 @@ int main(int argc, char **argv)
Window *window = new Window;
scene.addItem(window);
QGraphicsView view(&scene);
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
view.showMaximized();
#else
view.resize(600, 600);
view.show();
#endif
return app.exec();
}

2
examples/graphicsview/boxes/glextensions.h
View File

@ -69,7 +69,7 @@ glMapBuffer
glUnmapBuffer
*/
#ifndef Q_WS_MAC
#ifndef Q_OS_MAC
# ifndef APIENTRYP
# ifdef APIENTRY
# define APIENTRYP APIENTRY *

1
examples/graphicsview/chip/chip.pro
View File

@ -18,4 +18,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip
INSTALLS += target sources
symbian: CONFIG += qt_example

7
examples/graphicsview/collidingmice/collidingmice.pro
View File

@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/collidingmice
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A643
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

4
examples/graphicsview/collidingmice/main.cpp
View File

@ -79,12 +79,8 @@ int main(int argc, char **argv)
view.setDragMode(QGraphicsView::ScrollHandDrag);
//! [5] //! [6]
view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice"));
#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
view.showMaximized();
#else
view.resize(400, 300);
view.show();
#endif
QTimer timer;
QObject::connect(&timer, SIGNAL(timeout()), &scene, SLOT(advance()));

4
examples/graphicsview/diagramscene/diagramscene.pro
View File

@ -18,10 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene
INSTALLS += target sources
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
QT += widgets
symbian: warning(This example might not fully work on Symbian platform)
maemo5: warning(This example might not fully work on Maemo platform)
simulator: warning(This example might not fully work on Simulator platform)

2
examples/graphicsview/dragdroprobot/dragdroprobot.pro
View File

@ -17,8 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot
INSTALLS += target sources
symbian: CONFIG += qt_example
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

7
examples/graphicsview/dragdroprobot/main.cpp
View File

@ -55,9 +55,6 @@ public:
protected:
virtual void resizeEvent(QResizeEvent *)
{
#if defined(Q_OS_SYMBIAN)
fitInView(sceneRect(), Qt::KeepAspectRatio);
#endif
}
};
@ -90,11 +87,7 @@ int main(int argc, char **argv)
view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
view.setBackgroundBrush(QColor(230, 200, 167));
view.setWindowTitle("Drag and Drop Robot");
#if defined(Q_OS_SYMBIAN)
view.showMaximized();
#else
view.show();
#endif
return app.exec();
}

7
examples/graphicsview/elasticnodes/elasticnodes.pro
View File

@ -17,11 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/elasticnodes
INSTALLS += target sources
symbian {
TARGET.UID3 = 0xA000A642
CONFIG += qt_example
}
QT += widgets
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

2
examples/graphicsview/elasticnodes/graphwidget.cpp
View File

@ -203,7 +203,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
painter->setBrush(Qt::NoBrush);
painter->drawRect(sceneRect);
#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
// Text
QRectF textRect(sceneRect.left() + 4, sceneRect.top() + 4,
sceneRect.width() - 4, sceneRect.height() - 4);
@ -218,7 +217,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect)
painter->drawText(textRect.translated(2, 2), message);
painter->setPen(Qt::black);
painter->drawText(textRect, message);
#endif
}
//! [6]

7
examples/graphicsview/elasticnodes/main.cpp
View File

@ -52,13 +52,6 @@ int main(int argc, char **argv)
QMainWindow mainWindow;
mainWindow.setCentralWidget(widget);
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
mainWindow.menuBar()->addAction("Shuffle", widget, SLOT(shuffle()));
mainWindow.menuBar()->addAction("Zoom In", widget, SLOT(zoomIn()));
mainWindow.menuBar()->addAction("Zoom Out", widget, SLOT(zoomOut()));
mainWindow.showMaximized();
#else
mainWindow.show();
#endif
return app.exec();
}

12
examples/graphicsview/elasticnodes/node.cpp
View File

@ -141,16 +141,9 @@ bool Node::advance()
//! [8]
QRectF Node::boundingRect() const
{
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
// Add some extra space around the circle for easier touching with finger
qreal adjust = 30;
return QRectF( -10 - adjust, -10 - adjust,
20 + adjust * 2, 20 + adjust * 2);
#else
qreal adjust = 2;
return QRectF( -10 - adjust, -10 - adjust,
23 + adjust, 23 + adjust);
#endif
}
//! [8]
@ -158,12 +151,7 @@ QRectF Node::boundingRect() const
QPainterPath Node::shape() const
{
QPainterPath path;
#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
// Add some extra space around the circle for easier touching with finger
path.addEllipse( -40, -40, 80, 80);
#else
path.addEllipse(-10, -10, 20, 20);
#endif
return path;
}
//! [9]

1
examples/graphicsview/embeddeddialogs/embeddeddialogs.pro
View File

@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs
INSTALLS += target sources
QT += widgets
symbian: CONFIG += qt_example

2
examples/graphicsview/flowlayout/flowlayout.pro
View File

@ -9,6 +9,4 @@ HEADERS += flowlayout.h window.h
SOURCES += flowlayout.cpp main.cpp window.cpp
QT += widgets
symbian: CONFIG += qt_example
maemo5: CONFIG += qt_example
simulator: warning(This example might not fully work on Simulator platform)

4
examples/graphicsview/flowlayout/main.cpp
View File

@ -50,12 +50,8 @@ int main(int argc, char **argv)
Window *w = new Window;
scene.addItem(w);
#if defined(Q_OS_SYMBIAN)
view->showMaximized();
#else
view->resize(400, 300);
view->show();
#endif
return app.exec();
}

Some files were not shown because too many files have changed in this diff Show More