--- a/.hgignore	Fri Apr 16 15:50:13 2010 +0300
+++ b/.hgignore	Mon May 03 13:17:34 2010 +0300
@@ -1,3 +1,2 @@
 syntax: glob
-
 .git

--- a/VERSION.SHA1	Fri Apr 16 15:50:13 2010 +0300
+++ b/VERSION.SHA1	Mon May 03 13:17:34 2010 +0300
@@ -1,1 +1,1 @@
-8c75a52bed9945c3263bfefb5b996982918fe29b
+364597fa4f043db390f1c64462f4d2338d5b1d2b

Binary file configure.exe has changed

--- a/configure_symbian	Fri Apr 16 15:50:13 2010 +0300
+++ b/configure_symbian	Mon May 03 13:17:34 2010 +0300
@@ -669,7 +669,8 @@
 CFG_LIBFREETYPE=no
 CFG_SQL_AVAILABLE=
 QT_DEFAULT_BUILD_PARTS="libs tools examples demos docs translations"
-CFG_BUILD_PARTS=""
+#QTP change for lRelease app. Need for Symbian
+CFG_BUILD_PARTS="translations"
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
 CFG_PHONON=yes
@@ -7559,7 +7560,7 @@
     case "$part" in
     tools) PART_ROOTS="$PART_ROOTS tools" ;;
     libs) PART_ROOTS="$PART_ROOTS src" ;;
-    translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
+    translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease" ;;
     examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
     *) ;;
     esac

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/confml/qtwebkit.confml	Mon May 03 13:17:34 2010 +0300
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<confml:configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:confml="http://www.s60.com/xml/confml/2" xsi:schemaLocation="http://www.s60.com/xml/confml/2 http://www.s60.com/xml/confml/1#//confml2">
+	<confml:feature name="QTWebkit" ref="qtwebkit">
+		<confml:desc>QT Webkit settings</confml:desc>
+		<confml:setting name="QT Webkit enabled" 
+						ref="Enabled"
+						type="boolean">
+			<confml:desc>To enable QT Webkit usage</confml:desc>
+		</confml:setting>
+	</confml:feature>
+	<confml:data>
+		<confml:qtwebkit>
+			<confml:Enabled>true</confml:Enabled>
+		</confml:qtwebkit>
+	</confml:data>
+</confml:configuration>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/content/apps/qtwebkit.sisx	Mon May 03 13:17:34 2010 +0300
@@ -0,0 +1,1 @@
+1
\ No newline at end of file

Binary file content/apps/qtwebkit_stub.sis has changed

--- a/demos/embedded/anomaly/anomaly.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/anomaly.pro	Mon May 03 13:17:34 2010 +0300
@@ -27,7 +27,7 @@
     TARGET.UID3 = 0xA000CF71
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock -linsock -lconnmon
+    LIBS += -lesock -linsock -lconnmon -lcommdb
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }

--- a/demos/embedded/anomaly/src/AddressBar.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/AddressBar.cpp	Mon May 03 13:17:34 2010 +0300
@@ -64,9 +64,9 @@
 AddressBar::AddressBar(QWidget *parent)
     : QWidget(parent)
 {
-    m_lineEdit = new LineEdit(this);
+    m_lineEdit = new LineEdit(parent);
     connect(m_lineEdit, SIGNAL(returnPressed()), SLOT(processAddress()));
-    m_toolButton = new QToolButton(this);
+    m_toolButton = new QToolButton(parent);
     m_toolButton->setText("Go");
     connect(m_toolButton, SIGNAL(clicked()), SLOT(processAddress()));
 }

--- a/demos/embedded/anomaly/src/BrowserView.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/BrowserView.cpp	Mon May 03 13:17:34 2010 +0300
@@ -71,7 +71,7 @@
     m_zoomLevels << 100;
     m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
 
-    initialize();
+    QTimer::singleShot(0, this, SLOT(initialize()));
 }
 
 void BrowserView::initialize()

--- a/demos/embedded/anomaly/src/BrowserWindow.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/BrowserWindow.cpp	Mon May 03 13:17:34 2010 +0300
@@ -93,12 +93,12 @@
 {
     // we use a ratio to handle resize corectly
     const int pos = -qRound(slideRatio * width());
-    m_slidingSurface->scroll(pos - m_browserView->x(), 0);
+    m_slidingSurface->scroll(pos - m_homeView->x(), 0);
 
-    if (qFuzzyCompare(slideRatio, static_cast<qreal>(0.0f))) {
+    if (qFuzzyCompare(slideRatio, static_cast<qreal>(1.0f))) {
         m_browserView->show();
         m_homeView->hide();
-    } else if (qFuzzyCompare(slideRatio, static_cast<qreal>(1.0f))) {
+    } else if (qFuzzyCompare(slideRatio, static_cast<qreal>(0.0f))) {
         m_homeView->show();
         m_browserView->hide();
     } else {
@@ -110,13 +110,13 @@
 qreal BrowserWindow::slideValue() const
 {
     Q_ASSERT(m_slidingSurface->x() < width());
-    return static_cast<qreal>(qAbs(m_browserView->x())) / width();
+    return static_cast<qreal>(qAbs(m_homeView->x())) / width();
 }
 
 void BrowserWindow::showHomeView()
 {
     m_animation->setStartValue(slideValue());
-    m_animation->setEndValue(1.0f);
+    m_animation->setEndValue(0.0f);
     m_animation->start();
     m_homeView->setFocus();
 }
@@ -124,7 +124,7 @@
 void BrowserWindow::showBrowserView()
 {
     m_animation->setStartValue(slideValue());
-    m_animation->setEndValue(0.0f);
+    m_animation->setEndValue(1.0f);
     m_animation->start();
 
     m_browserView->setFocus();
@@ -140,7 +140,7 @@
                                                              ? QAbstractAnimation::Forward
                                                                  : QAbstractAnimation::Backward;
             m_animation->setDirection(direction);
-        } else if (qFuzzyCompare(slideValue(), static_cast<qreal>(0.0f)))
+        } else if (qFuzzyCompare(slideValue(), static_cast<qreal>(1.0f)))
             showHomeView();
         else
             showBrowserView();
@@ -151,16 +151,16 @@
 void BrowserWindow::resizeEvent(QResizeEvent *event)
 {
     const QSize oldSize = event->oldSize();
-    const qreal oldSlidingRatio = static_cast<qreal>(qAbs(m_browserView->x())) / oldSize.width();
+    const qreal oldSlidingRatio = static_cast<qreal>(qAbs(m_homeView->x())) / oldSize.width();
 
     const QSize newSize = event->size();
     m_slidingSurface->resize(newSize.width() * 2, newSize.height());
 
     m_homeView->resize(newSize);
-    m_homeView->move(newSize.width(), 0);
+    m_homeView->move(0, 0);
 
     m_browserView->resize(newSize);
-    m_browserView->move(0, 0);
+    m_browserView->move(newSize.width(), 0);
 
     setSlideValue(oldSlidingRatio);
 }

--- a/demos/embedded/anomaly/src/ControlStrip.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/ControlStrip.cpp	Mon May 03 13:17:34 2010 +0300
@@ -75,23 +75,22 @@
     }
 
     if (x > width() - h) {
-    		emit closeClicked();    		
-    		event->accept();
-    		return;
-            
-        }
+        emit closeClicked();
+        event->accept();
+        return;
+    }
 
     if ((x < width() - 2 * h) && (x > width() - 3 * h)) {
-    		emit forwardClicked();
-    		event->accept();
-    		return;
-        }
+        emit forwardClicked();
+        event->accept();
+        return;
+    }
 
     if ((x < width() - 3 * h) && (x > width() - 5 * h)) {
-    		emit backClicked();
-    		event->accept();
-    		return;
-        }
+        emit backClicked();
+        event->accept();
+        return;
+    }
 }
 
 void ControlStrip::paintEvent(QPaintEvent *event)
@@ -99,14 +98,13 @@
     int h = height();
     int s = (h - menuPixmap.height()) / 2;
 
+    QPainter p(this);
+    p.fillRect(event->rect(), QColor(32, 32, 32, 192));
+    p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    p.drawPixmap(s, s, menuPixmap);
+    p.drawPixmap(width() - h + s, s, closePixmap);
+    p.drawPixmap(width() - 3 * h + s, s, forwardPixmap);
+    p.drawPixmap(width() - 5 * h + s, s, backPixmap);
 
-	QPainter p(this);
-	p.fillRect(event->rect(), QColor(32, 32, 32, 192));
-	p.setCompositionMode(QPainter::CompositionMode_SourceOver);
-	p.drawPixmap(s, s, menuPixmap);
-	p.drawPixmap(width() - h + s, s, closePixmap);	    
-	p.drawPixmap(width() - 3 * h + s, s, forwardPixmap);
-	p.drawPixmap(width() - 5 * h + s, s, backPixmap);
-	    
-	p.end();
+    p.end();
 }

--- a/demos/embedded/anomaly/src/ControlStrip.h	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/ControlStrip.h	Mon May 03 13:17:34 2010 +0300
@@ -58,7 +58,7 @@
     void menuClicked();
     void backClicked();
     void forwardClicked();
-    void closeClicked ();
+    void closeClicked();
 
 protected:
     void paintEvent(QPaintEvent *event);

--- a/demos/embedded/anomaly/src/HomeView.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/HomeView.cpp	Mon May 03 13:17:34 2010 +0300
@@ -51,16 +51,12 @@
     : QWidget(parent)
     , m_addressBar(0)
 {
-    m_addressBar = new AddressBar(this);
+    m_addressBar = new AddressBar(parent);
     connect(m_addressBar, SIGNAL(addressEntered(QString)), SLOT(gotoAddress(QString)));
 
-    m_bookmarks = new BookmarksView(this);
+    m_bookmarks = new BookmarksView(parent);
     connect(m_bookmarks, SIGNAL(urlSelected(QUrl)), SIGNAL(urlActivated(QUrl)));
 
-    QPalette pal =  m_bookmarks->palette();
-    pal.setBrush(QPalette::Base, Qt::white);
-    m_bookmarks->setPalette(pal);
-     
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(4);
     layout->setSpacing(4);

--- a/demos/embedded/anomaly/src/anomaly.qrc	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/anomaly/src/anomaly.qrc	Mon May 03 13:17:34 2010 +0300
@@ -5,6 +5,6 @@
         <file>images/edit-find.png</file>
         <file>images/list-add.png</file>
         <file>images/list-remove.png</file>
-        <file>images/button-close.png</file>        
+        <file>images/button-close.png</file>
     </qresource>
 </RCC>

Binary file demos/embedded/anomaly/src/images/button-close.png has changed

--- a/demos/embedded/desktopservices/contenttab.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/desktopservices/contenttab.cpp	Mon May 03 13:17:34 2010 +0300
@@ -114,20 +114,6 @@
 void ContentTab::keyPressEvent(QKeyEvent *event)
 {
     switch (event->key()) {
-    case Qt::Key_Up:
-        if (currentRow() == 0) {
-            setCurrentRow(count() - 1);
-        } else {
-            setCurrentRow(currentRow() - 1);
-        }
-        break;
-    case Qt::Key_Down:
-        if (currentRow() == (count() - 1)) {
-            setCurrentRow(0);
-        } else {
-            setCurrentRow(currentRow() + 1);
-        }
-        break;
     case Qt::Key_Select:
         openItem(currentItem());
     default:

--- a/demos/embedded/flightinfo/flightinfo.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/flightinfo/flightinfo.pro	Mon May 03 13:17:34 2010 +0300
@@ -9,7 +9,7 @@
     TARGET.UID3 = 0xA000CF74
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock  -lconnmon -linsock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
     TARGET.CAPABILITY = NetworkServices
 }
 

--- a/demos/embedded/fluidlauncher/fluidlauncher.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/fluidlauncher/fluidlauncher.pro	Mon May 03 13:17:34 2010 +0300
@@ -164,10 +164,12 @@
         mifs.sources += \
             $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/anomaly.mif
 
-        # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
-        executables.pkg_prerules += \
-            "; Dependency to Qt Webkit" \
-            "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+        isEmpty(QT_LIBINFIX) {
+            # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically
+            executables.pkg_prerules += \
+                "; Dependency to Qt Webkit" \
+                "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+        }
     }
 
     contains(QT_CONFIG, phonon) {

--- a/demos/embedded/lightmaps/lightmaps.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/lightmaps/lightmaps.pro	Mon May 03 13:17:34 2010 +0300
@@ -6,7 +6,7 @@
     TARGET.UID3 = 0xA000CF75
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock  -lconnmon -linsock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
     TARGET.CAPABILITY = NetworkServices
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }

--- a/demos/embedded/weatherinfo/weatherinfo.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/embedded/weatherinfo/weatherinfo.pro	Mon May 03 13:17:34 2010 +0300
@@ -8,7 +8,7 @@
     TARGET.UID3 = 0xA000CF77
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock -lconnmon -linsock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
     TARGET.CAPABILITY = NetworkServices
 }
 

--- a/demos/sqlbrowser/browser.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/sqlbrowser/browser.cpp	Mon May 03 13:17:34 2010 +0300
@@ -146,7 +146,7 @@
 {
     QSqlTableModel *model = new QSqlTableModel(table, connectionWidget->currentDatabase());
     model->setEditStrategy(QSqlTableModel::OnRowChange);
-    model->setTable(t);
+    model->setTable(connectionWidget->currentDatabase().driver()->escapeIdentifier(t, QSqlDriver::TableName));
     model->select();
     if (model->lastError().type() != QSqlError::NoError)
         emit statusMessage(model->lastError().text());

--- a/demos/symbianpkgrules.pri	Fri Apr 16 15:50:13 2010 +0300
+++ b/demos/symbianpkgrules.pri	Mon May 03 13:17:34 2010 +0300
@@ -10,6 +10,7 @@
     ":\"Nokia, Qt\"" \
     " "
 
-default_deployment.pkg_prerules += vendorinfo
+demos_deployment.pkg_prerules += vendorinfo
+DEPLOYMENT += demos_deployment
 
 isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg

--- a/dist/changes-4.5.4	Fri Apr 16 15:50:13 2010 +0300
+++ b/dist/changes-4.5.4	Mon May 03 13:17:34 2010 +0300
@@ -9,12 +9,12 @@
 Applications compiled for 4.4 will continue to run with 4.5.
 
 Some of the changes listed in this file include issue tracking numbers
-corresponding to tasks in the Task Tracker:
+corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
+Tracker, or the Merge Request queue of the public source repository.
 
-  http://www.qtsoftware.com/developer/task-tracker
-
-Each of these identifiers can be entered in the task tracker to obtain more
-information about a particular change.
+Qt Bug Tracker: http://bugreports.qt.nokia.com
+Task Tracker:   http://qt.nokia.com/developer/task-tracker
+Merge Request:  http://qt.gitorious.org
 
 ****************************************************************************
 *                           General                                        *

--- a/dist/changes-4.6.3	Fri Apr 16 15:50:13 2010 +0300
+++ b/dist/changes-4.6.3	Mon May 03 13:17:34 2010 +0300
@@ -138,6 +138,14 @@
 
  -
 
+Qt for Symbian
+--------------
+
+ - [QT-567] Implementation of QtMultimedia QAudio* APIs
+ - [QTBUG-8919] Modified Phonon MMF backend to support video playback on
+   platforms which use graphics surfaces (i.e. platforms using the
+   New Graphics Architecture a.k.a. ScreenPlay)
+
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************

--- a/examples/animation/animatedtiles/animatedtiles.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/animatedtiles/animatedtiles.pro	Mon May 03 13:17:34 2010 +0300
@@ -6,3 +6,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/animatedtiles
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000D7D1
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/animation/appchooser/appchooser.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/appchooser/appchooser.pro	Mon May 03 13:17:34 2010 +0300
@@ -6,3 +6,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/appchooser
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000E3F5
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/animation/easing/easing.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/easing/easing.pro	Mon May 03 13:17:34 2010 +0300
@@ -12,3 +12,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/easing
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000E3F6
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/animation/moveblocks/moveblocks.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/moveblocks/moveblocks.pro	Mon May 03 13:17:34 2010 +0300
@@ -5,3 +5,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/moveblocks
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000E3F7
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/animation/states/states.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/states/states.pro	Mon May 03 13:17:34 2010 +0300
@@ -6,3 +6,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/states
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000E3F8
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/animation/stickman/stickman.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/animation/stickman/stickman.pro	Mon May 03 13:17:34 2010 +0300
@@ -17,3 +17,8 @@
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman
 INSTALLS += target sources
+
+symbian {
+    TARGET.UID3 = 0xA000E3F9
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/gestures/imagegestures/imagegestures.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/gestures/imagegestures/imagegestures.pro	Mon May 03 13:17:34 2010 +0300
@@ -14,3 +14,8 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures
 INSTALLS += target \
     sources
+
+symbian {
+    TARGET.UID3 = 0xA000D7D0
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/multimedia/audioinput/audioinput.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/multimedia/audioinput/audioinput.cpp	Mon May 03 13:17:34 2010 +0300
@@ -76,6 +76,7 @@
         case QAudioFormat::SignedInt:
             m_maxAmplitude = 127;
             break;
+        default: ;
         }
         break;
     case 16:
@@ -86,6 +87,7 @@
         case QAudioFormat::SignedInt:
             m_maxAmplitude = 32767;
             break;
+        default: ;
         }
         break;
     }

--- a/examples/multimedia/audioinput/audioinput.h	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/multimedia/audioinput/audioinput.h	Mon May 03 13:17:34 2010 +0300
@@ -119,8 +119,8 @@
     QPushButton *m_suspendResumeButton;
     QComboBox *m_deviceBox;
 
+    QAudioDeviceInfo m_device;
     AudioInfo *m_audioInfo;
-    QAudioDeviceInfo m_device;
     QAudioFormat m_format;
     QAudioInput *m_audioInput;
     QIODevice *m_input;

--- a/examples/multimedia/audioinput/audioinput.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/multimedia/audioinput/audioinput.pro	Mon May 03 13:17:34 2010 +0300
@@ -12,5 +12,6 @@
 
 symbian {
     TARGET.UID3 = 0xA000D7BF
+    TARGET.CAPABILITY += UserEnvironment
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }

--- a/examples/network/fortuneclient/fortuneclient.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/network/fortuneclient/fortuneclient.pro	Mon May 03 13:17:34 2010 +0300
@@ -12,7 +12,7 @@
 symbian {
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
     TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }

--- a/examples/network/fortuneserver/fortuneserver.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/network/fortuneserver/fortuneserver.pro	Mon May 03 13:17:34 2010 +0300
@@ -13,7 +13,7 @@
     TARGET.UID3 = 0xA000CF71
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
     TARGET.CAPABILITY = "All -TCB"
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }

--- a/examples/network/network-chat/network-chat.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/network/network-chat/network-chat.pro	Mon May 03 13:17:34 2010 +0300
@@ -21,7 +21,8 @@
 symbian {
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
     HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
-    LIBS += -lesock -lconnmon -lcharconv -linsock
+    LIBS += -lesock -lcommdb -linsock # For IAP selection
+    LIBS += -lcharconv
     TARGET.CAPABILITY = "NetworkServices ReadUserData WriteUserData"
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }

--- a/examples/network/qftp/sym_iap_util.h	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/network/qftp/sym_iap_util.h	Mon May 03 13:17:34 2010 +0300
@@ -60,6 +60,7 @@
 //#include <QTextCodec>
 
 _LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
+_LIT(KIapTableIdField, "IAP\Id");
 _LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
 _LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
 _LIT(KIapServiceType, "IAP\\IAPServiceType");   // text - mandatory
@@ -367,20 +368,25 @@
     CleanupClosePushL(connection);
 
     socketServ.Connect();
+
+    TCommDbConnPref prefs;
+    prefs.SetDialogPreference(ECommDbDialogPrefPrompt);
+
     connection.Open(socketServ);
-    connection.Start();
+    connection.Start(prefs);
 
     connection.GetDesSetting(TPtrC(KIapNameSetting), iapName);
-
     //connection.Stop();
 
     iapName.ZeroTerminate();
     QString strIapName((char*)iapName.Ptr());
 
     int error = 0;
-    if(!qt_SetDefaultIapName(strIapName, error)) {
-        //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
-        strIapName = QString("");
+    if(!strIapName.isEmpty()) {
+        if(!qt_SetDefaultIapName(strIapName, error)) {
+            //printf("failed setdefaultif @ %i with %s and errno = %d \n", __LINE__, strIapName.toUtf8().data(), error);
+            strIapName = QString("");
+        }
     }
 
     CleanupStack::PopAndDestroy(&connection);

--- a/examples/openvg/star/starwidget.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/openvg/star/starwidget.cpp	Mon May 03 13:17:34 2010 +0300
@@ -93,8 +93,9 @@
     // and prepare to perform raw OpenVG calls.
     painter.beginNativePainting();
 
-    // Cache the path if we haven't already.
-    if (path == VG_INVALID_HANDLE) {
+    // Cache the path if we haven't already or if the path has
+    // become invalid because the window's context has changed.
+    if (path == VG_INVALID_HANDLE || !vgGetPathCapabilities(path)) {
         path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                             VG_PATH_DATATYPE_F,
                             1.0f, // scale

--- a/examples/sql/masterdetail/masterdetail.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/sql/masterdetail/masterdetail.pro	Mon May 03 13:17:34 2010 +0300
@@ -15,4 +15,7 @@
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail
 INSTALLS += target sources
 
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian {
+    TARGET.UID3 = 0xA000D7CF
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+}

--- a/examples/sql/sql.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/sql/sql.pro	Mon May 03 13:17:34 2010 +0300
@@ -1,17 +1,16 @@
 TEMPLATE      = subdirs
 
 SUBDIRS             =   drilldown
-
-symbian: SUBDIRS   +=  masterdetail
-
 !symbian: SUBDIRS   +=  cachedtable \
                         relationaltablemodel \
                         sqlwidgetmapper
 
+!wince*:  SUBDIRS   +=  masterdetail
+
 !wince*:!symbian: SUBDIRS += \
                         querymodel \
-                        tablemodel \
-                        masterdetail
+                        tablemodel
+
 
 # install
 sources.files = connection.h sql.pro README

--- a/examples/symbianpkgrules.pri	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/symbianpkgrules.pri	Mon May 03 13:17:34 2010 +0300
@@ -10,6 +10,7 @@
     ":\"Nokia, Qt\"" \
     " "
 
-default_deployment.pkg_prerules += vendorinfo
+examples_deployment.pkg_prerules += vendorinfo
+DEPLOYMENT += examples_deployment
 
 isEmpty(ICON):ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg

--- a/examples/widgets/softkeys/softkeys.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/widgets/softkeys/softkeys.cpp	Mon May 03 13:17:34 2010 +0300
@@ -70,6 +70,12 @@
     toggleButton->setContextMenuPolicy(Qt::NoContextMenu);
     toggleButton->setCheckable(true);
 
+    modeButton = new QPushButton(tr("Loop SK window type"), this);
+    modeButton->setContextMenuPolicy(Qt::NoContextMenu);
+
+    modeLabel = new QLabel(tr("Normal maximized"), this);
+    modeLabel->setContextMenuPolicy(Qt::NoContextMenu);
+
     pushButton = new QPushButton(tr("File Dialog"), this);
     pushButton->setContextMenuPolicy(Qt::NoContextMenu);
 
@@ -87,6 +93,8 @@
     layout->addWidget(toggleButton, 2, 0);
     layout->addWidget(pushButton, 2, 1);
     layout->addWidget(comboBox, 3, 0, 1, 2);
+    layout->addWidget(modeButton, 4, 0, 1, 2);
+    layout->addWidget(modeLabel, 5, 0, 1, 2);
     central->setLayout(layout);
 
     fileMenu = menuBar()->addMenu(tr("&File"));
@@ -97,6 +105,7 @@
     connect(pushButton, SIGNAL(clicked()), this, SLOT(openDialog()));
     connect(exit, SIGNAL(triggered()), this, SLOT(exitApplication()));
     connect(toggleButton, SIGNAL(clicked()), this, SLOT(setCustomSoftKeys()));
+    connect(modeButton, SIGNAL(clicked()), this, SLOT(setMode()));
     pushButton->setFocus();
 }
 
@@ -133,6 +142,35 @@
     }
 }
 
+void MainWindow::setMode()
+{
+    if(isMaximized()) {
+        showFullScreen();
+        modeLabel->setText(tr("Normal Fullscreen"));
+    } else {
+        Qt::WindowFlags flags = windowFlags();
+        if(flags & Qt::WindowSoftkeysRespondHint) {
+            flags |= Qt::WindowSoftkeysVisibleHint;
+            flags &= ~Qt::WindowSoftkeysRespondHint;
+            setWindowFlags(flags); // Hides visible window
+            showFullScreen();
+            modeLabel->setText(tr("Fullscreen with softkeys"));
+        } else if(flags & Qt::WindowSoftkeysVisibleHint) {
+            flags &= ~Qt::WindowSoftkeysVisibleHint;
+            flags &= ~Qt::WindowSoftkeysRespondHint;
+            setWindowFlags(flags); // Hides visible window
+            showMaximized();
+            modeLabel->setText(tr("Normal Maximized"));
+        } else {
+            flags &= ~Qt::WindowSoftkeysVisibleHint;
+            flags |= Qt::WindowSoftkeysRespondHint;
+            setWindowFlags(flags); // Hides visible window
+            showFullScreen();
+            modeLabel->setText(tr("Fullscreen with SK respond"));
+        }
+    }
+}
+
 void MainWindow::exitApplication()
 {
     qApp->exit();

--- a/examples/widgets/softkeys/softkeys.h	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/widgets/softkeys/softkeys.h	Mon May 03 13:17:34 2010 +0300
@@ -57,21 +57,24 @@
     void okPressed();
     void cancelPressed();
     void setCustomSoftKeys();
+    void setMode();
 public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
 private:
     QGridLayout *layout;
     QWidget *central;
-    QTextEdit* textEditor;
+    QTextEdit *textEditor;
     QLabel *infoLabel;
-    QPushButton* toggleButton;
-    QPushButton* pushButton;
-    QMenu* fileMenu;
-    QAction* addSoftKeysAct;
-    QAction* exit;
-    QAction* ok;
-    QAction* cancel;
+    QPushButton *toggleButton;
+    QPushButton *pushButton;
+    QPushButton *modeButton;
+    QLabel *modeLabel;
+    QMenu *fileMenu;
+    QAction *addSoftKeysAct;
+    QAction *exit;
+    QAction *ok;
+    QAction *cancel;
 };
 
 //! [0]

--- a/examples/widgets/wiggly/dialog.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/widgets/wiggly/dialog.cpp	Mon May 03 13:17:34 2010 +0300
@@ -57,15 +57,16 @@
     setLayout(layout);
 
 #ifdef QT_SOFTKEYS_ENABLED
+    QAction *exitAction = new QAction(tr("Exit"), this);
+    exitAction->setSoftKeyRole(QAction::NegativeSoftKey);
+    connect (exitAction, SIGNAL(triggered()),this, SLOT(close()));
+    addAction (exitAction);
 
-    QAction *exitAction = new QAction(tr("Exit"), this); 
-    exitAction->setSoftKeyRole(QAction::NegativeSoftKey); 
-    connect (exitAction, SIGNAL(triggered()),this, SLOT(close())); 
-    addAction (exitAction); 
-
+    Qt::WindowFlags flags = windowFlags();
+    flags |= Qt::WindowSoftkeysVisibleHint;
+    setWindowFlags(flags);
 #endif
 
-
     connect(lineEdit, SIGNAL(textChanged(QString)),
             wigglyWidget, SLOT(setText(QString)));
     if (!smallScreen){

--- a/examples/widgets/windowflags/controllerwindow.cpp	Fri Apr 16 15:50:13 2010 +0300
+++ b/examples/widgets/windowflags/controllerwindow.cpp	Mon May 03 13:17:34 2010 +0300
@@ -58,7 +58,7 @@
     bottomLayout->addStretch();
     bottomLayout->addWidget(quitButton);
 
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    QHBoxLayout *mainLayout = new QHBoxLayout;
     mainLayout->addWidget(typeGroupBox);
     mainLayout->addWidget(hintsGroupBox);
     mainLayout->addLayout(bottomLayout);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/implml/qtwebkit_copy.implml	Mon May 03 13:17:34 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container  xmlns="http://www.symbianfoundation.org/xml/implml/1"
+			condition="${qtwebkit.Enabled}">
+	<tag name="target" value="uda" />
+	<content xmlns="http://www.s60.com/xml/content/2">	  
+	  <output dir="sis" flatten="true">
+	    <input file="sis/qtwebkit.sisx" />
+	  </output>
+	</content>
+</container>

--- a/mkspecs/common/symbian/symbian.conf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/common/symbian/symbian.conf	Mon May 03 13:17:34 2010 +0300
@@ -26,10 +26,13 @@
 QMAKE_CFLAGS_DEBUG	=
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
 
+
+VERSION_FLAGS.ARMCC = ARMCC_4_0
 QMAKE_CXX		= g++
 QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS.CW	= 
-QMAKE_CXXFLAGS.ARMCC	= --visibility_inlines_hidden
+QMAKE_CXXFLAGS.ARMCC      = --visibility_inlines_hidden
+QMAKE_CXXFLAGS.ARMCC_4_0  = --import_all_vtbl
 QMAKE_CXXFLAGS.GCCE	= -fvisibility-inlines-hidden
 QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
@@ -111,6 +114,7 @@
 
 load(qt_config)
 load(platform_paths)
+load(add_mmp_rules)
 
 symbian-abld {
 # Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
@@ -123,16 +127,25 @@
 MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
 SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
 
-# Legacy support requires some hardcoded stdapis paths. 
 INCLUDEPATH = \
     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
     $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian \
     $${EPOCROOT}epoc32/include \
     $$OS_LAYER_LIBC_SYSTEMINCLUDE \
     $$INCLUDEPATH
-    
+
+# Ensure '.' directory is the first in include path.
+# RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
+MMP_RULES += "USERINCLUDE ."
+
+# pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer
+# if multiple languages need to be supported by pkg file. In that case the developer should declare
+# multiple language compatible dependency statements him/herself.
+
+default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
+
 # Supports S60 3.0, 3.1, 3.2 and 5.0 by default
-default_deployment.pkg_prerules = \
+pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
     "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
     "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
@@ -168,3 +181,4 @@
         }
     }
 }
+

--- a/mkspecs/features/default_post.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/default_post.prf	Mon May 03 13:17:34 2010 +0300
@@ -6,6 +6,20 @@
     CONFIG = incredibuild_xge $$CONFIG
 }
 
-#QTP: to remove the INCLUDE env variable headers 
-#QMAKE_INCDIR += $$QMAKE_INCDIR_POST}
-#QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST}
+QMAKE_INCDIR += $$QMAKE_INCDIR_POST
+QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
+
+# Let every project have a standard GNU `check' target
+!contains(QMAKE_EXTRA_TARGETS, check) {
+    # `make check' should iterate through all subdirs
+    contains(TEMPLATE, subdirs) {
+        check.CONFIG = recursive
+        check.recurse = $$SUBDIRS
+        check.recurse_target = check
+    }
+    # `make check' should imply building the project
+    else {
+        check.depends = first
+    }
+    QMAKE_EXTRA_TARGETS += check
+}

--- a/mkspecs/features/qttest_p4.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/qttest_p4.prf	Mon May 03 13:17:34 2010 +0300
@@ -27,7 +27,7 @@
 QMAKE_EXTRA_TARGETS += check
 
 !debug_and_release|build_pass {
-    check.depends = $(DESTDIR_TARGET)
+    check.depends = first
 } else {
     check.CONFIG = recursive
     # In debug and release mode, only run the test once.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/features/symbian/add_mmp_rules.prf	Mon May 03 13:17:34 2010 +0300
@@ -0,0 +1,33 @@
+# Arg1: List of conditions to generate block for
+# Arg2: List of variables containing rules to add
+defineTest(addMMPRules) {
+    unset(myConditions)
+    unset(myVariables)
+    unset(myIfDef)
+
+    myConditions = $$eval($$1) default
+    myVariables = $$eval($$2)
+    myIfDef = if
+
+    for(condition, $$list($$myConditions)) {
+        contains(condition, default) {
+            libBlock = "$${LITERAL_HASH}else"
+        } else {
+            libBlock = "$${LITERAL_HASH}$${myIfDef} defined($${condition})"
+            myIfDef = elif
+        }
+
+        for(var, $$list($$myVariables)) {
+            varVal = $$eval($${var}.$${condition})
+            isEmpty(varVal) {
+                # No value defined for current condition, so use default
+                varVal = $$eval($${var}.default)
+            }
+            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\n))"
+        }
+
+        MMP_RULES += $$libBlock
+    }
+    MMP_RULES += "$${LITERAL_HASH}endif"
+    export(MMP_RULES)
+}

--- a/mkspecs/features/symbian/application_icon.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/application_icon.prf	Mon May 03 13:17:34 2010 +0300
@@ -3,7 +3,7 @@
 # If no_icon keyword exist, the S60 UI app is just made hidden. This because S60 app FW
 # requires the registration resource file to exist always
 contains( CONFIG, no_icon ) {
-    symbian:RSS_RULES ="hidden = KAppIsHidden;"
+    symbian:RSS_RULES += "hidden = KAppIsHidden;"
     CONFIG -= no_icon
 } else {
 # There is no point in compiling the MIF icon if no_icon CONFIGS is set

--- a/mkspecs/features/symbian/data_caging_paths.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/data_caging_paths.prf	Mon May 03 13:17:34 2010 +0300
@@ -74,7 +74,7 @@
     BOOTDATA_DIR            = /resource/bootdata
 }
 
-isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/plugins
+isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
 isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
 isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps
 isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file

--- a/mkspecs/features/symbian/def_files.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/def_files.prf	Mon May 03 13:17:34 2010 +0300
@@ -25,3 +25,4 @@
         
     }
 }
+

--- a/mkspecs/features/symbian/default_post.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/default_post.prf	Mon May 03 13:17:34 2010 +0300
@@ -5,7 +5,7 @@
         QMAKE_LIBS +=
     } else:contains(QT, gui):contains(CONFIG,qt) {
         S60MAIN_LIBS = -leuser
-        QMAKE_LIBS += -lqtmain.lib $$S60MAIN_LIBS
+        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
     } else {
         QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
     }

--- a/mkspecs/features/symbian/platform_paths.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/platform_paths.prf	Mon May 03 13:17:34 2010 +0300
@@ -230,33 +230,6 @@
 
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
 
-        # ---------------------------------------
-        # Definitions to export IBY files to different folders where they will be taken 
-        # to ROM image
-        # ---------------------------------------
-              
-        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
-        }
-        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
-        }
-        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
-        }
-        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/os/$$1)
-        }
-        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
-        }
-        
-        # You need to define the following in pro-file, if you are using the stllib:
-        # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
-        # DEFINES *= $$STLLIB_USAGE_DEFINES
-        STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
-        STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
-
     } else { # Old pre-SF structure
 
         # ---------------------------------------
@@ -450,34 +423,49 @@
         OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility) \
                                             /epoc32/include/stdapis/utility
 
-        # ---------------------------------------
-        # Definitions to export IBY files to different folders where they will be taken 
-        # to ROM image
-        # ---------------------------------------
-              
-        defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/app/$$1)
-        }
-        defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/mw/$$1)
-        }
-        defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
-        }
-        defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/core/osext/$$1)
-        }
-        defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
-            return(/epoc32/rom/include/$$1)
-        }
-        
-        # You need to define the following in pro-file, if you are using the stllib:
-        # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
-        # DEFINES *= $$STLLIB_USAGE_DEFINES
-        STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
-        STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
-    
     } 
+
+    # Definitions common to both structures
+
+    # ---------------------------------------
+    # Definitions to export IBY files to different folders where they will be taken
+    # to ROM image
+    # ---------------------------------------
+
+    defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/core/app/$$1)
+    }
+    defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/core/mw/$$1)
+    }
+
+    defineReplace(LANGUAGE_APP_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/language/app/$$1)
+    }
+    defineReplace(LANGUAGE_MW_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/language/mw/$$1)
+    }
+
+    defineReplace(CUSTOMER_APP_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/customer/app/$$1)
+    }
+    defineReplace(CUSTOMER_MW_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/customer/mw/$$1)
+    }
+
+    defineReplace(CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/customervariant/app/$$1)
+    }
+    defineReplace(CUSTOMER_VARIANT_MW_LAYER_IBY_EXPORT_PATH) {
+        return(/epoc32/rom/include/customervariant/mw/$$1)
+    }
+
+    # You need to define the following in pro-file, if you are using the stllib:
+    # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
+    # DEFINES *= $$STLLIB_USAGE_DEFINES
+    STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
+    STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
+
 }
 
 

--- a/mkspecs/features/symbian/qt.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/qt.prf	Mon May 03 13:17:34 2010 +0300
@@ -22,19 +22,23 @@
 INCLUDEPATH = $$PREPEND_INCLUDEPATH $$INCLUDEPATH
 
 # Add dependency to Qt package to all other projects besides Qt libs.
-# Note: Qt libs with full capabilities has UID3 of 0x2001E61C,
+# Note: Qt libs package with full capabilities has UID3 of 0x2001E61C,
 #       while self-signed version typically has temporary UID3 of 0xE001E61C.
-contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
-    default_deployment.pkg_prerules += \
+contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) {
+    pkg_depends_qt += \
         "; Default dependency to Qt libraries" \
         "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"Qt\"}"
 
     # Projects linking to webkit need dependency to webkit
     contains(QT, webkit): {
-        default_deployment.pkg_prerules += \
+        pkg_depends_webkit += \
             "; Dependency to Qt Webkit" \
             "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
+    } else {
+        default_deployment.pkg_prerules -= pkg_depends_webkit
     }
+} else {
+    default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt
 }
 
 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
@@ -44,8 +48,3 @@
 
 #QTP: add userinclude 
 MMP_RULES+="USERINCLUDE  ."
-
-my_custom_rule = "$${LITERAL_HASH}if defined(ARMCC) && !defined(ARMCC_2_2) && !defined(ARMCC_3_1)"\
-"OPTION ARMCC --import_all_vtbl" \
-"$${LITERAL_HASH}endif"
-MMP_RULES += my_custom_rule
\ No newline at end of file

--- a/mkspecs/features/symbian/stl.prf	Fri Apr 16 15:50:13 2010 +0300
+++ b/mkspecs/features/symbian/stl.prf	Mon May 03 13:17:34 2010 +0300
@@ -30,4 +30,3 @@
 
 LIBS *= $$STL_LIB
 MMP_RULES *= $$STL_MMP_RULE
-