Review Request 123056: Merge remote-tracking branch 'origin/master' into frameworks

[Aleix Pol Gonzalez]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/123056/#review77772
-----------------------------------------------------------


+1 should be fine, provided all the rest works.

- Aleix Pol Gonzalez


On March 19, 2015, 7:55 p.m., Niels Ole Salscheider wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/123056/
> -----------------------------------------------------------
> 
> (Updated March 19, 2015, 7:55 p.m.)
> 
> 
> Review request for Telepathy.
> 
> 
> Repository: ktp-call-ui
> 
> 
> Description
> -------
> 
> Merge master (containing the new QML interface) to frameworks
> 
> 
> Diffs
> -----
> 
>   CMakeLists.txt 873dd93 
>   Messages.sh a9e0e28 
>   src/CMakeLists.txt 3cb3826 
>   src/call-window.h 07fd01e 
>   src/call-window.cpp b4d7e3d 
>   src/call-window.ui 32c7dad 
>   src/callwindowui.rc 6c390b9 
>   src/dtmf-handler.h 91960dc 
>   src/dtmf-handler.cpp d8d7970 
>   src/dtmf-qml.h PRE-CREATION 
>   src/dtmf-qml.cpp PRE-CREATION 
>   src/dtmf-widget.h b936bcf 
>   src/dtmf-widget.cpp f3436b2 
>   src/dtmf-widget.ui 67f60b9 
>   src/qml-interface.h PRE-CREATION 
>   src/qml-interface.cpp PRE-CREATION 
>   src/qml/Main.qml PRE-CREATION 
>   src/qml/core/Button.qml PRE-CREATION 
>   src/qml/core/Dtmf.qml PRE-CREATION 
>   src/qml/core/DtmfButton.qml PRE-CREATION 
>   src/qml/core/Label.qml PRE-CREATION 
>   src/qml/core/Separator.qml PRE-CREATION 
>   src/qml/core/ToggleButton.qml PRE-CREATION 
>   src/qml/core/Toolbar.qml PRE-CREATION 
>   src/qml/core/Tooltip.qml PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/123056/diff/
> 
> 
> Testing
> -------
> 
> This does not build because it imports the old QtDeclarative code.
> This fill be fixed by the next commit.
> 
> 
> Thanks,
> 
> Niels Ole Salscheider
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-telepathy/attachments/20150319/458ea041/attachment.html>