From 524c61de5238d58a4019a54001736d60c2daf1ce Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 30 Jun 2010 14:17:40 +0300 Subject: Fixed pre-built resources deployment in Symbian Pre-built resources didn't get properly copied under \epoc32\data\z. Task-number: QTBUG-11519 Reviewed-by: Janne Koskinen --- qmake/generators/symbian/initprojectdeploy_symbian.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp index 2750ecb..382e012 100644 --- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp +++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp @@ -198,6 +198,7 @@ void initProjectDeploySymbian(QMakeProject* project, devicePathWithoutDrive.remove(0,2); } if (!deployBinaries + && 0 != platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM)) && !devicePathWithoutDrive.isEmpty() && (0 == devicePathWithoutDrive.compare(project->values("APP_RESOURCE_DIR").join(""), Qt::CaseInsensitive) || 0 == devicePathWithoutDrive.compare(project->values("REG_RESOURCE_IMPORT_DIR").join(""), Qt::CaseInsensitive))) { @@ -343,4 +344,17 @@ void initProjectDeploySymbian(QMakeProject* project, } } } + + // Remove deployments that do not actually do anything + if (0 == platform.compare(QLatin1String(EMULATOR_DEPLOYMENT_PLATFORM)) + || 0 == platform.compare(QLatin1String(ROM_DEPLOYMENT_PLATFORM))) { + QMutableListIterator i(deploymentList); + while(i.hasNext()) { + CopyItem &item = i.next(); + QFileInfo fromItem(item.from); + QFileInfo toItem(item.to); + if (fromItem == toItem) + i.remove(); + } + } } -- cgit v0.12 From 329f02fbba05221e76aff1e0d217d1599664dffa Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 30 Jun 2010 16:40:51 +0300 Subject: Fix invalid bookmark in anomaly demo BBC news bookmark was no longer valid. Task-number: QTBUG-11795 Reviewed-by: Janne Koskinen --- demos/embedded/anomaly/src/BookmarksView.cpp | 2 +- demos/embedded/anomaly/src/BrowserView.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/demos/embedded/anomaly/src/BookmarksView.cpp b/demos/embedded/anomaly/src/BookmarksView.cpp index 729bf73..d6e6035 100644 --- a/demos/embedded/anomaly/src/BookmarksView.cpp +++ b/demos/embedded/anomaly/src/BookmarksView.cpp @@ -55,7 +55,7 @@ BookmarksView::BookmarksView(QWidget *parent) m_iconView->addItem("www.google.com"); m_iconView->addItem("qt.nokia.com/doc/4.5"); - m_iconView->addItem("news.bbc.co.uk/text_only.stm"); + m_iconView->addItem("news.bbc.co.uk/2/mobile/default.stm"); m_iconView->addItem("mobile.wikipedia.org"); m_iconView->addItem("qt.nokia.com"); m_iconView->addItem("en.wikipedia.org"); diff --git a/demos/embedded/anomaly/src/BrowserView.cpp b/demos/embedded/anomaly/src/BrowserView.cpp index 41318ad..a6e6f7a 100644 --- a/demos/embedded/anomaly/src/BrowserView.cpp +++ b/demos/embedded/anomaly/src/BrowserView.cpp @@ -177,7 +177,6 @@ void BrowserView::resizeEvent(QResizeEvent *event) void BrowserView::setDefaultIap() { qt_SetDefaultIap(); - m_webView->load(QUrl("http://news.bbc.co.uk/text_only.stm")); } #endif -- cgit v0.12