diff options
| author | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2012-01-30 12:24:52 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 12:53:37 +0100 |
| commit | a841c58ebeee503c1571e97010feafe770a762d3 (patch) | |
| tree | aceee62ae79556815e4984c3bbf9de82f9d295d8 /examples | |
| parent | 9872f02e4fdeb08755910feefca9cf9e95641589 (diff) | |
Strip maemo5 ifdefs and code
Change-Id: Ib5a66708a4612e45015585cd97dee68013d7421e
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serviceframework/remotedialerservice/remotedialerservice.pro | 2 | ||||
| -rw-r--r-- | examples/serviceframework/servicebrowser/servicebrowser.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/examples/serviceframework/remotedialerservice/remotedialerservice.pro b/examples/serviceframework/remotedialerservice/remotedialerservice.pro index 393ff0f2..e9176b43 100644 --- a/examples/serviceframework/remotedialerservice/remotedialerservice.pro +++ b/examples/serviceframework/remotedialerservice/remotedialerservice.pro @@ -20,7 +20,5 @@ mtlib|contains(config_test_mtlib, yes) { } INSTALLS += target sources xml info -maemo5: CONFIG += qt_example - DEFINES += TESTDATA_DIR=\\\"$$PWD/\\\" diff --git a/examples/serviceframework/servicebrowser/servicebrowser.cpp b/examples/serviceframework/servicebrowser/servicebrowser.cpp index df47471a..3ca69a38 100644 --- a/examples/serviceframework/servicebrowser/servicebrowser.cpp +++ b/examples/serviceframework/servicebrowser/servicebrowser.cpp @@ -78,11 +78,7 @@ void ServiceBrowser::currentInterfaceImplChanged(QListWidgetItem *current, QList QServiceInterfaceDescriptor descriptor = current->data(Qt::UserRole).value<QServiceInterfaceDescriptor>(); if (descriptor.isValid()) { -#if defined(Q_WS_MAEMO_5) - defaultInterfaceButton->setText(tr("Set as default implementation for \n%1").arg(descriptor.interfaceName())); -#else defaultInterfaceButton->setText(tr("Set as default implementation for %1").arg(descriptor.interfaceName())); -#endif //TODO: .arg(descriptor.interfaceName())); defaultInterfaceButton->setEnabled(true); } |