I have made the following changes intended for : CE:MW:Shared / lipstick 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/8409 Thank You, vesuri [This message was auto-generated] --- Request # 8409: Messages from BOSS: State: review at 2013-03-12T15:38:59 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 / lipstick -> CE:MW:Shared / lipstick changes files: -------------- --- lipstick.changes +++ lipstick.changes @@ -0,0 +1,3 @@ +* Tue Mar 12 2013 Vesa Halttunen <[email protected]> - 0.10.2 +- Export HomeWindowMonitor to UX implementations (from Vesa) + old: ---- lipstick-0.10.1.tar.bz2 new: ---- lipstick-0.10.2.tar.bz2 spec files: ----------- --- lipstick.spec +++ lipstick.spec @@ -9,7 +9,7 @@ # << macros Summary: QML toolkit for homescreen creation -Version: 0.10.1 +Version: 0.10.2 Release: 1 Group: System/Libraries License: LGPLv2.1 other changes: -------------- ++++++ lipstick-0.10.1.tar.bz2 -> lipstick-0.10.2.tar.bz2 --- plugin/plugin.pro +++ plugin/plugin.pro @@ -12,7 +12,7 @@ target.path = $$[QT_INSTALL_IMPORTS]/org/nemomobile/lipstick DEPENDPATH += "../src" -INCLUDEPATH += "../src" "../src/utilities" +INCLUDEPATH += "../src" "../src/utilities" "../src/xtools" LIBS += -L"../src" -llipstick HEADERS += \ --- src/components/windowinfo.h +++ src/components/windowinfo.h @@ -17,7 +17,7 @@ #include <QString> #include "lipstickglobal.h" -#include "xtools/xeventlistener.h" +#include "xeventlistener.h" /*! * WindowInfo is a helper class for storing information about an open window. --- src/src.pro +++ src/src.pro @@ -3,7 +3,7 @@ TEMPLATE = lib TARGET = lipstick -VERSION = 0.10.1 +VERSION = 0.10.2 DEFINES += LIPSTICK_BUILD_LIBRARY VERSION=\\\"$$VERSION\\\" @@ -15,7 +15,7 @@ OBJECTS_DIR = .obj MOC_DIR = .moc -INCLUDEPATH += utilities +INCLUDEPATH += utilities components xtools PUBLICHEADERS += \ utilities/qobjectlistmodel.h \ @@ -32,6 +32,8 @@ notifications/notification.h \ notifications/notificationlistmodel.h \ notifications/notificationpreviewpresenter.h \ + xtools/homewindowmonitor.h \ + xtools/windowmonitor.h \ xtools/xeventlistener.h \ xtools/xatomcache.h \ usbmodeselector.h \ @@ -45,8 +47,6 @@ HEADERS += \ $$PUBLICHEADERS \ - xtools/homewindowmonitor.h \ - xtools/windowmonitor.h \ xtools/xwindowmanager.h \ xtools/x11wrapper.h \ lipsticksettings.h \ --- src/xtools/homewindowmonitor.cpp +++ src/xtools/homewindowmonitor.cpp @@ -62,9 +62,9 @@ bool eventHandled = false; if (event.type == PropertyNotify && event.xproperty.atom == netClientListStacking && event.xproperty.window == DefaultRootWindow(QX11Info::display())) { - int numWindowStackingOrderReceivers = receivers(SIGNAL(windowStackingOrderChanged(QList<WindowInfo>))); + int numWindowStackingOrderReceivers = receivers(SIGNAL(windowStackingOrderChanged(QList<WindowInfo*>))); int numFullscreenWindowReceivers = receivers(SIGNAL(fullscreenWindowOnTopOfOwnWindow())); - int numAnyWindowReceivers = receivers(SIGNAL(anyWindowOnTopOfOwnWindow(WindowInfo))); + int numAnyWindowReceivers = receivers(SIGNAL(anyWindowOnTopOfOwnWindow(WindowInfo*))); if (numWindowStackingOrderReceivers + numFullscreenWindowReceivers + numAnyWindowReceivers > 0) { QList<Window> windowOrder = windowStackingOrder(); --- src/xtools/homewindowmonitor.h +++ src/xtools/homewindowmonitor.h @@ -21,7 +21,7 @@ /*! * A window monitor implementation to be used with the home screen application. */ -class HomeWindowMonitor : public WindowMonitor, public XEventListener +class LIPSTICK_EXPORT HomeWindowMonitor : public WindowMonitor, public XEventListener { Q_OBJECT --- src/xtools/windowmonitor.h +++ src/xtools/windowmonitor.h @@ -15,7 +15,7 @@ #include <QWidget> #include <QObject> -#include "components/windowinfo.h" +#include "windowinfo.h" /*! * An interface defining window monitoring functionality. @@ -23,7 +23,7 @@ * various things when something happens to the windows. It is only a * monitor: it doesn't change anything on the windows. */ -class WindowMonitor : public QObject { +class LIPSTICK_EXPORT WindowMonitor : public QObject { Q_OBJECT ++++++ lipstick.yaml --- lipstick.yaml +++ lipstick.yaml @@ -1,6 +1,6 @@ Name: lipstick Summary: QML toolkit for homescreen creation -Version: 0.10.1 +Version: 0.10.2 Release: 1 Group: System/Libraries License: LGPLv2.1
