From 5abb37a995dbc5c68e74c2ca850ca191bcf62622 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 30 Jun 2009 13:57:33 +0200 Subject: Removed warnings on Symbian. Library entries produce warnings if they are included in a project which has a static library target. RevBy: Miikka Heikkinen --- qmake/generators/symbian/symmake.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index f1e9165..4459a4c 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -687,7 +687,9 @@ bool SymbianMakefileGenerator::writeMmpFile(QString &filename, QStringList &symb } t << endl; - writeMmpFileLibraryPart(t); + if (!project->values("CONFIG").contains("static") && !project->values("CONFIG").contains("staticlib")) { + writeMmpFileLibraryPart(t); + } writeMmpFileCapabilityPart(t); -- cgit v0.12 From 44b6bc1e3391b874ceb1703e2965851c542568db Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 30 Jun 2009 14:00:05 +0200 Subject: Removed unused parameters from examples and demos to prevent warnings --- demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp | 2 +- examples/painting/svggenerator/displaywidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp index 1bd99c9..843da23 100644 --- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp +++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp @@ -143,7 +143,7 @@ void EmbeddedSvgViewer::updateImageScale() } -void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * event ) +void EmbeddedSvgViewer::resizeEvent ( QResizeEvent * /* event */ ) { qreal origZoom = m_zoomLevel; diff --git a/examples/painting/svggenerator/displaywidget.cpp b/examples/painting/svggenerator/displaywidget.cpp index c973341..868c26c 100644 --- a/examples/painting/svggenerator/displaywidget.cpp +++ b/examples/painting/svggenerator/displaywidget.cpp @@ -63,7 +63,7 @@ DisplayWidget::DisplayWidget(QWidget *parent) } //! [paint event] -void DisplayWidget::paintEvent(QPaintEvent *event) +void DisplayWidget::paintEvent(QPaintEvent * /* event */) { QPainter painter; painter.begin(this); -- cgit v0.12 From 494902e71479c5410cb77e62ef7152125f39dc67 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 30 Jun 2009 14:14:14 +0200 Subject: Removed warnings because of extra semicolons. --- examples/graphicsview/padnavigator/panel.h | 2 +- examples/graphicsview/padnavigator/roundrectitem.h | 2 +- examples/phonon/musicplayer/mainwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/graphicsview/padnavigator/panel.h b/examples/graphicsview/padnavigator/panel.h index 03876b7..62e8cb6 100644 --- a/examples/graphicsview/padnavigator/panel.h +++ b/examples/graphicsview/padnavigator/panel.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QTimeLine; class Ui_BackSide; -QT_END_NAMESPACE; +QT_END_NAMESPACE class RoundRectItem; diff --git a/examples/graphicsview/padnavigator/roundrectitem.h b/examples/graphicsview/padnavigator/roundrectitem.h index 33e33d7..ef9eb0f 100644 --- a/examples/graphicsview/padnavigator/roundrectitem.h +++ b/examples/graphicsview/padnavigator/roundrectitem.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QGraphicsProxyWidget; -QT_END_NAMESPACE; +QT_END_NAMESPACE class RoundRectItem : public QObject, public QGraphicsRectItem { diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp index f50a2bd..66c71f8 100644 --- a/examples/phonon/musicplayer/mainwindow.cpp +++ b/examples/phonon/musicplayer/mainwindow.cpp @@ -181,7 +181,7 @@ void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldSt QMessageBox::warning(this, tr("Error opening files"), metaInformationResolver->errorString()); while (!sources.isEmpty() && - !(sources.takeLast() == metaInformationResolver->currentSource())); + !(sources.takeLast() == metaInformationResolver->currentSource())) {} return; } -- cgit v0.12 From 648400cb53d16125a7b1dc851cf01f09034f1fc7 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 30 Jun 2009 14:07:31 +0200 Subject: Fixed a warning on Symbian. If the profile has release mode set, QT_NO_DEBUG was defined twice (once on command line and once in qglobal.h). So now we check for that. This is better than to ignore debug and release completely, because there may be other flags that also change when they change. --- src/corelib/global/qglobal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 14b6895..3129349 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1508,7 +1508,7 @@ inline void qUnused(T &x) { (void)x; } Debugging and error handling */ -#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) +#if defined(Q_OS_SYMBIAN) && defined(NDEBUG) && !defined(QT_NO_DEBUG) # define QT_NO_DEBUG #endif -- cgit v0.12 From a884c4d9e1cd6e1258802e4406a17ff16d3b8e66 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Tue, 30 Jun 2009 16:05:35 +0200 Subject: RConnectionManager is not used any more. We dont need to link agains 'connmon' library any more. With this we depend only on Symbina and not S60 (Avkon). --- examples/network/ftp/ftp.pro | 2 +- examples/network/ftp/sym_iap_util.h | 69 ++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 41 deletions(-) diff --git a/examples/network/ftp/ftp.pro b/examples/network/ftp/ftp.pro index c70b812..6b0f2ca 100644 --- a/examples/network/ftp/ftp.pro +++ b/examples/network/ftp/ftp.pro @@ -17,5 +17,5 @@ symbian { INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE TARGET.CAPABILITY="NetworkServices" TARGET.UID3 = 0xA000A648 - LIBS+=-lesock -lconnmon # For IAP selection + LIBS+=-lesock # For IAP selection } \ No newline at end of file diff --git a/examples/network/ftp/sym_iap_util.h b/examples/network/ftp/sym_iap_util.h index 14df5af..928b46e 100644 --- a/examples/network/ftp/sym_iap_util.h +++ b/examples/network/ftp/sym_iap_util.h @@ -42,9 +42,9 @@ #define QSYM_IAP_UTIL_H #include +#include #include #include -#include QString qt_TDesC2QStringL(const TDesC& aDescriptor) { @@ -59,7 +59,6 @@ static void qt_SetDefaultIapL() { TUint count; TRequestStatus status; - TUint ids[15]; RSocketServ serv; CleanupClosePushL(serv); @@ -67,57 +66,47 @@ static void qt_SetDefaultIapL() RConnection conn; CleanupClosePushL(conn); - RConnectionMonitor monitor; - CleanupClosePushL(monitor); + User::LeaveIfError(serv.Connect()); + User::LeaveIfError(conn.Open(serv)); - monitor.ConnectL(); - monitor.GetConnectionCount(count, status); - User::WaitForRequest(status); - if(status.Int() != KErrNone) { - User::Leave(status.Int()); - } + TConnectionInfoBuf connInfo; - TUint numSubConnections; + _LIT(KIapNameSetting, "IAP\\Name"); + TBuf8<256> iap8Name; - if(count > 0) { - for (TInt i = 1; i <= count; i++) { - User::LeaveIfError(monitor.GetConnectionInfo(i, ids[i-1], numSubConnections)); - } - /* - * get IAP value for first active connection - */ - TBuf< 50 > iapName; - monitor.GetStringAttribute(ids[0], 0, KIAPName, iapName, status); - User::WaitForRequest(status); - if (status.Int() != KErrNone) { - User::Leave(status.Int()); + if (conn.EnumerateConnections(count) == KErrNone) { + if(count > 0) { + for (TUint i = 1; i <= count; i++) { + // Note: GetConnectionInfo expects 1-based index. + if (conn.GetConnectionInfo(i, connInfo) == KErrNone) { + if (conn.Attach(connInfo, RConnection::EAttachTypeNormal) == KErrNone) { + conn.GetDesSetting(TPtrC(KIapNameSetting), iap8Name); + break; + } + } + } } else { - QString strIapName = qt_TDesC2QStringL(iapName); - struct ifreq ifReq; - strcpy(ifReq.ifr_name, strIapName.toLatin1().data()); - User::LeaveIfError(setdefaultif(&ifReq)); + /* + * no active connections yet + * use IAP dialog to select one + */ + User::LeaveIfError(conn.Start()); + User::LeaveIfError(conn.GetDesSetting(TPtrC(KIapNameSetting), iap8Name)); } - } else { - /* - * no active connections yet - * use IAP dialog to select one - */ - User::LeaveIfError(serv.Connect()); - User::LeaveIfError(conn.Open(serv)); - User::LeaveIfError(conn.Start()); - - _LIT(KIapNameSetting, "IAP\\Name"); - TBuf8<50> iap8Name; - User::LeaveIfError(conn.GetDesSetting(TPtrC(KIapNameSetting), iap8Name)); + iap8Name.ZeroTerminate(); conn.Stop(); struct ifreq ifReq; strcpy(ifReq.ifr_name, (char*)iap8Name.Ptr()); + User::LeaveIfError(setdefaultif(&ifReq)); + + conn.Close(); + serv.Close(); } - CleanupStack::PopAndDestroy(&monitor); + CleanupStack::PopAndDestroy(&conn); CleanupStack::PopAndDestroy(&serv); } -- cgit v0.12 From 27c4a4d9c91e6c16d1d43d2d99c0176a58650e15 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 1 Jul 2009 09:10:16 +0200 Subject: Fixed the compilation problem of tests/auto/qpixmap. --- tests/auto/qpixmap/qpixmap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro index c992f6e..74600e8 100644 --- a/tests/auto/qpixmap/qpixmap.pro +++ b/tests/auto/qpixmap/qpixmap.pro @@ -13,7 +13,7 @@ wince*: { DEFINES += SRCDIR=\\\".\\\" } symbian*: { DEPLOYMENT_PLUGIN += qmng - LIBS += -lfbscli.lib -lbitgdi.lib -lgdi.lib + LIBS += -lfbscli.dll -lbitgdi.dll -lgdi.dll } else { DEFINES += SRCDIR=\\\"$$PWD\\\" win32:LIBS += -lgdi32 -luser32 -- cgit v0.12