AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove traces of the Maemo platform

Browse Source 
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>
This commit is contained in:
Tor Arne Vestbø 2015-02-03 14:09:23 +01:00 committed by Tor Arne Vestbø
parent b6c03f58ce
commit 5432f2c7a1
12 changed files with 4 additions and 741 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/network/bearermonitor/bearermonitor.cpp
View File

@ -56,13 +56,8 @@ BearerMonitor::BearerMonitor(QWidget *parent)
: QWidget(parent)
{
setupUi(this);
#ifdef MAEMO_UI
newSessionButton->hide();
deleteSessionButton->hide();
#else
delete tabWidget->currentWidget();
sessionGroup->hide();
#endif
updateConfigurations();
onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
@ -99,10 +94,8 @@ BearerMonitor::BearerMonitor(QWidget *parent)
connect(newSessionButton, SIGNAL(clicked()),
this, SLOT(createNewSession()));
#ifndef MAEMO_UI
connect(deleteSessionButton, SIGNAL(clicked()),
this, SLOT(deleteSession()));
#endif
connect(scanButton, SIGNAL(clicked()),
this, SLOT(performScan()));
@ -385,9 +378,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item)
tabWidget->addTab(session, conf.name());
#ifndef MAEMO_UI
sessionGroup->show();
#endif
sessionWidgets.append(session);
}
@ -400,7 +391,6 @@ void BearerMonitor::createNewSession()
createSessionFor(item);
}
#ifndef MAEMO_UI
void BearerMonitor::deleteSession()
{
SessionWidget *session = qobject_cast<SessionWidget *>(tabWidget->currentWidget());
@ -413,7 +403,6 @@ void BearerMonitor::deleteSession()
sessionGroup->hide();
}
}
#endif
void BearerMonitor::performScan()
{

2
examples/network/bearermonitor/bearermonitor.pro
View File

@ -12,8 +12,6 @@ FORMS = bearermonitor_240_320.ui \
bearermonitor_640_480.ui \
sessionwidget.ui
EXAMPLE_FILES = bearermonitor_maemo.ui sessionwidget_maemo.ui # not used
win32:!wince*:LIBS += -lws2_32
wince*:LIBS += -lws2

369
examples/network/bearermonitor/bearermonitor_maemo.ui
View File

@ -1,369 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BearerMonitor</class>
<widget class="QWidget" name="BearerMonitor">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>612</width>
<height>555</height>
</rect>
</property>
<property name="windowTitle">
<string>BearerMonitor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
<item>
<widget class="QGroupBox" name="systemState">
<property name="title">
<string>System State</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="onlineStateLabel">
<property name="text">
<string>Online State:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="onlineState">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="configurations">
<property name="title">
<string>Configurations &amp;&amp; Sessions</string>
</property>
<property name="flat">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<property name="usesScrollButtons">
<bool>false</bool>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Configurations</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QTreeWidget" name="treeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="configurationNameLayout">
<item>
<widget class="QLabel" name="configurationNameLabel">
<property name="text">
<string>Name:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationName">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationStateLayout">
<item>
<widget class="QLabel" name="configurationStateLabel">
<property name="text">
<string>State:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationState">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationTypeLayout">
<item>
<widget class="QLabel" name="configurationTypeLabel">
<property name="text">
<string>Type:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationType">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Invalid</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationPurposeLayout">
<item>
<widget class="QLabel" name="configurationPurposeLabel">
<property name="text">
<string>Purpose:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationPurpose">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Unknown</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationIdentifierLayout">
<item>
<widget class="QLabel" name="configurationIdentifierLabel">
<property name="text">
<string>Identifier:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationIdentifier">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationRoamingLayout">
<item>
<widget class="QLabel" name="configurationRoamingLabel">
<property name="text">
<string>Roaming:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationRoaming">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationChildrenLayout">
<item>
<widget class="QLabel" name="configurationChildrenLabel">
<property name="text">
<string>Children:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configurationChildren">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="nlaGroup">
<property name="title">
<string>Network Location Awareness</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="registerButton">
<property name="text">
<string>Register</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="unregisterButton">
<property name="text">
<string>Unregister</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QPushButton" name="newSessionButton">
<property name="text">
<string>New Session</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deleteSessionButton">
<property name="text">
<string>Delete Session</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="scanButton">
<property name="text">
<string>Scan</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="progressBar">
<property name="maximum">
<number>0</number>
</property>
<property name="value">
<number>23280</number>
</property>
<property name="textVisible">
<bool>false</bool>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="format">
<string>%p%</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

11
examples/network/bearermonitor/sessionwidget.cpp
View File

@ -74,10 +74,6 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
this, SLOT(closeSession()));
connect(stopSessionButton, SIGNAL(clicked()),
this, SLOT(stopSession()));
#ifdef MAEMO_UI
connect(deleteSessionButton, SIGNAL(clicked()),
this, SLOT(deleteSession()));
#endif
}
SessionWidget::~SessionWidget()
@ -94,13 +90,6 @@ void SessionWidget::timerEvent(QTimerEvent *e)
}
}
#ifdef MAEMO_UI
void SessionWidget::deleteSession()
{
delete this;
}
#endif
void SessionWidget::updateSession()
{
updateSessionState(session->state());

8
examples/network/bearermonitor/sessionwidget.h
View File

@ -43,11 +43,7 @@
#include <qnetworksession.h>
#ifdef MAEMO_UI
#include "ui_sessionwidget_maemo.h"
#else
#include "ui_sessionwidget.h"
#endif
QT_USE_NAMESPACE
@ -72,10 +68,6 @@ private Q_SLOTS:
void stopSession();
void updateSession();
void updateSessionError(QNetworkSession::SessionError error);
#ifdef MAEMO_UI
void deleteSession();
#endif
private:
QNetworkSession *session;

310
examples/network/bearermonitor/sessionwidget_maemo.ui
View File

@ -1,310 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SessionWidget</class>
<widget class="QWidget" name="SessionWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>497</width>
<height>615</height>
</rect>
</property>
<property name="windowTitle">
<string>Session Details</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="sessionIdLayout">
<item>
<widget class="QLabel" name="sessionIdLabel">
<property name="text">
<string>Session ID:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="sessionId">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="sessionStateLayout">
<item>
<widget class="QLabel" name="sessionStateLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Session State:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="sessionState">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Invalid</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="configurationLayout">
<item>
<widget class="QLabel" name="configurationLabel">
<property name="text">
<string>Configuration:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="configuration">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="bearerLayout">
<item>
<widget class="QLabel" name="bearerLabel">
<property name="text">
<string>Bearer:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="bearer">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="interfaceNameLayout">
<item>
<widget class="QLabel" name="interfaceNameLabel">
<property name="text">
<string>Interface Name:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="interfaceName">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="interfaceGuidLayout">
<item>
<widget class="QLabel" name="interfaceGuidLabel">
<property name="text">
<string>Interface GUID:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="interfaceGuid">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="lastErrorLayout">
<item>
<widget class="QLabel" name="lastErrorLabel">
<property name="text">
<string>Last Error:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lastError">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="errorStringLayout">
<item>
<widget class="QLabel" name="errorStringLabel">
<property name="text">
<string>Error String</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="errorString">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="errorStringLayout_2">
<item>
<widget class="QLabel" name="rxData">
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="txData">
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="errorStringLayout_3">
<item>
<widget class="QLabel" name="errorStringLabel_2">
<property name="text">
<string>Active Time:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="activeTime">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>0 seconds</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QPushButton" name="openSessionButton">
<property name="text">
<string>Open</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closeSessionButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="openSyncSessionButton">
<property name="text">
<string>Blocking Open</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="stopSessionButton">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deleteSessionButton">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

6
examples/widgets/doc/src/elidedlabel.qdoc
View File

@ -131,12 +131,6 @@
\snippet widgets/elidedlabel/testwidget.cpp 4
On the Maemo platform, windows are stuck in landscape mode by default. With
this attribute set, the window manager is aware that this window can be
rotated.
\snippet widgets/elidedlabel/testwidget.cpp 5
The \c widthSlider and \c heightSlider have the exact same length as the
dimensions of the \c elidedText. The maximum value for both of them is
thus their lengths, and each tick indicates one pixel.

3
examples/widgets/widgets/elidedlabel/testwidget.cpp
View File

@ -116,10 +116,7 @@ TestWidget::TestWidget(QWidget *parent):
setLayout(layout);
//! [4]
//! [5]
}
//! [5]
//! [6]
void TestWidget::resizeEvent(QResizeEvent *event)

6
src/tools/uic/uic.pro
View File

@ -10,10 +10,4 @@ HEADERS += uic.h
SOURCES += main.cpp \
uic.cpp
*-maemo* {
# UIC will crash when running inside QEMU if built with -O2
QMAKE_CFLAGS_RELEASE -= -O2
QMAKE_CXXFLAGS_RELEASE -= -O2
}
load(qt_tool)

2
tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
View File

@ -768,7 +768,7 @@ void tst_QSplitter::task169702_sizes()
QTest::qWait(100);
testW->m_iFactor++;
testW->updateGeometry();
QTest::qWait(500);//100 is too fast for Maemo
QTest::qWait(500);
//Make sure the minimimSizeHint is respected
QCOMPARE(testW->size().height(), testW->minimumSizeHint().height());

5
tests/manual/bearerex/bearerex.h
View File

@ -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"

12
tests/manual/bearerex/bearerex.pro
View File

@ -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 \