diff -Nru libmeegotouch-0.20.66/benchmarks/pt_mcomponentdata/pt_mcomponentdata.cpp libmeegotouch-0.20.72~1/benchmarks/pt_mcomponentdata/pt_mcomponentdata.cpp --- libmeegotouch-0.20.66/benchmarks/pt_mcomponentdata/pt_mcomponentdata.cpp 2010-09-05 17:45:36.000000000 +0000 +++ libmeegotouch-0.20.72~1/benchmarks/pt_mcomponentdata/pt_mcomponentdata.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -35,7 +35,7 @@ { MComponentData *componentData = 0; MBENCHMARK_ONCE( - componentData = new MComponentData(argc, argv, argv[0]); + componentData = MComponentData::createInstance(argc, argv, argv[0]); ) delete componentData; } @@ -44,7 +44,7 @@ { MComponentData *componentData = 0; MBENCHMARK_ONCE( - componentData = new MComponentData(argc, argv, argv[0]); + componentData = MComponentData::createInstance(argc, argv, argv[0]); ) delete componentData; } diff -Nru libmeegotouch-0.20.66/benchmarks/pt_mstylesheet/pt_mstylesheet.pro libmeegotouch-0.20.72~1/benchmarks/pt_mstylesheet/pt_mstylesheet.pro --- libmeegotouch-0.20.66/benchmarks/pt_mstylesheet/pt_mstylesheet.pro 2010-09-05 17:45:36.000000000 +0000 +++ libmeegotouch-0.20.72~1/benchmarks/pt_mstylesheet/pt_mstylesheet.pro 2011-01-10 10:49:11.000000000 +0000 @@ -8,7 +8,9 @@ SOURCES += pt_mstylesheet.cpp \ mlogicalvalues.cpp \ mstylesheetattribute.cpp \ + muniquestringcache.cpp HEADERS += pt_mstylesheet.h \ mlogicalvalues.h \ mstylesheetattribute.h \ + muniquestringcache.h diff -Nru libmeegotouch-0.20.66/configure libmeegotouch-0.20.72~1/configure --- libmeegotouch-0.20.66/configure 2010-12-15 16:09:40.000000000 +0000 +++ libmeegotouch-0.20.72~1/configure 2011-01-10 10:49:11.000000000 +0000 @@ -705,6 +705,7 @@ | sed -e "s,@@M_UNIX_INSTALL_PREFIX@@,$M_INSTALL_PREFIX,g" \ | sed -e "s,@@M_UNIX_INSTALL_SYSCONFDIR@@,$M_INSTALL_SYSCONFDIR,g" \ | sed -e "s,@@M_UNIX_INSTALL_LIBDIR@@,$M_INSTALL_LIBDIR,g" \ +| sed -e "s,@@MEEGOTOUCHCONFIG_DEPS@@,$MEEGOTOUCHCONFIG_DEPS,g" \ > "$MEEGOTOUCH_DEFINES_PRF.tmp" # replace meegotouch_defines.prf if it differs from the newly created temp file diff -Nru libmeegotouch-0.20.66/debian/api libmeegotouch-0.20.72~1/debian/api --- libmeegotouch-0.20.66/debian/api 2010-09-05 17:45:36.000000000 +0000 +++ libmeegotouch-0.20.72~1/debian/api 2011-01-10 10:49:11.000000000 +0000 @@ -2,21 +2,21 @@ type: library libs-pkg: libmeegotouchcore0 dev-pkg: libmeegotouch-dev -state: unstable +state: stable scope: Platform interface: libmeegotouchextensions type: library libs-pkg: libmeegotouchextensions0 dev-pkg: libmeegotouch-dev -state: unstable +state: stable scope: Platform interface: libmeegotouchsettings type: library libs-pkg: libmeegotouchsettings0 dev-pkg: libmeegotouch-dev -state: unstable +state: stable scope: Platform interface: libmeegotouchviews diff -Nru libmeegotouch-0.20.66/debian/changelog libmeegotouch-0.20.72~1/debian/changelog --- libmeegotouch-0.20.66/debian/changelog 2010-12-16 13:51:14.000000000 +0000 +++ libmeegotouch-0.20.72~1/debian/changelog 2011-01-10 10:49:55.000000000 +0000 @@ -1,3 +1,74 @@ +libmeegotouch (0.20.72~1-0fn~maverick0) maverick; urgency=low + + * Maverick backport + + -- Attila Csipa Mon, 10 Jan 2010 12:04:09 +0300 + +libmeegotouch (0.20.72~1) unstable; urgency=low + + * unreleased + * Fixes: NB#216289 - COREWEB: /usr/lib/meegotouch/applicationextensions/mapplicationextensionrunner 'QGraphicsScene::~QGraphicsScene MScene::~MScene MExtensionRunner::teardown MExtensionRunner::~MExtensionRunner MApplicationExtensionRunner::~MApplicationExtensionRunner' + + -- Adrian Yanes Wed, 05 Jan 2011 14:40:52 +0100 + +libmeegotouch (0.20.71-1) unstable; urgency=low + + * New version + * Fixes: NB#215046 - Regression: MeeGoTouch eats touchpoints + * Changes: Tests.xml generating script: commented out statistics printout + + -- Adrian Yanes Tue, 04 Jan 2011 13:07:02 +0100 + +libmeegotouch (0.20.70-1) unstable; urgency=low + + * New version + * Fixes: NB#194018 - MPannableViewport::setMinimumSize resets panned widget position. + * Fixes: NB#192037 - Multiline MTextedit doesn't expand to next line on word wrapping. + + -- Adrian Yanes Tue, 04 Jan 2011 09:49:24 +0100 + +libmeegotouch (0.20.69-1) unstable; urgency=low + + * New version + * Fixes: NB#206058 - Sometimes MSceneWindow uses the landscape style even when the MWindow has been locked to portrait + * Fixes: NB#208934 - Volume indicator doesnot return to landscape in video play + * Fixes: NB#212448 - MWindow constructor causes ContextProperty::waitForSubscription() to be called, which may cause all kinds of side effects in an application + * Fixes: NB#212289 - Visual press feedback is not shown always when tapping an icon button + + -- Adrian Yanes Tue, 28 Dec 2010 10:50:00 +0100 + +libmeegotouch (0.20.68-1) unstable; urgency=low + + * New version + * Fixes: NB#209041 - Application window style is missing navigation bar style property. + * Fixes: NB#203650 - displayEntered() not emitted when switching between two windows in the same app + * Fixes: NB#211200 - [+request] API needed for enabling/disabling text magnifier in text entries + + -- Adrian Yanes Thu, 23 Dec 2010 09:41:44 +0100 + +libmeegotouch (0.20.67-1) unstable; urgency=low + + * New version + * Fixes: NB#212602 - Tapping the status area makes the device struck + * Fixes: NB#208077 - MNotification doesn't show specified image + * Fixes: NB#211512 - clipboard has GL context + + -- Adrian Yanes Tue, 21 Dec 2010 14:35:57 +0100 + +libmeegotouch (0.20.66-3) unstable; urgency=low + + * New version + * Special release for integration + + -- Adrian Yanes Tue, 21 Dec 2010 10:31:17 +0100 + +libmeegotouch (0.20.66-2) unstable; urgency=low + + * New version + * Fixes: NB#212602 - Tapping the status area for the status menu makes the device struck + + -- Adrian Yanes Mon, 20 Dec 2010 15:15:29 +0100 + libmeegotouch (0.20.66-1fn~maverick1) maverick; urgency=high * Maverick backport @@ -14,6 +85,22 @@ -- Adrian Yanes Wed, 15 Dec 2010 15:58:41 +0200 +libmeegotouch (0.20.65-3) unstable; urgency=low + + * New version + * Fixes: NB#210352 - "New text message" view moves while entering text to "qtn_re_text_edit_promt_to" field + * Fixes: NB#210713 - Text Input Field is "jumping" + * Fixes: NB#210697 - [REG] Text Input Field is moved up while focus is set + + -- Natalia Dobrovolskaya Sun, 19 Dec 2010 09:38:56 +0200 + +libmeegotouch (0.20.65-2) unstable; urgency=low + + * New version + * Fixes: NB#211964 - Additional click is emitted when accessing object menu + + -- Adrian Yanes Thu, 16 Dec 2010 11:47:55 +0200 + libmeegotouch (0.20.65-1) unstable; urgency=low * New version diff -Nru libmeegotouch-0.20.66/debian/control libmeegotouch-0.20.72~1/debian/control --- libmeegotouch-0.20.66/debian/control 2010-12-16 13:51:14.000000000 +0000 +++ libmeegotouch-0.20.72~1/debian/control 2011-01-10 10:49:55.000000000 +0000 @@ -179,7 +179,7 @@ Package: meegotouch-demos-widgetsgallery-tests Section: devel Architecture: any -Depends: ${shlibs:Depends}, meegotestrunner, meegotouch-demos-widgetsgallery (= ${Source-Version}) +Depends: ${shlibs:Depends}, meegotouch-demos-widgetsgallery (= ${Source-Version}) Description: Demo application for MeeGo Touch Package: meegotouch-demos-appletinstallationsource @@ -209,7 +209,7 @@ Package: libmeegotouch-tests Section: devel Architecture: any -Depends: ${shlibs:Depends}, testrunner, locales, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good +Depends: ${shlibs:Depends}, locales, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good Description: libmeegotouch unit tests Unit testing binaries and shellscripts for testing libmeegotouch library diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/bannerspage.cpp libmeegotouch-0.20.72~1/demos/widgetsgallery/bannerspage.cpp --- libmeegotouch-0.20.66/demos/widgetsgallery/bannerspage.cpp 2010-12-15 16:09:40.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/bannerspage.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -125,7 +125,6 @@ { MBanner *banner = new MBanner(); banner->setStyleName("InformationBanner"); - banner->setIconID("icon-m-camera-scene-landscape-selected"); banner->setTitle("You have 6 meetings in your Agenda"); banner->appear(scene(), MSceneWindow::DestroyWhenDone); } @@ -134,6 +133,7 @@ { MBanner *systemBanner = new MBanner(); systemBanner->setStyleName("SystemBanner"); + systemBanner->setIconID("icon-m-common-usb"); systemBanner->setTitle("Unable to continue video editing. USB disconnected."); systemBanner->appear(scene(), MSceneWindow::DestroyWhenDone); } diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/bubblepage.cpp libmeegotouch-0.20.72~1/demos/widgetsgallery/bubblepage.cpp --- libmeegotouch-0.20.66/demos/widgetsgallery/bubblepage.cpp 2010-09-30 21:48:18.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/bubblepage.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -168,7 +168,7 @@ void BubblePage::speechBubbleClicked() { - //% "Speech buuble clicked" + //% "Speech bubble clicked" messageBox = new MMessageBox(qtTrId("xx_wg_bubblepage_bubbleclicked")); messageBox->appear(MSceneWindow::DestroyWhenDone); } diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/gridmodel.cpp libmeegotouch-0.20.72~1/demos/widgetsgallery/gridmodel.cpp --- libmeegotouch-0.20.66/demos/widgetsgallery/gridmodel.cpp 2010-12-15 16:09:40.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/gridmodel.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -163,25 +163,23 @@ if (offset >= backlog.count()) offset = backlog.count() - 1; - if (backlog.count() > offset) { - backlogItem = backlog.at(offset); + backlogItem = backlog.at(offset); - // Try to find next item in backlog to load - int nextOffset = offset; - while (backlogItem->loaded && nextOffset < backlog.count()) - backlogItem = backlog.at(nextOffset++); - - // If we did not find, try to load previous in backlog - int prevOffset = offset; - while (backlogItem->loaded && prevOffset > 0) - backlogItem = backlog.at(prevOffset--); - - // Everything is loaded, stop. - if (backlogItem->loaded) { - mutex.unlock(); - stop(); - return; - } + // Try to find next item in backlog to load + int nextOffset = offset; + while (backlogItem->loaded && nextOffset < backlog.count()) + backlogItem = backlog.at(nextOffset++); + + // If we did not find, try to load previous in backlog + int prevOffset = offset; + while (backlogItem->loaded && prevOffset > 0) + backlogItem = backlog.at(prevOffset--); + + // Everything is loaded, stop. + if (backlogItem->loaded) { + mutex.unlock(); + stop(); + return; } backlogItem->loaded = true; diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/itemdetailpage.cpp libmeegotouch-0.20.72~1/demos/widgetsgallery/itemdetailpage.cpp --- libmeegotouch-0.20.66/demos/widgetsgallery/itemdetailpage.cpp 2010-12-15 16:09:40.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/itemdetailpage.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -304,8 +304,11 @@ QPointF delta = -(event->pos() - lastMousePosition); lastMousePosition = event->pos(); - image->setOffset(image->offset() + delta); - image->update(); + + if (image) { + image->setOffset(image->offset() + delta); + image->update(); + } } void ItemDetailPage::keyPressEvent(QKeyEvent *event) diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/mlistpage.cpp libmeegotouch-0.20.72~1/demos/widgetsgallery/mlistpage.cpp --- libmeegotouch-0.20.66/demos/widgetsgallery/mlistpage.cpp 2010-11-21 14:45:25.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/mlistpage.cpp 2011-01-10 10:49:11.000000000 +0000 @@ -375,17 +375,17 @@ void MListPage::createObjectMenuActions() { + objectMenu = new MObjectMenu(NULL); + //% "Remove" MAction *action = new MAction(qtTrId("xx_listpage_list_remove"), this); - objectMenuActions.append(action); + objectMenu->addAction(action); connect(action, SIGNAL(triggered()), this, SLOT(removeListItem())); //% "Edit" action = new MAction(qtTrId("xx_listpage_list_edit"), this); - objectMenuActions.append(action); + objectMenu->addAction(action); connect(action, SIGNAL(triggered()), this, SLOT(editListItem())); - - objectMenu = new MObjectMenu(objectMenuActions); } void MListPage::scrollToBottom() @@ -557,6 +557,9 @@ void MListPage::itemLongTapped(const QModelIndex &index, const QPointF &position) { objectMenu->setCursorPosition(position); + + objectMenu->setTitle(index.data(PhoneBookModel::PhoneBookFilterRole).toString()); + if (index.parent().isValid()) { mDebug("MListPage::itemLongTapped") << "Row: " << index.row() << " Group: " << index.parent().row(); sceneManager()->appearSceneWindow(objectMenu); diff -Nru libmeegotouch-0.20.66/demos/widgetsgallery/mlistpage.h libmeegotouch-0.20.72~1/demos/widgetsgallery/mlistpage.h --- libmeegotouch-0.20.66/demos/widgetsgallery/mlistpage.h 2010-11-21 14:45:25.000000000 +0000 +++ libmeegotouch-0.20.72~1/demos/widgetsgallery/mlistpage.h 2011-01-10 10:49:11.000000000 +0000 @@ -114,7 +114,6 @@ MComboBox *comboListMode; MObjectMenu *objectMenu; - QList objectMenuActions; MAction *actionAdvancedConfiguration; QPointer dialogAdvancedConfiguration; diff -Nru libmeegotouch-0.20.66/doc/src/mainclasses.dox libmeegotouch-0.20.72~1/doc/src/mainclasses.dox --- libmeegotouch-0.20.66/doc/src/mainclasses.dox 2010-11-21 14:45:25.000000000 +0000 +++ libmeegotouch-0.20.72~1/doc/src/mainclasses.dox 2011-01-10 10:49:11.000000000 +0000 @@ -29,7 +29,7 @@
  • MMessageBox
  • MImageWidget -
  • MInfoBanner +
  • MBanner
  • MLabel
  • MList