diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2015-02-03 14:09:23 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-02-04 17:14:35 +0000 |
| commit | 5432f2c7a1ff02e1ee0e07e442ceb6c12ca66098 (patch) | |
| tree | b8b4aca1b9309dfcb3618b8ee2d5560e075cff07 /tests/manual/bearerex | |
| parent | b6c03f58ce4a03d81c8bce1795179a63431f6e7d (diff) | |
Remove traces of the Maemo platform
Change-Id: I6b551de331aa0386ea53d8e96f50b669777d2d69
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'tests/manual/bearerex')
| -rw-r--r-- | tests/manual/bearerex/bearerex.h | 5 | ||||
| -rw-r--r-- | tests/manual/bearerex/bearerex.pro | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h index 3666917402..f0aefa686f 100644 --- a/tests/manual/bearerex/bearerex.h +++ b/tests/manual/bearerex/bearerex.h @@ -38,13 +38,8 @@ #include "ui_detailedinfodialog.h" -#if defined(Q_DEAD_CODE_FROM_QT4_MAEMO_6) -#include "ui_bearerex_maemo.h" -#include "ui_sessiondialog_maemo.h" -#else #include "ui_bearerex.h" #include "ui_sessiondialog.h" -#endif #include "qnetworkconfigmanager.h" #include "qnetworksession.h" #include "datatransferer.h" diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro index 57b82a0b51..8f0af52b40 100644 --- a/tests/manual/bearerex/bearerex.pro +++ b/tests/manual/bearerex/bearerex.pro @@ -6,15 +6,9 @@ QT += core \ widgets \ network -FORMS += detailedinfodialog.ui -maemo5|maemo6 { - FORMS += sessiondialog_maemo.ui \ - bearerex_maemo.ui -} else { - FORMS += sessiondialog.ui \ - bearerex.ui -} - +FORMS += detailedinfodialog.ui \ + sessiondialog.ui \ + bearerex.ui # Example headers and sources HEADERS += bearerex.h \ |