I have made the following changes intended for :
  CE:MW:Shared / libmeegotouch

Please review and accept or decline.
BOSS has already run some checks on this request.
See the "Messages from BOSS" section below.

https://build.pub.meego.com//request/show/7428

Thank You,
vesuri

[This message was auto-generated]

---

Request # 7428:

Messages from BOSS:

State: review at 2012-11-20T16:11:40 by bossbot

Reviews:
       accepted by bossbot : Prechecks succeeded.
       new for CE-maintainers : Please replace this text with a review and 
approve/reject the review (not the SR). BOSS will take care of the rest

Changes:
  submit: home:vesuri:branches:CE:MW:Shared / libmeegotouch -> CE:MW:Shared / 
libmeegotouch
  
changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,3 @@
+* Tue Nov 20 2012 Vesa Halttunen <[email protected]> - 0.30.6
+- MNotification/MNotificationGroup backwards compatibility improvements
+

old:
----
  libmeegotouch-0.30.5.tar.bz2

new:
----
  libmeegotouch-0.30.6.tar.bz2

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -9,7 +9,7 @@
 # << macros
 
 Summary:    MeeGo Touch Framework
-Version:    0.30.5
+Version:    0.30.6
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1

other changes:
--------------

++++++ libmeegotouch-0.30.5.tar.bz2 -> libmeegotouch-0.30.6.tar.bz2
--- .gitignore
+++ .gitignore
@@ -1,47 +0,0 @@
-*.qm
-moc_*
-gen_*
-*.o
-*.gcno
-Makefile
-*.so
-*.so.*
-
-# vim swap files
-.*.swp
-BUILD_ID
-Makefile
-doc/html
-lib/*
-.moc
-.obj
-.*.swp
-*.o
-testdui
-*~
-*.tmp
-*moc_*
-*.log
-*.log.xml
-YES
-*-stamp
-*.gcov
-*.log.xml
-*.deb
-*.gcno
-*.old
-*.foo
-*.gcda
-*.pro.user
-*.app
-.DS_Store
-.dummy
-cscope.files
-cscope.out
-.gen
-build-i386
-build-armel
-.qmake.cache
-mmoc/mmoc
-*.pc
-*.pro.shared
--- benchmarks/.gitignore
+++ benchmarks/.gitignore
@@ -1,3 +0,0 @@
-tests.xml
-*/gen_*
-core
\ No newline at end of file
--- benchmarks/mt_mbutton/.gitignore
+++ benchmarks/mt_mbutton/.gitignore
@@ -1 +0,0 @@
-mt_mbutton
--- benchmarks/mt_mbuttongroup/.gitignore
+++ benchmarks/mt_mbuttongroup/.gitignore
@@ -1 +0,0 @@
-mt_mbuttongroup
--- benchmarks/mt_mimagewidget/.gitignore
+++ benchmarks/mt_mimagewidget/.gitignore
@@ -1 +0,0 @@
-mt_mimagewidget
--- benchmarks/mt_mlabel/.gitignore
+++ benchmarks/mt_mlabel/.gitignore
@@ -1 +0,0 @@
-mt_mlabel
--- benchmarks/mt_mlist/.gitignore
+++ benchmarks/mt_mlist/.gitignore
@@ -1 +0,0 @@
-mt_mlist
--- benchmarks/mt_mmenu/.gitignore
+++ benchmarks/mt_mmenu/.gitignore
@@ -1 +0,0 @@
-mt_mmenu
--- benchmarks/mt_mtoolbar/.gitignore
+++ benchmarks/mt_mtoolbar/.gitignore
@@ -1 +0,0 @@
-mt_mtoolbar
--- benchmarks/pt_mapplication/.gitignore
+++ benchmarks/pt_mapplication/.gitignore
@@ -1 +0,0 @@
-pt_mapplication
--- benchmarks/pt_mbutton/.gitignore
+++ benchmarks/pt_mbutton/.gitignore
@@ -1 +0,0 @@
-pt_mbutton
--- benchmarks/pt_mcomponentcache/.gitignore
+++ benchmarks/pt_mcomponentcache/.gitignore
@@ -1 +0,0 @@
-pt_mcomponentcache
--- benchmarks/pt_mcomponentdata/.gitignore
+++ benchmarks/pt_mcomponentdata/.gitignore
@@ -1 +0,0 @@
-pt_mcomponentdata
--- benchmarks/pt_mcomponentdata2/.gitignore
+++ benchmarks/pt_mcomponentdata2/.gitignore
@@ -1 +0,0 @@
-pt_mcomponentdata2
--- benchmarks/pt_mgles2renderer/.gitignore
+++ benchmarks/pt_mgles2renderer/.gitignore
@@ -1 +0,0 @@
-pt_mgles2renderer
--- benchmarks/pt_mimagewidget/.gitignore
+++ benchmarks/pt_mimagewidget/.gitignore
@@ -1 +0,0 @@
-pt_mimagewidget
--- benchmarks/pt_minimalmapplication/.gitignore
+++ benchmarks/pt_minimalmapplication/.gitignore
@@ -1 +0,0 @@
-pt_minimalmapplication
--- benchmarks/pt_minimalqtapplication/.gitignore
+++ benchmarks/pt_minimalqtapplication/.gitignore
@@ -1 +0,0 @@
-pt_minimalqtapplication
--- benchmarks/pt_mlabel/.gitignore
+++ benchmarks/pt_mlabel/.gitignore
@@ -1,2 +0,0 @@
-pt_mlabel
-
--- benchmarks/pt_mlayout/.gitignore
+++ benchmarks/pt_mlayout/.gitignore
@@ -1 +0,0 @@
-pt_mlayout
--- benchmarks/pt_mmenu/.gitignore
+++ benchmarks/pt_mmenu/.gitignore
@@ -1 +0,0 @@
-pt_mmenu
--- benchmarks/pt_mprogressindicator/.gitignore
+++ benchmarks/pt_mprogressindicator/.gitignore
@@ -1 +0,0 @@
-pt_mprogressindicator
--- benchmarks/pt_mscalableimage/.gitignore
+++ benchmarks/pt_mscalableimage/.gitignore
@@ -1,2 +0,0 @@
-pt_mscalableimage
-
--- benchmarks/pt_mslider/.gitignore
+++ benchmarks/pt_mslider/.gitignore
@@ -1 +0,0 @@
-pt_mslider
--- benchmarks/pt_mstylesheet/.gitignore
+++ benchmarks/pt_mstylesheet/.gitignore
@@ -1 +0,0 @@
-pt_mstylesheet
--- benchmarks/pt_mtheme/.gitignore
+++ benchmarks/pt_mtheme/.gitignore
@@ -1 +0,0 @@
-pt_mtheme
--- benchmarks/pt_mtoolbar/.gitignore
+++ benchmarks/pt_mtoolbar/.gitignore
@@ -1 +0,0 @@
-pt_mtoolbar
--- benchmarks/pt_mwidgetcontroller/.gitignore
+++ benchmarks/pt_mwidgetcontroller/.gitignore
@@ -1 +0,0 @@
-pt_mwidgetcontroller
--- benchmarks/pt_qapplication/.gitignore
+++ benchmarks/pt_qapplication/.gitignore
@@ -1 +0,0 @@
-pt_qapplication
--- benchmarks/pt_widgetsgallery/.gitignore
+++ benchmarks/pt_widgetsgallery/.gitignore
@@ -1 +0,0 @@
-pt_widgetsgallery
--- debian/.gitignore
+++ debian/.gitignore
@@ -1,56 +0,0 @@
-libmeegotouch-dev
-libmeegotouch-tests
-libmeegotouch-tests-dbg
-*.debhelper
-*.substvars
-libmeegotouch-bin-dbg
-libmeegotouch-bin
-libmeegotouchcore0-dbg
-libmeegotouchcore0
-libmeegotouchextensions0-dbg
-libmeegotouchextensions0
-libmeegotouchsettings0-dbg
-libmeegotouchsettings0
-libmeegotouchviews0-dbg
-libmeegotouchviews0
-libmeegotouchpreloader0-dbg
-libmeegotouchpreloader0
-libmeegotouch-doc
-libmeegotouch-l10n-ar
-libmeegotouch-l10n-de
-libmeegotouch-l10n-en
-libmeegotouch-l10n-engineering-english
-libmeegotouch-l10n-fi
-libmeegotouch-l10n-hu
-libmeegotouch-l10n-ur
-libmeegotouch-l10n-zh-cn
-libmeegotouch-benchmarks
-libmeegotouch-benchmarks-dbg
-tmp
-files
-meegotouch-demos
-meegotouch-demos-applicationextension
-meegotouch-demos-applicationextension-dbg
-meegotouch-demos-imageviewer
-meegotouch-demos-widgetsgallery
-meegotouch-demos-widgetsgallery-dbg
-meegotouch-demos-widgetsgallery-tests
-meegotouch-demos-widgetsgallery-l10n-ar
-meegotouch-demos-widgetsgallery-l10n-de
-meegotouch-demos-widgetsgallery-l10n-en
-meegotouch-demos-widgetsgallery-l10n-engineering-english
-meegotouch-demos-widgetsgallery-l10n-fi
-meegotouch-demos-widgetsgallery-l10n-hu
-meegotouch-demos-widgetsgallery-l10n-ur
-meegotouch-demos-widgetsgallery-l10n-zh-cn
-meegotouch-demos-appletinstallationsource
-meegotouch-demos-appletinstallationsource-dbg
-meegotouch-dev-tools
-meegotouch-dev-tools-dbg
-meegotouch-im-context
-meegotouch-qt-style
-meegotouch-qt-style-dbg
-meegotouch-examples
-meegotouch-examples-dbg
-meegotouch-cache-utils
-meegotouch-cache-utils-dbg
--- demos/applets/weatherapplet/translations/.gitignore
+++ demos/applets/weatherapplet/translations/.gitignore
@@ -1,4 +0,0 @@
-weatherappletres.qm
-weatherappletres.ts
-weatherappletres_fi.qm
-weatherappletres_en.qm
--- demos/applicationextension/.gitignore
+++ demos/applicationextension/.gitignore
@@ -1 +0,0 @@
-applicationextensiondemo
--- demos/widgetsgallery/.gitignore
+++ demos/widgetsgallery/.gitignore
@@ -1,5 +0,0 @@
-Makefile.Debug
-Makefile.Release
-qtc-gdbmacros
-widgetsgallery
-com.nokia.widgetsgallery.service
--- demos/widgetsgallery/access_manager/.gitignore
+++ demos/widgetsgallery/access_manager/.gitignore
@@ -1,2 +0,0 @@
-widgetsgallery_accessmanager
-com.nokia.widgetsgallery.AccessManager.service
--- demos/widgetsgallery/translations/.gitignore
+++ demos/widgetsgallery/translations/.gitignore
@@ -1 +0,0 @@
-widgetsgallery.ts
--- doc/.gitignore
+++ doc/.gitignore
@@ -1 +0,0 @@
-mdoxy.cfg
--- examples/apscanner/.gitignore
+++ examples/apscanner/.gitignore
@@ -1 +0,0 @@
-apscanner
--- examples/calculator/.gitignore
+++ examples/calculator/.gitignore
@@ -1 +0,0 @@
-calculator
--- examples/chaining/chainingexampleapp1/.gitignore
+++ examples/chaining/chainingexampleapp1/.gitignore
@@ -1 +0,0 @@
-chainingexampleapp1
--- examples/chaining/chainingexampleapp2/.gitignore
+++ examples/chaining/chainingexampleapp2/.gitignore
@@ -1,4 +0,0 @@
-chainingexampleapp2
-chainingexampleinterfaceadaptor.cpp
-chainingexampleinterfaceadaptor.h
-com.nokia.ChainingExampleInterface.xml
--- examples/chaining/chainingexampleinterface/.gitignore
+++ examples/chaining/chainingexampleinterface/.gitignore
@@ -1,4 +0,0 @@
-chainingexampleinterface.cpp
-chainingexampleinterface.h
-chainingexampleinterfaceproxy.cpp
-chainingexampleinterfaceproxy.h
--- examples/containertest/.gitignore
+++ examples/containertest/.gitignore
@@ -1 +0,0 @@
-containertest
--- examples/helloworld/.gitignore
+++ examples/helloworld/.gitignore
@@ -1 +0,0 @@
-helloworld
--- examples/imtoolbar/.gitignore
+++ examples/imtoolbar/.gitignore
@@ -1 +0,0 @@
-imtoolbar
--- examples/layout/hidden_widgets/.gitignore
+++ examples/layout/hidden_widgets/.gitignore
@@ -1 +0,0 @@
-hidden_widgets
--- examples/layout/layout_inside_layout/.gitignore
+++ examples/layout/layout_inside_layout/.gitignore
@@ -1 +0,0 @@
-layout_inside_layout
--- examples/layout/mflowlayoutpolicy/.gitignore
+++ examples/layout/mflowlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-mflowlayoutpolicy
--- examples/layout/mfreestylelayoutpolicy/.gitignore
+++ examples/layout/mfreestylelayoutpolicy/.gitignore
@@ -1 +0,0 @@
-mfreestylelayoutpolicy
--- examples/layout/mgridlayoutpolicy/.gitignore
+++ examples/layout/mgridlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-mgridlayoutpolicy
--- examples/layout/mlinearlayoutpolicy/.gitignore
+++ examples/layout/mlinearlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-mlinearlayoutpolicy
--- examples/layout/multiplepolicies/.gitignore
+++ examples/layout/multiplepolicies/.gitignore
@@ -1 +0,0 @@
-multiplepolicies
--- examples/layout/qgraphicsgridlayout/.gitignore
+++ examples/layout/qgraphicsgridlayout/.gitignore
@@ -1 +0,0 @@
-qgraphicsgridlayout
--- examples/layout/qgraphicslayout/.gitignore
+++ examples/layout/qgraphicslayout/.gitignore
@@ -1 +0,0 @@
-qgraphicslayout
--- examples/layout/qgraphicslinearlayout/.gitignore
+++ examples/layout/qgraphicslinearlayout/.gitignore
@@ -1 +0,0 @@
-qgraphicslinearlayout
--- examples/layout/two_columns/.gitignore
+++ examples/layout/two_columns/.gitignore
@@ -1 +0,0 @@
-two_columns
--- examples/lifecycle/.gitignore
+++ examples/lifecycle/.gitignore
@@ -1 +0,0 @@
-lifecycle
--- examples/multipleinstances/.gitignore
+++ examples/multipleinstances/.gitignore
@@ -1 +0,0 @@
-multipleinstances
--- examples/pagenavigation_menu/.gitignore
+++ examples/pagenavigation_menu/.gitignore
@@ -1 +0,0 @@
-pagenavigation_menu
--- examples/separatorTest/.gitignore
+++ examples/separatorTest/.gitignore
@@ -1 +0,0 @@
-SeparatorTest
--- examples/servicefw/bin/.gitignore
+++ examples/servicefw/bin/.gitignore
@@ -1,3 +0,0 @@
-com.nokia.textprocessor
-org.maemo.textprocessor
-user
--- examples/servicefw/misc/.gitignore
+++ examples/servicefw/misc/.gitignore
@@ -1,3 +0,0 @@
-.dummy
-com.nokia.textprocessor.service
-org.maemo.textprocessor.service
--- examples/servicefw/provider/serviceif/textprocessorinterface/.gitignore
+++ examples/servicefw/provider/serviceif/textprocessorinterface/.gitignore
@@ -1,5 +0,0 @@
-.dummy
-textprocessorinterface.cpp
-textprocessorinterface.h
-textprocessorinterfaceproxy.cpp
-textprocessorinterfaceproxy.h
--- examples/testwidget/.gitignore
+++ examples/testwidget/.gitignore
@@ -1 +0,0 @@
-testwidget
--- examples/trackergrid/.gitignore
+++ examples/trackergrid/.gitignore
@@ -1 +0,0 @@
-trackergrid
--- imgcachegen/.gitignore
+++ imgcachegen/.gitignore
@@ -1 +0,0 @@
-imgcachegen
--- lib/.gitignore
+++ lib/.gitignore
--- mappletrunner/.gitignore
+++ mappletrunner/.gitignore
@@ -1,2 +0,0 @@
-mappletrunner
-
--- mapplicationextensionrunner/.gitignore
+++ mapplicationextensionrunner/.gitignore
@@ -1,2 +0,0 @@
-mapplicationextensionrunner
-
--- mgen/.gitignore
+++ mgen/.gitignore
@@ -1 +0,0 @@
-mgen
--- mgen/tests/.gitignore
+++ mgen/tests/.gitignore
@@ -1 +0,0 @@
-gen_*
--- mkspecs/.gitignore
+++ mkspecs/.gitignore
@@ -1,2 +0,0 @@
-meegotouchconfig.pri
-mconfig.pri
--- mkspecs/features/.gitignore
+++ mkspecs/features/.gitignore
@@ -1 +0,0 @@
-meegotouch_defines.prf
--- mkspecs/features/meegotouch_defines.prf.in
+++ mkspecs/features/meegotouch_defines.prf.in
@@ -6,7 +6,7 @@
 
 M_MAJOR_VERSION = 0
 M_MINOR_VERSION = 30
-M_PATCH_VERSION = 4
+M_PATCH_VERSION = 6
 M_VERSION=$${M_MAJOR_VERSION}.$${M_MINOR_VERSION}.$${M_PATCH_VERSION}
 
 # first set default value for meegotouch prefix
--- mmoc/.gitignore
+++ mmoc/.gitignore
@@ -1 +0,0 @@
-.dummy
--- mservicemapper/.gitignore
+++ mservicemapper/.gitignore
@@ -1,2 +0,0 @@
-mservicemapper
-com.nokia.mservicefw.service
--- src/.gitignore
+++ src/.gitignore
@@ -1,11 +0,0 @@
-README_extradata.txt
-extradata.dat
-extradata_static.lst
-extradata_static.mak
-libextradata.a
-root.res
-qtc-gdbmacros/
-Makefile.Debug
-Makefile.Release
-mashup/mashup/gen_*.*
-.gen/
--- src/corelib/.gitignore
+++ src/corelib/.gitignore
@@ -1 +0,0 @@
-qrc_i18n.cpp
--- src/corelib/notification/mnotification.cpp
+++ src/corelib/notification/mnotification.cpp
@@ -78,9 +78,10 @@
     hints.insert("category", eventType);
     hints.insert("x-nemo-item-count", count);
     hints.insert("x-nemo-timestamp", userSetTimestamp);
-    hints.insert("x-nemo-preview-summary", summary);
-    hints.insert("x-nemo-preview-body", body);
+    hints.insert("x-nemo-legacy-summary", summary);
+    hints.insert("x-nemo-legacy-body", body);
     hints.insert("x-nemo-legacy-type", "MNotification");
+    hints.insert("x-nemo-user-closeable", true);
     if (groupId > 0) {
         hints.insert("x-nemo-legacy-group-id", groupId);
     }
@@ -100,7 +101,7 @@
         QList<MNotificationGroup *> groups = 
MNotificationGroup::notificationGroups();
         foreach (MNotificationGroup *group, groups) {
             if (group->id() == groupId) {
-                group->publish();
+                group->publish(summary, body);
                 break;
             }
         }
@@ -261,15 +262,22 @@
         d->userSetTimestamp = QDateTime::currentDateTimeUtc();
     }
 
+    QVariantHash hints = d->hints();
     QString summary;
     QString body;
     if (d->groupId == 0) {
-        // Standalone notifications use the same summary and body for the 
preview banner and the lock screen; for grouped notifications only the preview 
banner has them
-        summary = d->summary;
-        body = d->body;
+        // Standalone notifications use the same summary and body for the lock 
screen - show nothing for grouped notifications
+        summary = hints.value("x-nemo-legacy-summary").toString();
+        body = hints.value("x-nemo-legacy-body").toString();
+
+        if (d->id == 0) {
+            // Only show the preview banner for new notifications
+            hints.insert("x-nemo-preview-summary", 
hints.value("x-nemo-legacy-summary"));
+            hints.insert("x-nemo-preview-body", 
hints.value("x-nemo-legacy-body"));
+        }
     }
 
-    d->id = 
notificationManager()->Notify(QFileInfo(QCoreApplication::arguments()[0]).fileName(),
 d->id, d->image, summary, body, QStringList(), d->hints(), -1);
+    d->id = 
notificationManager()->Notify(QFileInfo(QCoreApplication::arguments()[0]).fileName(),
 d->id, d->image, summary, body, QStringList(), hints, -1);
 
     if (d->id != 0) {
         d->publishedTimestamp = d->userSetTimestamp;
@@ -351,17 +359,11 @@
     argument >> expireTimeout;
     argument.endStructure();
 
-    if (hints.contains("x-nemo-preview-summary")) {
-        notification.d_ptr->summary = 
hints.value("x-nemo-preview-summary").toString();
-    }
-    if (hints.contains("x-nemo-preview-body")) {
-        notification.d_ptr->body = 
hints.value("x-nemo-preview-body").toString();
-    }
-    if (hints.contains("x-nemo-legacy-group-summary")) {
-        notification.d_ptr->summary = 
hints.value("x-nemo-legacy-group-summary").toString();
+    if (hints.contains("x-nemo-legacy-summary")) {
+        notification.d_ptr->summary = 
hints.value("x-nemo-legacy-summary").toString();
     }
-    if (hints.contains("x-nemo-legacy-group-body")) {
-        notification.d_ptr->body = 
hints.value("x-nemo-legacy-group-body").toString();
+    if (hints.contains("x-nemo-legacy-body")) {
+        notification.d_ptr->body = 
hints.value("x-nemo-legacy-body").toString();
     }
     notification.d_ptr->eventType = hints.value("category").toString();
     notification.d_ptr->count = hints.value("x-nemo-item-count").toUInt();
--- src/corelib/notification/mnotificationgroup.cpp
+++ src/corelib/notification/mnotificationgroup.cpp
@@ -49,8 +49,11 @@
 {
 }
 
-MNotificationGroup::MNotificationGroup(uint id) : MNotification(id)
+MNotificationGroup::MNotificationGroup(uint id) :
+    MNotification(*new MNotificationGroupPrivate)
 {
+    Q_D(MNotificationGroup);
+    d->id = id;
 }
 
 QVariantHash MNotificationGroupPrivate::hints() const
@@ -60,8 +63,9 @@
     hints.insert("x-nemo-item-count", count);
     hints.insert("x-nemo-timestamp", userSetTimestamp);
     hints.insert("x-nemo-legacy-type", "MNotificationGroup");
-    hints.insert("x-nemo-legacy-group-summary", summary);
-    hints.insert("x-nemo-legacy-group-body", body);
+    hints.insert("x-nemo-legacy-summary", summary);
+    hints.insert("x-nemo-legacy-body", body);
+    hints.insert("x-nemo-user-closeable", false);
     if (!identifier.isEmpty()) {
         hints.insert("x-nemo-legacy-identifier", identifier);
     }
@@ -109,17 +113,31 @@
 
 bool MNotificationGroup::publish()
 {
+    return publish(QString(), QString());
+}
+
+bool MNotificationGroup::publish(const QString &previewSummary, const QString 
&previewBody)
+{
     Q_D(MNotificationGroup);
 
+    QVariantHash hints = d->hints();
     QString summary;
     QString body;
     if (d->id != 0 && notificationCount() > 0) {
         // Only already published groups may have notifications in them and 
thus should have a visual representation
-        summary = d->summary.isEmpty() ? 
d->hints().value("x-nemo-legacy-group-summary").toString() : d->summary;
-        body = d->body.isEmpty() ? 
d->hints().value("x-nemo-legacy-group-body").toString() : d->body;
+        summary = hints.value("x-nemo-legacy-summary").toString();
+        body = hints.value("x-nemo-legacy-body").toString();
+
+        // Allow a notification belonging to this group to show a preview 
banner
+        if (!previewSummary.isEmpty()) {
+            hints.insert("x-nemo-preview-summary", previewSummary);
+        }
+        if (!previewBody.isEmpty()) {
+            hints.insert("x-nemo-preview-body", previewBody);
+        }
     }
 
-    d->id = 
notificationManager()->Notify(QFileInfo(QCoreApplication::arguments()[0]).fileName(),
 d->id, d->image, summary, body, QStringList(), d->hints(), -1);
+    d->id = 
notificationManager()->Notify(QFileInfo(QCoreApplication::arguments()[0]).fileName(),
 d->id, d->image, summary, body, QStringList(), hints, -1);
 
     return d->id != 0;
 }
--- src/corelib/notification/mnotificationgroup.h
+++ src/corelib/notification/mnotificationgroup.h
@@ -117,6 +117,12 @@
      * MNotification.
      */
     void setTimestamp(const QDateTime &timestamp);
+
+    /*!
+     * Publishes the group using a preview banner. Should only be used
+     * by MNotification.
+     */
+    bool publish(const QString &previewSummary, const QString &previewBody);
     //! \internal_end
 
 protected:
--- src/corelib/widgets/.gitignore
+++ src/corelib/widgets/.gitignore
@@ -1 +0,0 @@
-gen_*
--- src/icu-extradata/.gitignore
+++ src/icu-extradata/.gitignore
@@ -1 +0,0 @@
-usrdt44l
--- src/translations/.gitignore
+++ src/translations/.gitignore
@@ -1 +0,0 @@
-libmeegotouch.ts
--- src/views/style/.gitignore
+++ src/views/style/.gitignore
@@ -1 +0,0 @@
-gen_*
--- tests/.gitignore
+++ tests/.gitignore
@@ -1,3 +0,0 @@
-tests.xml
-*/gen_*
-core
\ No newline at end of file
--- tests/ft_mbutton/.gitignore
+++ tests/ft_mbutton/.gitignore
@@ -1 +0,0 @@
-ft_mbutton
--- tests/ft_mdialog/.gitignore
+++ tests/ft_mdialog/.gitignore
@@ -1 +0,0 @@
-ft_mdialog
--- tests/ft_mgconfitem/.gitignore
+++ tests/ft_mgconfitem/.gitignore
@@ -1 +0,0 @@
-ft_mgconfitem
--- tests/ft_mmoc/.gitignore
+++ tests/ft_mmoc/.gitignore
@@ -1 +0,0 @@
-ft_mmoc
--- tests/ft_mprogressindicator/.gitignore
+++ tests/ft_mprogressindicator/.gitignore
@@ -1,2 +0,0 @@
-ft_mprogressindicator
-
--- tests/ft_mscalableimage/.gitignore
+++ tests/ft_mscalableimage/.gitignore
@@ -1,3 +0,0 @@
-ft_mscalableimage
-test1.png
-test2.png
--- tests/ft_mscenemanager/.gitignore
+++ tests/ft_mscenemanager/.gitignore
@@ -1 +0,0 @@
-ft_mscenemanager
--- tests/ft_mservicefwgen/.gitignore
+++ tests/ft_mservicefwgen/.gitignore
@@ -1,15 +0,0 @@
-ft_mservicefwgen
-qrc_correctFiles.cpp
-qrc_xmlFiles.cpp
-fakegalleryinterfaceproxy.h
-fakegalleryinterfaceproxy.cpp
-fakegalleryinterface.h
-fakegalleryinterface.cpp
-fakegalleryinterfaceadaptor.h
-fakegalleryinterfaceadaptor.cpp
-fakegalleryinterfacedocproxy.h
-fakegalleryinterfacedocproxy.cpp
-fakegalleryinterfacedoc.h
-fakegalleryinterfacedoc.cpp
-fakegalleryinterfacedocadaptor.h
-fakegalleryinterfacedocadaptor.cpp
--- tests/ft_mslider/.gitignore
+++ tests/ft_mslider/.gitignore
@@ -1,2 +0,0 @@
-ft_mslider
-*.png
--- tests/ft_mstylesheet/.gitignore
+++ tests/ft_mstylesheet/.gitignore
@@ -1,2 +0,0 @@
-ft_mstylesheet
-gen_*
--- tests/ft_mstylesheetparser/.gitignore
+++ tests/ft_mstylesheetparser/.gitignore
@@ -1,2 +0,0 @@
-ft_mstylesheetparser
-
--- tests/ft_mvideowidget/.gitignore
+++ tests/ft_mvideowidget/.gitignore
@@ -1 +0,0 @@
-ft_mvideowidget
--- tests/ft_prestart/.gitignore
+++ tests/ft_prestart/.gitignore
@@ -1 +0,0 @@
-ft_prestart
--- tests/ft_theme/.gitignore
+++ tests/ft_theme/.gitignore
@@ -1 +0,0 @@
-ft_theme
--- tests/ut_allwidgets/.gitignore
+++ tests/ut_allwidgets/.gitignore
@@ -1 +0,0 @@
-ut_allwidgets
--- tests/ut_mabstractitemmodel/.gitignore
+++ tests/ut_mabstractitemmodel/.gitignore
@@ -1 +0,0 @@
-ut_mabstractitemmodel
--- tests/ut_madvancedlistitem/.gitignore
+++ tests/ut_madvancedlistitem/.gitignore
@@ -1 +0,0 @@
-ut_madvancedlistitem
--- tests/ut_maggregatedataaccess/.gitignore
+++ tests/ut_maggregatedataaccess/.gitignore
@@ -1,2 +0,0 @@
-ut_maggregatedataaccess
-
--- tests/ut_mappletalivemessagerequest/.gitignore
+++ tests/ut_mappletalivemessagerequest/.gitignore
@@ -1 +0,0 @@
-ut_mappletalivemessagerequest
--- tests/ut_mappletalivemessageresponse/.gitignore
+++ tests/ut_mappletalivemessageresponse/.gitignore
@@ -1 +0,0 @@
-ut_mappletalivemessageresponse
--- tests/ut_mappletbutton/.gitignore
+++ tests/ut_mappletbutton/.gitignore
@@ -1 +0,0 @@
-ut_mappletbutton
--- tests/ut_mappletcancelmessage/.gitignore
+++ tests/ut_mappletcancelmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletcancelmessage
--- tests/ut_mappletclient/.gitignore
+++ tests/ut_mappletclient/.gitignore
@@ -1 +0,0 @@
-ut_mappletclient
--- tests/ut_mappletcommunicator/.gitignore
+++ tests/ut_mappletcommunicator/.gitignore
@@ -1 +0,0 @@
-ut_mappletcommunicator
--- tests/ut_mapplethandle/.gitignore
+++ tests/ut_mapplethandle/.gitignore
@@ -1,2 +0,0 @@
-ut_mapplethandle
-
--- tests/ut_mappletid/.gitignore
+++ tests/ut_mappletid/.gitignore
@@ -1 +0,0 @@
-ut_mappletid
--- tests/ut_mappletinstancedata/.gitignore
+++ tests/ut_mappletinstancedata/.gitignore
@@ -1 +0,0 @@
-ut_mappletinstancedata
--- tests/ut_mappletinstancemanager/.gitignore
+++ tests/ut_mappletinstancemanager/.gitignore
@@ -1 +0,0 @@
-ut_mappletinstancemanager
--- tests/ut_mappletinstantiator/.gitignore
+++ tests/ut_mappletinstantiator/.gitignore
@@ -1 +0,0 @@
-ut_mappletinstantiator
--- tests/ut_mappletinventory/.gitignore
+++ tests/ut_mappletinventory/.gitignore
@@ -1 +0,0 @@
-ut_mappletinventory
--- tests/ut_mappletinventoryview/.gitignore
+++ tests/ut_mappletinventoryview/.gitignore
@@ -1 +0,0 @@
-ut_mappletinventoryview
--- tests/ut_mappletloader/.gitignore
+++ tests/ut_mappletloader/.gitignore
@@ -1,2 +0,0 @@
-ut_mappletloader
-
--- tests/ut_mappletmessage/.gitignore
+++ tests/ut_mappletmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletmessage
--- tests/ut_mappletmessagefactory/.gitignore
+++ tests/ut_mappletmessagefactory/.gitignore
@@ -1 +0,0 @@
-ut_mappletmessagefactory
--- tests/ut_mappletmetadata/.gitignore
+++ tests/ut_mappletmetadata/.gitignore
@@ -1 +0,0 @@
-ut_mappletmetadata
--- tests/ut_mappletmousemessage/.gitignore
+++ tests/ut_mappletmousemessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletmousemessage
--- tests/ut_mappletobjectmenuactionselectedmessage/.gitignore
+++ tests/ut_mappletobjectmenuactionselectedmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletobjectmenuactionselectedmessage
--- tests/ut_mappletobjectmenumessage/.gitignore
+++ tests/ut_mappletobjectmenumessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletobjectmenumessage
--- tests/ut_mappletobjectmenurequestmessage/.gitignore
+++ tests/ut_mappletobjectmenurequestmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletobjectmenurequestmessage
--- tests/ut_mappletorientationmessage/.gitignore
+++ tests/ut_mappletorientationmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletorientationmessage
--- tests/ut_mappletpixmapmodifiedmessage/.gitignore
+++ tests/ut_mappletpixmapmodifiedmessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletpixmapmodifiedmessage
--- tests/ut_mappletpixmaptakenintousemessage/.gitignore
+++ tests/ut_mappletpixmaptakenintousemessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletpixmaptakenintousemessage
--- tests/ut_mappletrunner/.gitignore
+++ tests/ut_mappletrunner/.gitignore
@@ -1 +0,0 @@
-ut_mappletrunner
--- tests/ut_mappletserver/.gitignore
+++ tests/ut_mappletserver/.gitignore
@@ -1 +0,0 @@
-ut_mappletserver
--- tests/ut_mappletsetgeometrymessage/.gitignore
+++ tests/ut_mappletsetgeometrymessage/.gitignore
@@ -1,2 +0,0 @@
-ut_mappletsetgeometrymessage
-
--- tests/ut_mappletsettings/.gitignore
+++ tests/ut_mappletsettings/.gitignore
@@ -1 +0,0 @@
-ut_mappletsettings
--- tests/ut_mappletsettingsdialog/.gitignore
+++ tests/ut_mappletsettingsdialog/.gitignore
@@ -1 +0,0 @@
-ut_mappletsettingsdialog
--- tests/ut_mappletsharedmutex/.gitignore
+++ tests/ut_mappletsharedmutex/.gitignore
@@ -1 +0,0 @@
-ut_mappletsharedmutex
--- tests/ut_mappletupdategeometrymessage/.gitignore
+++ tests/ut_mappletupdategeometrymessage/.gitignore
@@ -1 +0,0 @@
-ut_mappletupdategeometrymessage
--- tests/ut_mappletvisibilitymessage/.gitignore
+++ tests/ut_mappletvisibilitymessage/.gitignore
@@ -1,2 +0,0 @@
-ut_mappletvisibilitymessage
-
--- tests/ut_mapplication/.gitignore
+++ tests/ut_mapplication/.gitignore
@@ -1 +0,0 @@
-ut_mapplication
--- tests/ut_mapplicationextensionarea/.gitignore
+++ tests/ut_mapplicationextensionarea/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionarea
--- tests/ut_mapplicationextensionareaview/.gitignore
+++ tests/ut_mapplicationextensionareaview/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionareaview
--- tests/ut_mapplicationextensionloader/.gitignore
+++ tests/ut_mapplicationextensionloader/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionloader
--- tests/ut_mapplicationextensionmanager/.gitignore
+++ tests/ut_mapplicationextensionmanager/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionmanager
--- tests/ut_mapplicationextensionmetadata/.gitignore
+++ tests/ut_mapplicationextensionmetadata/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionmetadata
--- tests/ut_mapplicationextensionrunner/.gitignore
+++ tests/ut_mapplicationextensionrunner/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationextensionrunner
--- tests/ut_mapplicationifproxy/.gitignore
+++ tests/ut_mapplicationifproxy/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationifproxy
--- tests/ut_mapplicationmenu/.gitignore
+++ tests/ut_mapplicationmenu/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationmenu
--- tests/ut_mapplicationmenubutton/.gitignore
+++ tests/ut_mapplicationmenubutton/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationmenubutton
--- tests/ut_mapplicationmenubuttonview/.gitignore
+++ tests/ut_mapplicationmenubuttonview/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationmenubuttonview
--- tests/ut_mapplicationmenuview/.gitignore
+++ tests/ut_mapplicationmenuview/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationmenuview
--- tests/ut_mapplicationpage/.gitignore
+++ tests/ut_mapplicationpage/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationpage
--- tests/ut_mapplicationservice/.gitignore
+++ tests/ut_mapplicationservice/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationservice
--- tests/ut_mapplicationwindow/.gitignore
+++ tests/ut_mapplicationwindow/.gitignore
@@ -1 +0,0 @@
-ut_mapplicationwindow
--- tests/ut_mbanner/.gitignore
+++ tests/ut_mbanner/.gitignore
@@ -1 +0,0 @@
-ut_mbanner
--- tests/ut_mbannerview/.gitignore
+++ tests/ut_mbannerview/.gitignore
@@ -1 +0,0 @@
-ut_mbannerview
--- tests/ut_mbasiclistitem/.gitignore
+++ tests/ut_mbasiclistitem/.gitignore
@@ -1 +0,0 @@
-ut_mbasiclistitem
--- tests/ut_mbasicsheetheader/.gitignore
+++ tests/ut_mbasicsheetheader/.gitignore
@@ -1 +0,0 @@
-ut_mbasicsheetheader
--- tests/ut_mbasicsheetheaderview/.gitignore
+++ tests/ut_mbasicsheetheaderview/.gitignore
@@ -1 +0,0 @@
-ut_mbasicsheetheaderview
--- tests/ut_mbubbleitem/.gitignore
+++ tests/ut_mbubbleitem/.gitignore
@@ -1 +0,0 @@
-ut_mbubbleitem
--- tests/ut_mbubbleitembackground/.gitignore
+++ tests/ut_mbubbleitembackground/.gitignore
@@ -1 +0,0 @@
-ut_mbubbleitembackground
--- tests/ut_mbutton/.gitignore
+++ tests/ut_mbutton/.gitignore
@@ -1 +0,0 @@
-ut_mbutton
--- tests/ut_mbuttongroup/.gitignore
+++ tests/ut_mbuttongroup/.gitignore
@@ -1 +0,0 @@
-ut_mbuttongroup
--- tests/ut_mbuttoniconview/.gitignore
+++ tests/ut_mbuttoniconview/.gitignore
@@ -1 +0,0 @@
-ut_mbuttoniconview
--- tests/ut_mbuttontabview/.gitignore
+++ tests/ut_mbuttontabview/.gitignore
@@ -1 +0,0 @@
-ut_mbuttontabview
--- tests/ut_mbuttonview/.gitignore
+++ tests/ut_mbuttonview/.gitignore
@@ -1 +0,0 @@
-ut_mbuttonview
--- tests/ut_mcolorcombobox/.gitignore
+++ tests/ut_mcolorcombobox/.gitignore
@@ -1 +0,0 @@
-ut_mcolorcombobox
--- tests/ut_mcolorcomboboxbutton/.gitignore
+++ tests/ut_mcolorcomboboxbutton/.gitignore
@@ -1 +0,0 @@
-ut_mcolorcomboboxbutton
--- tests/ut_mcolorcomboboxview/.gitignore
+++ tests/ut_mcolorcomboboxview/.gitignore
@@ -1 +0,0 @@
-ut_mcolorcomboboxview
--- tests/ut_mcolorlist/.gitignore
+++ tests/ut_mcolorlist/.gitignore
@@ -1 +0,0 @@
-ut_mcolorlist
--- tests/ut_mcolorlistview/.gitignore
+++ tests/ut_mcolorlistview/.gitignore
@@ -1 +0,0 @@
-ut_mcolorlistview
--- tests/ut_mcombobox/.gitignore
+++ tests/ut_mcombobox/.gitignore
@@ -1 +0,0 @@
-ut_mcombobox
--- tests/ut_mcommonpixmaps/.gitignore
+++ tests/ut_mcommonpixmaps/.gitignore
@@ -1 +0,0 @@
-ut_mcommonpixmaps
--- tests/ut_mcompleter/.gitignore
+++ tests/ut_mcompleter/.gitignore
@@ -1 +0,0 @@
-ut_mcompleter
--- tests/ut_mcomponentcache/.gitignore
+++ tests/ut_mcomponentcache/.gitignore
@@ -1 +0,0 @@
-ut_mcomponentcache
--- tests/ut_mcomponentdata/.gitignore
+++ tests/ut_mcomponentdata/.gitignore
@@ -1 +0,0 @@
-ut_mcomponentdata
--- tests/ut_mconf/.gitignore
+++ tests/ut_mconf/.gitignore
@@ -1 +0,0 @@
-ut_mconf
--- tests/ut_mcontainer/.gitignore
+++ tests/ut_mcontainer/.gitignore
@@ -1 +0,0 @@
-ut_mcontainer
--- tests/ut_mcontainerheader/.gitignore
+++ tests/ut_mcontainerheader/.gitignore
@@ -1 +0,0 @@
-ut_mcontainerheader
--- tests/ut_mcontentitem/.gitignore
+++ tests/ut_mcontentitem/.gitignore
@@ -1 +0,0 @@
-ut_mcontentitem
--- tests/ut_mcontentitemview/.gitignore
+++ tests/ut_mcontentitemview/.gitignore
@@ -1 +0,0 @@
-ut_mcontentitemview
--- tests/ut_mdbusservicewaiter/.gitignore
+++ tests/ut_mdbusservicewaiter/.gitignore
@@ -1 +0,0 @@
-ut_mdbusservicewaiter
--- tests/ut_mdebug/.gitignore
+++ tests/ut_mdebug/.gitignore
@@ -1 +0,0 @@
-ut_mdebug
--- tests/ut_mdesktopentry/.gitignore
+++ tests/ut_mdesktopentry/.gitignore
@@ -1 +0,0 @@
-ut_mdesktopentry
--- tests/ut_mdetailedlistitem/.gitignore
+++ tests/ut_mdetailedlistitem/.gitignore
@@ -1 +0,0 @@
-ut_mdetailedlistitem
--- tests/ut_mdialog/.gitignore
+++ tests/ut_mdialog/.gitignore
@@ -1 +0,0 @@
-ut_mdialog
--- tests/ut_mdialogview/.gitignore
+++ tests/ut_mdialogview/.gitignore
@@ -1 +0,0 @@
-ut_mdialogview
--- tests/ut_mdynamicpropertywatcher/.gitignore
+++ tests/ut_mdynamicpropertywatcher/.gitignore
@@ -1 +0,0 @@
-ut_mdynamicpropertywatcher
--- tests/ut_meditortoolbar/.gitignore
+++ tests/ut_meditortoolbar/.gitignore
@@ -1,2 +0,0 @@
-ut_meditortoolbar
-
--- tests/ut_mescapebuttonpanel/.gitignore
+++ tests/ut_mescapebuttonpanel/.gitignore
@@ -1 +0,0 @@
-ut_mescapebuttonpanel
--- tests/ut_mescapebuttonpanelview/.gitignore
+++ tests/ut_mescapebuttonpanelview/.gitignore
@@ -1 +0,0 @@
-ut_mescapebuttonpanelview
--- tests/ut_mextendingbackgroundview/.gitignore
+++ tests/ut_mextendingbackgroundview/.gitignore
@@ -1 +0,0 @@
-ut_mextendingbackgroundview
--- tests/ut_mextensionarea/.gitignore
+++ tests/ut_mextensionarea/.gitignore
@@ -1 +0,0 @@
-ut_mextensionarea
--- tests/ut_mextensionhandle/.gitignore
+++ tests/ut_mextensionhandle/.gitignore
@@ -1,2 +0,0 @@
-ut_mextensionhandle
-
--- tests/ut_mextensionhandleview/.gitignore
+++ tests/ut_mextensionhandleview/.gitignore
@@ -1 +0,0 @@
-ut_mextensionhandleview
--- tests/ut_mextensionrunner/.gitignore
+++ tests/ut_mextensionrunner/.gitignore
@@ -1,2 +0,0 @@
-ut_mextensionrunner
-
--- tests/ut_mextensionwatcher/.gitignore
+++ tests/ut_mextensionwatcher/.gitignore
@@ -1 +0,0 @@
-ut_mextensionwatcher
--- tests/ut_mfeedback/.gitignore
+++ tests/ut_mfeedback/.gitignore
@@ -1,5 +0,0 @@
-ut_mfeedback
-mfeedback.cpp
-mfeedback.h
-mfeedback_p.cpp
-mfeedback_p.h
--- tests/ut_mfeedbackplayer/.gitignore
+++ tests/ut_mfeedbackplayer/.gitignore
@@ -1,5 +0,0 @@
-ut_mfeedbackplayer
-mfeedbackplayer.cpp
-mfeedbackplayer.h
-mfeedbackplayer_p.cpp
-mfeedbackplayer_p.h
--- tests/ut_mfiledatastore/.gitignore
+++ tests/ut_mfiledatastore/.gitignore
@@ -1 +0,0 @@
-ut_mfiledatastore
--- tests/ut_mflowlayoutpolicy/.gitignore
+++ tests/ut_mflowlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-ut_mflowlayoutpolicy
--- tests/ut_mfreestylelayoutpolicy/.gitignore
+++ tests/ut_mfreestylelayoutpolicy/.gitignore
@@ -1 +0,0 @@
-ut_mfreestylelayoutpolicy
--- tests/ut_mgconfdatastore/.gitignore
+++ tests/ut_mgconfdatastore/.gitignore
@@ -1 +0,0 @@
-ut_mgconfdatastore
--- tests/ut_mgles2renderer/.gitignore
+++ tests/ut_mgles2renderer/.gitignore
@@ -1 +0,0 @@
-ut_mgles2renderer
--- tests/ut_mgraphicsclipeffect/.gitignore
+++ tests/ut_mgraphicsclipeffect/.gitignore
@@ -1 +0,0 @@
-ut_mgraphicsclipeffect
--- tests/ut_mgraphicshighlighteffect/.gitignore
+++ tests/ut_mgraphicshighlighteffect/.gitignore
@@ -1 +0,0 @@
-ut_mgraphicshighlighteffect
--- tests/ut_mgriditem/.gitignore
+++ tests/ut_mgriditem/.gitignore
@@ -1 +0,0 @@
-ut_mgriditem
--- tests/ut_mgridlayoutpolicy/.gitignore
+++ tests/ut_mgridlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-ut_mgridlayoutpolicy
--- tests/ut_mhelpbutton/.gitignore
+++ tests/ut_mhelpbutton/.gitignore
@@ -1 +0,0 @@
-ut_mhelpbutton
--- tests/ut_mimage/.gitignore
+++ tests/ut_mimage/.gitignore
@@ -1 +0,0 @@
-ut_mimage
--- tests/ut_mimagedirectory/.gitignore
+++ tests/ut_mimagedirectory/.gitignore
@@ -1,2 +0,0 @@
-ut_mimagedirectory
-
--- tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de/.gitignore
+++ tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de/.gitignore
@@ -1 +0,0 @@
-
--- tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de_DE/.gitignore
+++ tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de_DE/.gitignore
@@ -1 +0,0 @@
-
--- 
tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de_DE_lala/.gitignore
+++ 
tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/de_DE_lala/.gitignore
@@ -1 +0,0 @@
-
--- 
tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/sr_Cyrl_RS_REVISED@collation=phonebook/.gitignore
+++ 
tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/sr_Cyrl_RS_REVISED@collation=phonebook/.gitignore
@@ -1 +0,0 @@
-
--- tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/sy/.gitignore
+++ tests/ut_mimagedirectory/ut_mimagedirectory-samples/locale/sy/.gitignore
@@ -1 +0,0 @@
-
--- tests/ut_mimagewidget/.gitignore
+++ tests/ut_mimagewidget/.gitignore
@@ -1 +0,0 @@
-ut_mimagewidget
--- tests/ut_minfobanner/.gitignore
+++ tests/ut_minfobanner/.gitignore
@@ -1 +0,0 @@
-ut_minfobanner
--- tests/ut_minfobannerinformationview/.gitignore
+++ tests/ut_minfobannerinformationview/.gitignore
@@ -1 +0,0 @@
-ut_minfobannerinformationview
--- tests/ut_minfobannerview/.gitignore
+++ tests/ut_minfobannerview/.gitignore
@@ -1 +0,0 @@
-ut_minfobannerview
--- tests/ut_minputmethodstate/.gitignore
+++ tests/ut_minputmethodstate/.gitignore
@@ -1 +0,0 @@
-ut_minputmethodstate
--- tests/ut_minputwidgetrelocator/.gitignore
+++ tests/ut_minputwidgetrelocator/.gitignore
@@ -1 +0,0 @@
-ut_minputwidgetrelocator
--- tests/ut_mlabel/.gitignore
+++ tests/ut_mlabel/.gitignore
@@ -1 +0,0 @@
-ut_mlabel
--- tests/ut_mlayout/.gitignore
+++ tests/ut_mlayout/.gitignore
@@ -1 +0,0 @@
-ut_mlayout
--- tests/ut_mlinearlayoutpolicy/.gitignore
+++ tests/ut_mlinearlayoutpolicy/.gitignore
@@ -1 +0,0 @@
-ut_mlinearlayoutpolicy
--- tests/ut_mlist/.gitignore
+++ tests/ut_mlist/.gitignore
@@ -1 +0,0 @@
-ut_mlist
--- tests/ut_mlistfilter/.gitignore
+++ tests/ut_mlistfilter/.gitignore
@@ -1 +0,0 @@
-ut_mlistfilter
--- tests/ut_mlistindex/.gitignore
+++ tests/ut_mlistindex/.gitignore
@@ -1 +0,0 @@
-ut_mlistindex
--- tests/ut_mlistitem/.gitignore
+++ tests/ut_mlistitem/.gitignore
@@ -1 +0,0 @@
-ut_mlistitem
--- tests/ut_mlistview/.gitignore
+++ tests/ut_mlistview/.gitignore
@@ -1,2 +0,0 @@
-ut_mlistview
-
--- tests/ut_mlistviewgroupheader/.gitignore
+++ tests/ut_mlistviewgroupheader/.gitignore
@@ -1 +0,0 @@
-ut_mlistviewgroupheader
\ No newline at end of file
--- tests/ut_mlistviewmulticolumn/.gitignore
+++ tests/ut_mlistviewmulticolumn/.gitignore
@@ -1 +0,0 @@
-ut_mlistviewmulticolumn
\ No newline at end of file
--- tests/ut_mlistviewseparators/.gitignore
+++ tests/ut_mlistviewseparators/.gitignore
@@ -1 +0,0 @@
-ut_mlistviewseparators
\ No newline at end of file
--- tests/ut_mlocalthemedaemon/.gitignore
+++ tests/ut_mlocalthemedaemon/.gitignore
@@ -1 +0,0 @@
-ut_mlocalthemedaemon
--- tests/ut_mlogicalvalues/.gitignore
+++ tests/ut_mlogicalvalues/.gitignore
@@ -1 +0,0 @@
-ut_mlogicalvalues
--- tests/ut_mmashupcanvas/.gitignore
+++ tests/ut_mmashupcanvas/.gitignore
@@ -1 +0,0 @@
-ut_mmashupcanvas
--- tests/ut_mmashupcanvasview/.gitignore
+++ tests/ut_mmashupcanvasview/.gitignore
@@ -1 +0,0 @@
-ut_mmashupcanvasview
--- tests/ut_mmessagebox/.gitignore
+++ tests/ut_mmessagebox/.gitignore
@@ -1 +0,0 @@
-ut_mmessagebox
--- tests/ut_mmessageboxview/.gitignore
+++ tests/ut_mmessageboxview/.gitignore
@@ -1 +0,0 @@
-ut_mmessageboxview
--- tests/ut_mmulticolumnlistview/.gitignore
+++ tests/ut_mmulticolumnlistview/.gitignore
@@ -1 +0,0 @@
-ut_mfastlistview
--- tests/ut_mnavigationbar/.gitignore
+++ tests/ut_mnavigationbar/.gitignore
@@ -1 +0,0 @@
-ut_mnavigationbar
--- tests/ut_mnavigationbarview/.gitignore
+++ tests/ut_mnavigationbarview/.gitignore
@@ -1 +0,0 @@
-ut_mnavigationbarview
--- tests/ut_mnotification/.gitignore
+++ tests/ut_mnotification/.gitignore
@@ -1 +0,0 @@
-ut_mnotification
--- tests/ut_mobjectmenu/.gitignore
+++ tests/ut_mobjectmenu/.gitignore
@@ -1,2 +0,0 @@
-ut_mobjectmenu
-
--- tests/ut_mobjectmenubasicview/.gitignore
+++ tests/ut_mobjectmenubasicview/.gitignore
@@ -1 +0,0 @@
-ut_mobjectmenubasicview
--- tests/ut_mobjectmenuview/.gitignore
+++ tests/ut_mobjectmenuview/.gitignore
@@ -1 +0,0 @@
-ut_mobjectmenuview
--- tests/ut_morientationtracker/.gitignore
+++ tests/ut_morientationtracker/.gitignore
@@ -1,2 +0,0 @@
-ut_morientationtracker
-
--- tests/ut_moverlay/.gitignore
+++ tests/ut_moverlay/.gitignore
@@ -1 +0,0 @@
-ut_moverlay
--- tests/ut_mpannableviewport/.gitignore
+++ tests/ut_mpannableviewport/.gitignore
@@ -1 +0,0 @@
-ut_mpannableviewport
--- tests/ut_mpannableviewportscroller/.gitignore
+++ tests/ut_mpannableviewportscroller/.gitignore
@@ -1 +0,0 @@
-ut_mpannableviewportscroller
--- tests/ut_mpannablewidget/.gitignore
+++ tests/ut_mpannablewidget/.gitignore
@@ -1 +0,0 @@
-ut_mpannablewidget
--- tests/ut_mpanrecognizer/.gitignore
+++ tests/ut_mpanrecognizer/.gitignore
@@ -1 +0,0 @@
-ut_mpanrecognizer
--- tests/ut_mpanrecognizertouch/.gitignore
+++ tests/ut_mpanrecognizertouch/.gitignore
@@ -1 +0,0 @@
-ut_mpanrecognizertouch
--- tests/ut_mphysics2dpanning/.gitignore
+++ tests/ut_mphysics2dpanning/.gitignore
@@ -1 +0,0 @@
-ut_mphysics2dpanning
--- tests/ut_mpopuplist/.gitignore
+++ tests/ut_mpopuplist/.gitignore
@@ -1 +0,0 @@
-ut_mpopuplist
--- tests/ut_mpopuplistitem/.gitignore
+++ tests/ut_mpopuplistitem/.gitignore
@@ -1 +0,0 @@
-ut_mpopuplistitem
--- tests/ut_mpositionindicator/.gitignore
+++ tests/ut_mpositionindicator/.gitignore
@@ -1 +0,0 @@
-ut_mpositionindicator
--- tests/ut_mpositionindicatorview/.gitignore
+++ tests/ut_mpositionindicatorview/.gitignore
@@ -1 +0,0 @@
-ut_mpositionindicatorview
--- tests/ut_mpreloader/.gitignore
+++ tests/ut_mpreloader/.gitignore
@@ -1 +0,0 @@
-ut_mpreloader
--- tests/ut_mprogressindicator/.gitignore
+++ tests/ut_mprogressindicator/.gitignore
@@ -1 +0,0 @@
-ut_mprogressindicator
--- tests/ut_mprogressindicatorbarview/.gitignore
+++ tests/ut_mprogressindicatorbarview/.gitignore
@@ -1 +0,0 @@
-ut_mprogressindicatorbarview
--- tests/ut_mprogressindicatorspinnerview/.gitignore
+++ tests/ut_mprogressindicatorspinnerview/.gitignore
@@ -1 +0,0 @@
-ut_mprogressindicatorspinnerview
--- tests/ut_mremoteaction/.gitignore
+++ tests/ut_mremoteaction/.gitignore
@@ -1 +0,0 @@
-ut_mremoteaction
--- tests/ut_mremotethemedaemon/.gitignore
+++ tests/ut_mremotethemedaemon/.gitignore
@@ -1 +0,0 @@
-ut_mremotethemedaemon
--- tests/ut_mrichtextedit/.gitignore
+++ tests/ut_mrichtextedit/.gitignore
@@ -1 +0,0 @@
-ut_mrichtextedit
--- tests/ut_mrichtexteditdialogsmanager/.gitignore
+++ tests/ut_mrichtexteditdialogsmanager/.gitignore
@@ -1 +0,0 @@
-ut_mrichtexteditdialogsmanager
--- tests/ut_mscene/.gitignore
+++ tests/ut_mscene/.gitignore
@@ -1 +0,0 @@
-ut_mscene
--- tests/ut_mscenemanager/.gitignore
+++ tests/ut_mscenemanager/.gitignore
@@ -1 +0,0 @@
-ut_mscenemanager
--- tests/ut_mscenewindow/.gitignore
+++ tests/ut_mscenewindow/.gitignore
@@ -1 +0,0 @@
-ut_mscenewindow
--- tests/ut_mscenewindowscroller/.gitignore
+++ tests/ut_mscenewindowscroller/.gitignore
@@ -1 +0,0 @@
-ut_mscenewindowscroller
--- tests/ut_mscrollchain/.gitignore
+++ tests/ut_mscrollchain/.gitignore
@@ -1,2 +0,0 @@
-ut_mscrollchain
-
--- tests/ut_mseekbar/.gitignore
+++ tests/ut_mseekbar/.gitignore
@@ -1 +0,0 @@
-ut_mseekbar
--- tests/ut_mseparator/.gitignore
+++ tests/ut_mseparator/.gitignore
@@ -1 +0,0 @@
-ut_mseparator
--- tests/ut_mseparatorview/.gitignore
+++ tests/ut_mseparatorview/.gitignore
@@ -1 +0,0 @@
-ut_mseparatorview
--- tests/ut_mserviceaction/.gitignore
+++ tests/ut_mserviceaction/.gitignore
@@ -1 +0,0 @@
-ut_mserviceaction
--- tests/ut_mservicefwbaseif/.gitignore
+++ tests/ut_mservicefwbaseif/.gitignore
@@ -1 +0,0 @@
-ut_mservicefwbaseif
--- tests/ut_mservicefwgen/.gitignore
+++ tests/ut_mservicefwgen/.gitignore
@@ -1,13 +0,0 @@
-ut_mservicefwgen
-someinterfaceproxy.h
-someinterfaceproxy.cpp
-someinterfaceadaptor.h
-someinterfaceadaptor.cpp
-someinterface.h
-someinterface.cpp
-someinterface2.cpp
-someinterface2.h
-someinterface2adaptor.cpp
-someinterface2adaptor.h
-someinterface2proxy.cpp
-someinterface2proxy.h
--- tests/ut_mserviceinvoker/.gitignore
+++ tests/ut_mserviceinvoker/.gitignore
@@ -1 +0,0 @@
-ut_mserviceinvoker
--- tests/ut_mservicemapper/.gitignore
+++ tests/ut_mservicemapper/.gitignore
@@ -1 +0,0 @@
-ut_mservicemapper
--- tests/ut_msettings/.gitignore
+++ tests/ut_msettings/.gitignore
@@ -1 +0,0 @@
-ut_msettings
--- tests/ut_msettingslanguagebinary/.gitignore
+++ tests/ut_msettingslanguagebinary/.gitignore
@@ -1,2 +0,0 @@
-ut_msettingslanguagebinary
-
--- tests/ut_msettingslanguageboolean/.gitignore
+++ tests/ut_msettingslanguageboolean/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageboolean
--- tests/ut_msettingslanguagebooleancontroller/.gitignore
+++ tests/ut_msettingslanguagebooleancontroller/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagebooleancontroller
--- tests/ut_msettingslanguagebooleanfactory/.gitignore
+++ tests/ut_msettingslanguagebooleanfactory/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagebooleanfactory
--- tests/ut_msettingslanguageinteger/.gitignore
+++ tests/ut_msettingslanguageinteger/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageinteger
--- tests/ut_msettingslanguageintegercontroller/.gitignore
+++ tests/ut_msettingslanguageintegercontroller/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageintegercontroller
--- tests/ut_msettingslanguageintegerfactory/.gitignore
+++ tests/ut_msettingslanguageintegerfactory/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageintegerfactory
--- tests/ut_msettingslanguageoption/.gitignore
+++ tests/ut_msettingslanguageoption/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageoption
--- tests/ut_msettingslanguageparser/.gitignore
+++ tests/ut_msettingslanguageparser/.gitignore
@@ -1,2 +0,0 @@
-ut_msettingslanguageparser
-
--- tests/ut_msettingslanguageselection/.gitignore
+++ tests/ut_msettingslanguageselection/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageselection
--- tests/ut_msettingslanguageselectioncontroller/.gitignore
+++ tests/ut_msettingslanguageselectioncontroller/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguageselectioncontroller
--- tests/ut_msettingslanguageselectionfactory/.gitignore
+++ tests/ut_msettingslanguageselectionfactory/.gitignore
@@ -1,2 +0,0 @@
-ut_msettingslanguageselectionfactory
-
--- tests/ut_msettingslanguagesettings/.gitignore
+++ tests/ut_msettingslanguagesettings/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagesettings
--- tests/ut_msettingslanguagesettingsfactory/.gitignore
+++ tests/ut_msettingslanguagesettingsfactory/.gitignore
@@ -1,2 +0,0 @@
-ut_msettingslanguagesettingsfactory
-
--- tests/ut_msettingslanguagetext/.gitignore
+++ tests/ut_msettingslanguagetext/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagetext
--- tests/ut_msettingslanguagetextcontroller/.gitignore
+++ tests/ut_msettingslanguagetextcontroller/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagetextcontroller
--- tests/ut_msettingslanguagetextfactory/.gitignore
+++ tests/ut_msettingslanguagetextfactory/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagetextfactory
--- tests/ut_msettingslanguagewidget/.gitignore
+++ tests/ut_msettingslanguagewidget/.gitignore
@@ -1 +0,0 @@
-ut_msettingslanguagewidget
--- tests/ut_msettingslanguagewidgetfactory/.gitignore
+++ tests/ut_msettingslanguagewidgetfactory/.gitignore
@@ -1,2 +0,0 @@
-ut_msettingslanguagewidgetfactory
-
--- tests/ut_mshareddata/.gitignore
+++ tests/ut_mshareddata/.gitignore
@@ -1,2 +0,0 @@
-ut_mshareddata
-
--- tests/ut_msheet/.gitignore
+++ tests/ut_msheet/.gitignore
@@ -1 +0,0 @@
-ut_msheet
--- tests/ut_msheetview/.gitignore
+++ tests/ut_msheetview/.gitignore
@@ -1 +0,0 @@
-ut_msheetview
\ No newline at end of file
--- tests/ut_mslider/.gitignore
+++ tests/ut_mslider/.gitignore
@@ -1 +0,0 @@
-ut_mslider
--- tests/ut_msliderview/.gitignore
+++ tests/ut_msliderview/.gitignore
@@ -1 +0,0 @@
-ut_msliderview
--- tests/ut_mstatusbarstylenamehandler/.gitignore
+++ tests/ut_mstatusbarstylenamehandler/.gitignore
@@ -1 +0,0 @@
-ut_mstatusbarstylenamehandler
--- tests/ut_mstatusbarview/.gitignore
+++ tests/ut_mstatusbarview/.gitignore
@@ -1 +0,0 @@
-ut_mstatusbarview
--- tests/ut_mstylablewidget/.gitignore
+++ tests/ut_mstylablewidget/.gitignore
@@ -1 +0,0 @@
-ut_mstylablewidget
--- tests/ut_msubdatastore/.gitignore
+++ tests/ut_msubdatastore/.gitignore
@@ -1 +0,0 @@
-ut_msubdatastore
--- tests/ut_mswiperecognizer/.gitignore
+++ tests/ut_mswiperecognizer/.gitignore
@@ -1 +0,0 @@
-ut_mswiperecognizer
--- tests/ut_msyslogclient/.gitignore
+++ tests/ut_msyslogclient/.gitignore
@@ -1 +0,0 @@
-ut_msyslogclient
--- tests/ut_msystemdirectories/.gitignore
+++ tests/ut_msystemdirectories/.gitignore
@@ -1 +0,0 @@
-ut_msystemdirectories
--- tests/ut_mtapandholdrecognizer/.gitignore
+++ tests/ut_mtapandholdrecognizer/.gitignore
@@ -1 +0,0 @@
-ut_mtapandholdrecognizer
--- tests/ut_mtapstatemachine/.gitignore
+++ tests/ut_mtapstatemachine/.gitignore
@@ -1 +0,0 @@
-ut_mtapstatemachine
--- tests/ut_mtextedit/.gitignore
+++ tests/ut_mtextedit/.gitignore
@@ -1 +0,0 @@
-ut_mtextedit
--- tests/ut_mtexteditview/.gitignore
+++ tests/ut_mtexteditview/.gitignore
@@ -1 +0,0 @@
-ut_mtexteditview
--- tests/ut_mtextmagnifier/.gitignore
+++ tests/ut_mtextmagnifier/.gitignore
@@ -1,2 +0,0 @@
-ut_mtextmagnifier
-
--- tests/ut_mtextselectionoverlay/.gitignore
+++ tests/ut_mtextselectionoverlay/.gitignore
@@ -1,2 +0,0 @@
-ut_mtextselectionoverlay
-
--- tests/ut_mtheme/.gitignore
+++ tests/ut_mtheme/.gitignore
@@ -1 +0,0 @@
-ut_mtheme
--- tests/ut_mthemedaemonprotocol/.gitignore
+++ tests/ut_mthemedaemonprotocol/.gitignore
@@ -1 +0,0 @@
-ut_mthemedaemonprotocol
--- tests/ut_mtimestamp/.gitignore
+++ tests/ut_mtimestamp/.gitignore
@@ -1 +0,0 @@
-ut_mtimestamp
--- tests/ut_mtoolbar/.gitignore
+++ tests/ut_mtoolbar/.gitignore
@@ -1 +0,0 @@
-ut_mtoolbar
--- tests/ut_mtoolbarview/.gitignore
+++ tests/ut_mtoolbarview/.gitignore
@@ -1 +0,0 @@
-ut_mtoolbarview
--- tests/ut_mwidget/.gitignore
+++ tests/ut_mwidget/.gitignore
@@ -1 +0,0 @@
-ut_mwidget
--- tests/ut_mwidgetanimation/.gitignore
+++ tests/ut_mwidgetanimation/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetanimation
--- tests/ut_mwidgetcontroller/.gitignore
+++ tests/ut_mwidgetcontroller/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetcontroller
--- tests/ut_mwidgetmoveanimation/.gitignore
+++ tests/ut_mwidgetmoveanimation/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetmoveanimation
--- tests/ut_mwidgetrectangularclipanimation/.gitignore
+++ tests/ut_mwidgetrectangularclipanimation/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetrectangularclipanimation
--- tests/ut_mwidgetscalefadeanimation/.gitignore
+++ tests/ut_mwidgetscalefadeanimation/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetscalefadeanimation
--- tests/ut_mwidgetview/.gitignore
+++ tests/ut_mwidgetview/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetview
--- tests/ut_mwidgetzoomanimation/.gitignore
+++ tests/ut_mwidgetzoomanimation/.gitignore
@@ -1 +0,0 @@
-ut_mwidgetzoomanimation
--- tests/ut_mwindow/.gitignore
+++ tests/ut_mwindow/.gitignore
@@ -1 +0,0 @@
-ut_mwindow
--- tools/.gitignore
+++ tools/.gitignore
@@ -1,2 +0,0 @@
-.dummy
-m-servicefwgen
--- tools/mapplettester/.gitignore
+++ tools/mapplettester/.gitignore
@@ -1,2 +0,0 @@
-mapplettester
-
--- tools/mapplicationextensiontester/.gitignore
+++ tools/mapplicationextensiontester/.gitignore
@@ -1 +0,0 @@
-mapplicationextensiontester
--- tools/mcssvalidator/.gitignore
+++ tools/mcssvalidator/.gitignore
@@ -1 +0,0 @@
-mcssvalidator
--- tools/mnotificationtool/.gitignore
+++ tools/mnotificationtool/.gitignore
@@ -1 +0,0 @@
-mnotificationtool
--- tools/mnotificationtool/mnotificationtool.cpp
+++ tools/mnotificationtool/mnotificationtool.cpp
@@ -307,9 +307,6 @@
                 group.setAction(*remoteAction);
                 group.setCount(count);
                 group.setIdentifier(identifier);
-                if (timestamp != 0) {
-                    group.setTimestamp(QDateTime::fromTime_t(timestamp));
-                }
                 group.publish();
                 result = group.id();
             } else {
@@ -349,9 +346,6 @@
                 group.setAction(*remoteAction);
                 group.setCount(count);
                 group.setIdentifier(identifier);
-                if (timestamp != 0) {
-                    group.setTimestamp(QDateTime::fromTime_t(timestamp));
-                }
                 group.publish();
             } else {
                 MNotificationToolNotification notification(id);

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -1,6 +1,6 @@
 Name: libmeegotouch
 Summary: MeeGo Touch Framework
-Version: 0.30.5
+Version: 0.30.6
 Release: 1
 Group: System/Libraries
 License: LGPLv2.1



Reply via email to