Changeset 846 for trunk/demos/embedded


Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
60 edited
35 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/demos/embedded/anomaly/anomaly.pro

    r769 r846  
    2727    TARGET.UID3 = 0xA000CF71
    2828    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    29     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    30     LIBS += -lesock -lcommdb -linsock # For IAP selection
    3129    TARGET.CAPABILITY = NetworkServices
    3230    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000

  • trunk/demos/embedded/anomaly/src/AddressBar.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4545#include <QtGui>
    4646
    47 class LineEdit: public QLineEdit
    48 {
    49 public:
    50     LineEdit(QWidget *parent = 0): QLineEdit(parent) {}
    51 
    52     void paintEvent(QPaintEvent *event) {
    53         QLineEdit::paintEvent(event);
    54         if (text().isEmpty()) {
    55             QPainter p(this);
    56             int flags = Qt::AlignLeft | Qt::AlignVCenter;
    57             p.setPen(palette().color(QPalette::Disabled, QPalette::Text));
    58             p.drawText(rect().adjusted(10, 0, 0, 0), flags, "Enter address or search terms");
    59             p.end();
    60         }
    61     }
    62 };
    63 
    6447AddressBar::AddressBar(QWidget *parent)
    6548    : QWidget(parent)
    6649{
    67     m_lineEdit = new LineEdit(parent);
     50    m_lineEdit = new QLineEdit(parent);
     51    m_lineEdit->setPlaceholderText("Enter address or search terms");
    6852    connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress()));
    6953    m_toolButton = new QToolButton(parent);

  • trunk/demos/embedded/anomaly/src/AddressBar.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/BookmarksView.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    5656    m_iconView->addItem("www.google.com");
    5757    m_iconView->addItem("qt.nokia.com/doc/4.5");
    58     m_iconView->addItem("news.bbc.co.uk/text_only.stm");
     58    m_iconView->addItem("news.bbc.co.uk/2/mobile/default.stm");
    5959    m_iconView->addItem("mobile.wikipedia.org");
    6060    m_iconView->addItem("qt.nokia.com");

  • trunk/demos/embedded/anomaly/src/BookmarksView.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/BrowserView.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    5252#include "ZoomStrip.h"
    5353
    54 #if defined (Q_OS_SYMBIAN)
    55 #include "sym_iap_util.h"
    56 #endif
    57 
    5854BrowserView::BrowserView(QWidget *parent)
    5955    : QWidget(parent)
    … …  
    7167    m_zoomLevels << 100;
    7268    m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
     69
     70    QNetworkConfigurationManager manager;
     71    if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
     72        // Get saved network configuration
     73        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
     74        settings.beginGroup(QLatin1String("QtNetwork"));
     75        const QString id =
     76            settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
     77        settings.endGroup();
     78
     79        // If the saved network configuration is not currently discovered use the system
     80        // default
     81        QNetworkConfiguration config = manager.configurationFromIdentifier(id);
     82        if ((config.state() & QNetworkConfiguration::Discovered) !=
     83            QNetworkConfiguration::Discovered) {
     84            config = manager.defaultConfiguration();
     85        }
     86
     87        m_webView->page()->networkAccessManager()->setConfiguration(config);
     88    }
    7389
    7490    QTimer::singleShot(0, this, SLOT(initialize()));
    … …  
    101117    m_webView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
    102118    m_webView->setFocus();
    103 #ifdef Q_OS_SYMBIAN
    104     QTimer::singleShot(0, this, SLOT(setDefaultIap()));
    105 #endif
    106119}
    107120
    … …  
    174187    m_zoomStrip->move(width() - zw, (height() - zh) / 2);
    175188}
    176 #ifdef Q_OS_SYMBIAN
    177 void BrowserView::setDefaultIap()
    178 {
    179     qt_SetDefaultIap();
    180     m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm"));
    181 }
    182 #endif
    183189
    184190void BrowserView::navigate(const QUrl &url)

  • trunk/demos/embedded/anomaly/src/BrowserView.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    6464    void zoomIn();
    6565    void zoomOut();
    66 #ifdef Q_OS_SYMBIAN
    67     void setDefaultIap();
    68 #endif
    6966
    7067private slots:

  • trunk/demos/embedded/anomaly/src/BrowserWindow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/BrowserWindow.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/ControlStrip.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/ControlStrip.h

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/HomeView.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/HomeView.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/Main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/TitleBar.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/TitleBar.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/ZoomStrip.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/ZoomStrip.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/flickcharm.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/flickcharm.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/webview.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/anomaly/src/webview.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/desktopservices/contenttab.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    126126{
    127127    Q_UNUSED(item);
    128     QMessageBox::warning(this, tr("Operation Failed"), tr("Unkown error!"), QMessageBox::Close);
     128    QMessageBox::warning(this, tr("Operation Failed"), tr("Unknown error!"), QMessageBox::Close);
    129129}
    130130

  • trunk/demos/embedded/desktopservices/contenttab.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/desktopservices/desktopservices.pro

    r561 r846  
    2525
    2626wince*{
    27     music.path = "\My Documents\My Music"
    28     image.path = "\My Documents\My Pictures"
     27    music.path = "\\My Documents\\My Music"
     28    image.path = "\\My Documents\\My Pictures"
    2929    DEPLOYMENT += music image
    3030}

  • trunk/demos/embedded/desktopservices/desktopwidget.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    7474    // Links
    7575    LinkTab* othersTab = new LinkTab(tabWidget);;
    76     // Given icon file will be overriden by LinkTab
     76    // Given icon file will be overridden by LinkTab
    7777    othersTab->init(QDesktopServices::PicturesLocation, "", "");
    7878    tabWidget->addTab(othersTab, tr("Links"));

  • trunk/demos/embedded/desktopservices/desktopwidget.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/desktopservices/linktab.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/desktopservices/linktab.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/desktopservices/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/digiflip/digiflip.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/embedded.pro

    r561 r846  
    55    SUBDIRS += embeddedsvgviewer \
    66               desktopservices
     7    fluidlauncher.subdir = fluidlauncher
     8    fluidlauncher.depends = styledemo desktopservices raycasting flickable digiflip lightmaps flightinfo
    79    !vxworks:!qnx:SUBDIRS += fluidlauncher
    810}
    … …  
    1820}
    1921
     22contains(QT_CONFIG, declarative) {
     23    # Qml demos require DEPLOYMENT support. Therefore, only symbian.
     24    symbian:SUBDIRS += qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
     25}
     26
    2027# install
    2128sources.files = README *.pro

  • trunk/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/embeddedsvgviewer/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/flickable/flickable.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/flickable/flickable.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/flickable/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/flightinfo/flightinfo.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4444#include <QtNetwork>
    4545
    46 #if defined (Q_OS_SYMBIAN)
    47 #include "sym_iap_util.h"
    48 #endif
    49 
    5046#include "ui_form.h"
    5147
    … …  
    10197    QDate m_searchDate;
    10298    QPixmap m_map;
     99    QNetworkAccessManager m_manager;
     100    QList<QNetworkReply *> mapReplies;
    103101
    104102public:
    … …  
    116114
    117115        setWindowTitle("Flight Info");
    118         QTimer::singleShot(0, this, SLOT(delayedInit()));
    119116
    120117        // Rendered from the public-domain vectorized aircraft
    … …  
    128125        connect(searchYesterdayAction, SIGNAL(triggered()), SLOT(yesterday()));
    129126        connect(randomAction, SIGNAL(triggered()), SLOT(randomFlight()));
     127        connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
     128                this, SLOT(handleNetworkData(QNetworkReply*)));
    130129#if defined(Q_OS_SYMBIAN)
    131130        menuBar()->addAction(searchTodayAction);
    … …  
    141140
    142141private slots:
    143     void delayedInit() {
    144 #if defined(Q_OS_SYMBIAN)
    145         qt_SetDefaultIap();
    146 #endif
    147     }
    148 
    149142
    150143    void handleNetworkData(QNetworkReply *networkReply) {
    151144        if (!networkReply->error()) {
    152             // Assume UTF-8 encoded
    153             QByteArray data = networkReply->readAll();
    154             QString xml = QString::fromUtf8(data);
    155             digest(xml);
     145            if (!mapReplies.contains(networkReply)) {
     146                // Assume UTF-8 encoded
     147                QByteArray data = networkReply->readAll();
     148                QString xml = QString::fromUtf8(data);
     149                digest(xml);
     150            } else {
     151                mapReplies.removeOne(networkReply);
     152                m_map.loadFromData(networkReply->readAll());
     153                update();
     154            }
    156155        }
    157156        networkReply->deleteLater();
    158         networkReply->manager()->deleteLater();
    159     }
    160 
    161     void handleMapData(QNetworkReply *networkReply) {
    162         if (!networkReply->error()) {
    163             m_map.loadFromData(networkReply->readAll());
    164             update();
    165         }
    166         networkReply->deleteLater();
    167         networkReply->manager()->deleteLater();
    168157    }
    169158
    … …  
    186175        ui.flightStatus->hide();
    187176        ui.flightName->setText("Enter flight number");
     177        ui.flightEdit->setFocus();
     178#ifdef QT_KEYPAD_NAVIGATION
     179        ui.flightEdit->setEditFocus(true);
     180#endif
    188181        m_map = QPixmap();
    189182        update();
    … …  
    225218        }
    226219
    227         QNetworkAccessManager *manager = new QNetworkAccessManager(this);
    228         connect(manager, SIGNAL(finished(QNetworkReply*)),
    229                 this, SLOT(handleNetworkData(QNetworkReply*)));
    230         manager->get(QNetworkRequest(m_url));
     220        m_manager.get(QNetworkRequest(m_url));
    231221    }
    232222
    … …  
    249239            QString airport = regex.cap(1);
    250240            m_url.addEncodedQueryItem("dpap", QUrl::toPercentEncoding(airport));
    251             QNetworkAccessManager *manager = new QNetworkAccessManager(this);
    252             connect(manager, SIGNAL(finished(QNetworkReply*)),
    253                     this, SLOT(handleNetworkData(QNetworkReply*)));
    254             manager->get(QNetworkRequest(m_url));
     241            m_manager.get(QNetworkRequest(m_url));
    255242            return;
    256243        }
    … …  
    288275                if (xml.name() == "img" && inFlightMap) {
    289276                    QString src = xml.attributes().value("src").toString();
    290                     src.prepend("http://mobile.flightview.com");
     277                    src.prepend("http://mobile.flightview.com/");
    291278                    QUrl url = QUrl::fromPercentEncoding(src.toAscii());
    292                     QNetworkAccessManager *manager = new QNetworkAccessManager(this);
    293                     connect(manager, SIGNAL(finished(QNetworkReply*)),
    294                             this, SLOT(handleMapData(QNetworkReply*)));
    295                     manager->get(QNetworkRequest(url));
     279                    mapReplies.append(m_manager.get(QNetworkRequest(url)));
    296280                }
    297281            }

  • trunk/demos/embedded/flightinfo/flightinfo.pro

    r769 r846  
    99    TARGET.UID3 = 0xA000CF74
    1010    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    11     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    12     LIBS += -lesock -lcommdb -linsock # For IAP selection
    1311    TARGET.CAPABILITY = NetworkServices
    1412}

  • trunk/demos/embedded/fluidlauncher/config_s60/config.xml

    r769 r846  
    2222    <example filename="qmediaplayer" name="Media Player" image="screenshots/mediaplayer.png" args="-small-screen"/>
    2323    <example filename="spectrum" name="Spectrum Analyzer" image="screenshots/spectrum.png" args="-small-screen"/>
     24    <example filename="qmlcalculator" name="Qml Calculator" image="screenshots/qmlcalculator.png"/>
     25    <example filename="qmlclocks" name="Qml Clocks" image="screenshots/qmlclocks.png"/>
     26    <example filename="qmldialcontrol" name="Qml Dial Control" image="screenshots/qmldialcontrol.png"/>
     27    <example filename="qmleasing" name="Qml Easing Curves" image="screenshots/qmleasing.png"/>
     28    <example filename="qmlflickr" name="Qml flickr" image="screenshots/qmlflickr.jpg"/>
     29    <example filename="qmlphotoviewer" name="Qml Photo Viewer" image="screenshots/qmlphotoviewer.jpg"/>
     30    <example filename="qmltwitter" name="Qml twitter" image="screenshots/qmltwitter.jpg"/>
    2431  </demos>
    2532  <slideshow timeout="60000" interval="10000">

  • trunk/demos/embedded/fluidlauncher/demoapplication.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/demoapplication.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/fluidlauncher.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    155155                DemoApplication* newDemo = new DemoApplication(
    156156                        filename.toString(),
    157                         name.isEmpty() ? "Unamed Demo" : name.toString(),
     157                        name.isEmpty() ? "Unnamed Demo" : name.toString(),
    158158                        image.toString(),
    159159                        args.toString().split(" "));

  • trunk/demos/embedded/fluidlauncher/fluidlauncher.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/fluidlauncher.pro

    r769 r846  
    33DEPENDPATH += .
    44INCLUDEPATH += .
     5VERSION = $$QT_VERSION
    56
    67# Input
    … …  
    5859symbian {
    5960    load(data_caging_paths)
     61    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     62    RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder
    6063
    6164    TARGET.UID3 = 0xA000A641
    62     ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
     65
     66    defineReplace(regResourceDir) {
     67        symbian-abld|symbian-sbsv2 {
     68            return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1))
     69        } else {
     70            return($${QT_BUILD_TREE}/$$1)
     71        }
     72    }
     73
     74    defineReplace(appResourceDir) {
     75        symbian-abld|symbian-sbsv2 {
     76            return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1))
     77        } else {
     78            return($${QT_BUILD_TREE}/$$1)
     79        }
     80    }
    6381
    6482    executables.sources = \
    65         styledemo.exe \
    66         deform.exe \
    67         pathstroke.exe \
    68         wiggly.exe \
    69         qftp.exe \
    70         saxbookmarks.exe \
    71         desktopservices.exe \
    72         fridgemagnets.exe \
    73         softkeys.exe \
    74         raycasting.exe \
    75         flickable.exe \
    76         digiflip.exe \
    77         lightmaps.exe \
    78         flightinfo.exe
     83        $$QT_BUILD_TREE/demos/embedded/styledemo/styledemo.exe \
     84        $$QT_BUILD_TREE/demos/deform/deform.exe \
     85        $$QT_BUILD_TREE/demos/pathstroke/pathstroke.exe \
     86        $$QT_BUILD_TREE/examples/widgets/wiggly/wiggly.exe \
     87        $$QT_BUILD_TREE/examples/network/qftp/qftp.exe \
     88        $$QT_BUILD_TREE/examples/xml/saxbookmarks/saxbookmarks.exe \
     89        $$QT_BUILD_TREE/demos/embedded/desktopservices/desktopservices.exe \
     90        $$QT_BUILD_TREE/examples/draganddrop/fridgemagnets/fridgemagnets.exe \
     91        $$QT_BUILD_TREE/examples/widgets/softkeys/softkeys.exe \
     92        $$QT_BUILD_TREE/demos/embedded/raycasting/raycasting.exe \
     93        $$QT_BUILD_TREE/demos/embedded/flickable/flickable.exe \
     94        $$QT_BUILD_TREE/demos/embedded/digiflip/digiflip.exe \
     95        $$QT_BUILD_TREE/demos/embedded/lightmaps/lightmaps.exe \
     96        $$QT_BUILD_TREE/demos/embedded/flightinfo/flightinfo.exe
    7997
    8098    executables.path = /sys/bin
    8199
    82100    reg_resource.sources = \
    83         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/styledemo_reg.rsc \
    84         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/deform_reg.rsc \
    85         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/pathstroke_reg.rsc \
    86         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/wiggly_reg.rsc \
    87         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qftp_reg.rsc\
    88         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/saxbookmarks_reg.rsc \
    89         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/desktopservices_reg.rsc \
    90         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/fridgemagnets_reg.rsc \
    91         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/softkeys_reg.rsc \
    92         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/raycasting_reg.rsc \
    93         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flickable_reg.rsc \
    94         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/digiflip_reg.rsc \
    95         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/lightmaps_reg.rsc \
    96         $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/flightinfo_reg.rsc
     101        $$regResourceDir(demos/embedded/styledemo/styledemo_reg.rsc) \
     102        $$regResourceDir(demos/deform/deform_reg.rsc) \
     103        $$regResourceDir(demos/pathstroke/pathstroke_reg.rsc) \
     104        $$regResourceDir(examples/widgets/wiggly/wiggly_reg.rsc) \
     105        $$regResourceDir(examples/network/qftp/qftp_reg.rsc)\
     106        $$regResourceDir(examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \
     107        $$regResourceDir(demos/embedded/desktopservices/desktopservices_reg.rsc) \
     108        $$regResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \
     109        $$regResourceDir(examples/widgets/softkeys/softkeys_reg.rsc) \
     110        $$regResourceDir(demos/embedded/raycasting/raycasting_reg.rsc) \
     111        $$regResourceDir(demos/embedded/flickable/flickable_reg.rsc) \
     112        $$regResourceDir(demos/embedded/digiflip/digiflip_reg.rsc) \
     113        $$regResourceDir(demos/embedded/lightmaps/lightmaps_reg.rsc) \
     114        $$regResourceDir(demos/embedded/flightinfo/flightinfo_reg.rsc)
    97115
    98116    contains(QT_CONFIG, phonon) {
    99         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/qmediaplayer_reg.rsc
     117        reg_resource.sources += $$regResourceDir(demos/qmediaplayer/qmediaplayer_reg.rsc)
    100118    }
    101119
    102120    contains(QT_CONFIG, multimedia) {
    103         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/spectrum_reg.rsc
     121        reg_resource.sources += $$regResourceDir(demos/spectrum/app/spectrum_reg.rsc)
    104122    }
    105123
    … …  
    108126
    109127    resource.sources = \
    110         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.rsc \
    111         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.rsc \
    112         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.rsc \
    113         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.rsc \
    114         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.rsc\
    115         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.rsc \
    116         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.rsc \
    117         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.rsc \
    118         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.rsc \
    119         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.rsc \
    120         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.rsc \
    121         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.rsc \
    122         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.rsc \
    123         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.rsc
     128        $$appResourceDir(demos/embedded/styledemo/styledemo.rsc) \
     129        $$appResourceDir(demos/deform/deform.rsc) \
     130        $$appResourceDir(demos/pathstroke/pathstroke.rsc) \
     131        $$appResourceDir(examples/widgets/wiggly/wiggly.rsc) \
     132        $$appResourceDir(examples/network/qftp/qftp.rsc)\
     133        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.rsc) \
     134        $$appResourceDir(demos/embedded/desktopservices/desktopservices.rsc) \
     135        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \
     136        $$appResourceDir(examples/widgets/softkeys/softkeys.rsc) \
     137        $$appResourceDir(demos/embedded/raycasting/raycasting.rsc) \
     138        $$appResourceDir(demos/embedded/flickable/flickable.rsc) \
     139        $$appResourceDir(demos/embedded/digiflip/digiflip.rsc) \
     140        $$appResourceDir(demos/embedded/lightmaps/lightmaps.rsc) \
     141        $$appResourceDir(demos/embedded/flightinfo/flightinfo.rsc)
    124142
    125143
    … …  
    127145
    128146    mifs.sources = \
    129         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fluidlauncher.mif \
    130         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/styledemo.mif \
    131         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/deform.mif \
    132         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/pathstroke.mif \
    133         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/wiggly.mif \
    134         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qftp.mif \
    135         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/saxbookmarks.mif \
    136         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/desktopservices.mif \
    137         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/fridgemagnets.mif \
    138         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/softkeys.mif \
    139         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/raycasting.mif \
    140         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flickable.mif \
    141         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/digiflip.mif \
    142         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/lightmaps.mif \
    143         $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/flightinfo.mif
     147        $$appResourceDir(demos/embedded/fluidlauncher/fluidlauncher.mif) \
     148        $$appResourceDir(demos/embedded/styledemo/styledemo.mif) \
     149        $$appResourceDir(demos/deform/deform.mif) \
     150        $$appResourceDir(demos/pathstroke/pathstroke.mif) \
     151        $$appResourceDir(examples/widgets/wiggly/wiggly.mif) \
     152        $$appResourceDir(examples/network/qftp/qftp.mif) \
     153        $$appResourceDir(examples/xml/saxbookmarks/saxbookmarks.mif) \
     154        $$appResourceDir(demos/embedded/desktopservices/desktopservices.mif) \
     155        $$appResourceDir(examples/draganddrop/fridgemagnets/fridgemagnets.mif) \
     156        $$appResourceDir(examples/widgets/softkeys/softkeys.mif) \
     157        $$appResourceDir(demos/embedded/raycasting/raycasting.mif) \
     158        $$appResourceDir(demos/embedded/flickable/flickable.mif) \
     159        $$appResourceDir(demos/embedded/digiflip/digiflip.mif) \
     160        $$appResourceDir(demos/embedded/lightmaps/lightmaps.mif) \
     161        $$appResourceDir(demos/embedded/flightinfo/flightinfo.mif)
    144162    mifs.path = $$APP_RESOURCE_DIR
    145163
    146164    contains(QT_CONFIG, svg) {
    147165        executables.sources += \
    148             embeddedsvgviewer.exe \
    149             weatherinfo.exe
     166            $$QT_BUILD_TREE/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \
     167            $$QT_BUILD_TREE/demos/embedded/weatherinfo/weatherinfo.exe
    150168
    151169        reg_resource.sources += \
    152             $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/embeddedsvgviewer_reg.rsc \
    153             $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/weatherinfo_reg.rsc
     170            $$regResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \
     171            $$regResourceDir(demos/embedded/weatherinfo/weatherinfo_reg.rsc)
    154172
    155173        resource.sources += \
    156             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.rsc \
    157             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.rsc
    158 
    159         mifs.sources += \
    160             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/embeddedsvgviewer.mif \
    161             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/weatherinfo.mif
     174            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \
     175            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.rsc)
     176
     177        mifs.sources += \
     178            $$appResourceDir(demos/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \
     179            $$appResourceDir(demos/embedded/weatherinfo/weatherinfo.mif)
    162180
    163181    }
    164182    contains(QT_CONFIG, webkit) {
    165         executables.sources += anomaly.exe
    166         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/anomaly_reg.rsc
    167         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.rsc
    168         mifs.sources += \
    169             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
     183        executables.sources += $$QT_BUILD_TREE/demos/embedded/anomaly/anomaly.exe
     184        reg_resource.sources += $$regResourceDir(demos/embedded/anomaly/anomaly_reg.rsc)
     185        resource.sources += $$appResourceDir(demos/embedded/anomaly/anomaly.rsc)
     186        mifs.sources += \
     187            $$appResourceDir(demos/embedded/anomaly/anomaly.mif)
    170188
    171189        isEmpty(QT_LIBINFIX) {
    … …  
    178196
    179197    contains(QT_CONFIG, phonon) {
    180         executables.sources += qmediaplayer.exe
    181         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.rsc
    182         mifs.sources += \
    183             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/qmediaplayer.mif
     198        executables.sources += $$QT_BUILD_TREE/demos/qmediaplayer/qmediaplayer.exe
     199        resource.sources += $$appResourceDir(demos/qmediaplayer/qmediaplayer.rsc)
     200        mifs.sources += \
     201            $$appResourceDir(demos/qmediaplayer/qmediaplayer.mif)
    184202    }
    185203
    186204    contains(QT_CONFIG, multimedia) {
    187         executables.sources += spectrum.exe fftreal.dll
    188         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.rsc
    189         mifs.sources += \
    190             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/spectrum.mif
     205        executables.sources += $$QT_BUILD_TREE/demos/spectrum/app/spectrum.exe
     206        executables.sources += $$QT_BUILD_TREE/demos/spectrum/3rdparty/fftreal/fftreal.dll
     207        resource.sources += $$appResourceDir(demos/spectrum/app/spectrum.rsc)
     208        mifs.sources += \
     209            $$appResourceDir(demos/spectrum/app/spectrum.mif)
    191210    }
    192211
    193212    contains(QT_CONFIG, script) {
    194         executables.sources += context2d.exe
    195         reg_resource.sources += $${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/context2d_reg.rsc
    196         resource.sources += $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.rsc
    197         mifs.sources += \
    198             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/context2d.mif
     213        executables.sources += $$QT_BUILD_TREE/examples/script/context2d/context2d.exe
     214        reg_resource.sources += $$regResourceDir(examples/script/context2d/context2d_reg.rsc)
     215        resource.sources += $$appResourceDir(examples/script/context2d/context2d.rsc)
     216        mifs.sources += \
     217            $$appResourceDir(examples/script/context2d/context2d.mif)
     218    }
     219
     220    qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter
     221    contains(QT_CONFIG, declarative) {
     222        for(qmldemo, qmldemos) {
     223            executables.sources += $$QT_BUILD_TREE/demos/embedded/$${qmldemo}/$${qmldemo}.exe
     224            reg_resource.sources += $$regResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}_reg.rsc)
     225            resource.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.rsc)
     226            mifs.sources += $$appResourceDir(demos/embedded/$${qmldemo}/$${qmldemo}.mif)
     227        }
    199228    }
    200229
    … …  
    227256        mifs desktopservices_music desktopservices_images fluidbackup
    228257
     258    contains(QT_CONFIG, declarative):for(qmldemo, qmldemos):include($$QT_BUILD_TREE/demos/embedded/$${qmldemo}/deployment.pri)
     259
    229260    DEPLOYMENT.installer_header = 0xA000D7CD
    230261

  • trunk/demos/embedded/fluidlauncher/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/pictureflow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    604604  img = img.scaled(w, h, Qt::IgnoreAspectRatio, mode);
    605605
    606   // slightly larger, to accomodate for the reflection
     606  // slightly larger, to accommodate for the reflection
    607607  int hs = h * 2;
    608608  int hofs = h / 3;

  • trunk/demos/embedded/fluidlauncher/pictureflow.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/slideshow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/fluidlauncher/slideshow.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/lightmaps/lightmaps.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4343#include <QtGui>
    4444#include <QtNetwork>
    45 
    46 #if defined (Q_OS_SYMBIAN)
    47 #include "sym_iap_util.h"
    48 #endif
    4945
    5046#include <math.h>
    … …  
    491487private:
    492488    LightMaps *map;
     489    QNetworkSession *networkSession;
    493490
    494491public:
    … …  
    527524#endif
    528525
    529         QTimer::singleShot(0, this, SLOT(delayedInit()));
     526        QNetworkConfigurationManager manager;
     527        if (manager.capabilities() & QNetworkConfigurationManager::NetworkSessionRequired) {
     528            // Get saved network configuration
     529            QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
     530            settings.beginGroup(QLatin1String("QtNetwork"));
     531            const QString id =
     532                settings.value(QLatin1String("DefaultNetworkConfiguration")).toString();
     533            settings.endGroup();
     534
     535            // If the saved network configuration is not currently discovered use the system
     536            // default
     537            QNetworkConfiguration config = manager.configurationFromIdentifier(id);
     538            if ((config.state() & QNetworkConfiguration::Discovered) !=
     539                QNetworkConfiguration::Discovered) {
     540                config = manager.defaultConfiguration();
     541            }
     542
     543            networkSession = new QNetworkSession(config, this);
     544            connect(networkSession, SIGNAL(opened()), this, SLOT(sessionOpened()));
     545
     546            networkSession->open();
     547        } else {
     548            networkSession = 0;
     549        }
    530550    }
    531551
    532552private slots:
    533553
    534     void delayedInit() {
    535 #if defined(Q_OS_SYMBIAN)
    536         qt_SetDefaultIap();
    537 #endif
     554    void sessionOpened() {
     555        // Save the used configuration
     556        QNetworkConfiguration config = networkSession->configuration();
     557        QString id;
     558        if (config.type() == QNetworkConfiguration::UserChoice) {
     559            id = networkSession->sessionProperty(
     560                    QLatin1String("UserChoiceConfiguration")).toString();
     561        } else {
     562            id = config.identifier();
     563        }
     564
     565        QSettings settings(QSettings::UserScope, QLatin1String("Trolltech"));
     566        settings.beginGroup(QLatin1String("QtNetwork"));
     567        settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id);
     568        settings.endGroup();
    538569    }
    539570

  • trunk/demos/embedded/lightmaps/lightmaps.pro

    r769 r846  
    66    TARGET.UID3 = 0xA000CF75
    77    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    8     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    9     LIBS += -lesock -lcommdb -linsock # For IAP selection
    108    TARGET.CAPABILITY = NetworkServices
    119    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000

  • trunk/demos/embedded/raycasting/raycasting.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    143143
    144144        for (int ray = 0; ray < bufw; ++ray, u += du, v += dv) {
    145             // everytime this ray advances 'u' units in x direction,
     145            // every time this ray advances 'u' units in x direction,
    146146            // it also advanced 'v' units in y direction
    147147            qreal uu = (u < 0) ? -u : u;

  • trunk/demos/embedded/styledemo/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/styledemo/stylewidget.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/styledemo/stylewidget.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/demos/embedded/weatherinfo/weatherinfo.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4444#include <QtNetwork>
    4545#include <QtSvg>
    46 
    47 #if defined (Q_OS_SYMBIAN)
    48 #include "sym_iap_util.h"
    49 #endif
    5046
    5147class WeatherInfo: public QMainWindow
    … …  
    6864    QTimeLine m_timeLine;
    6965    QHash<QString, QString> m_icons;
     66    QNetworkAccessManager m_manager;
    7067
    7168public:
    … …  
    9996        setContextMenuPolicy(Qt::ActionsContextMenu);
    10097
     98        connect(&m_manager, SIGNAL(finished(QNetworkReply*)),
     99                this, SLOT(handleNetworkData(QNetworkReply*)));
     100
    101101        QTimer::singleShot(0, this, SLOT(delayedInit()));
    102102    }
    … …  
    104104private slots:
    105105    void delayedInit() {
    106 #if defined(Q_OS_SYMBIAN)
    107         qt_SetDefaultIap();
    108 #endif
    109106        request("Oslo");
    110107    }
    … …  
    123120            digest(QString::fromUtf8(networkReply->readAll()));
    124121        networkReply->deleteLater();
    125         networkReply->manager()->deleteLater();
    126122    }
    127123
    … …  
    186182        url.addEncodedQueryItem("weather", QUrl::toPercentEncoding(location));
    187183
    188         QNetworkAccessManager *manager = new QNetworkAccessManager(this);
    189         connect(manager, SIGNAL(finished(QNetworkReply*)),
    190                 this, SLOT(handleNetworkData(QNetworkReply*)));
    191         manager->get(QNetworkRequest(url));
     184        m_manager.get(QNetworkRequest(url));
    192185
    193186        city = QString();

  • trunk/demos/embedded/weatherinfo/weatherinfo.pro

    r769 r846  
    88    TARGET.UID3 = 0xA000CF77
    99    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
    10     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
    11     LIBS += -lesock -lcommdb -linsock # For IAP selection
    1210    TARGET.CAPABILITY = NetworkServices
    1311}
Note: See TracChangeset for help on using the changeset viewer.