[umbrello-devel] [umbrello] /: Fix 'Umbrello toolbar icons does not match diagram widgets and cursors running under "breeze" style'.

[Christoph Feck]

Hi Ralf,

On Thursday 09 June 2016 00:51:44 Ralf Habacker wrote:
> Git commit 4bc648dbc006212ed1d6aa16295f03cce153327a by Ralf
> Habacker. Committed on 08/06/2016 at 22:50.
> Pushed by habacker into branch 'master'.
> 
> Fix 'Umbrello toolbar icons does not match diagram widgets and
> cursors running under "breeze" style'.
> 
> Icons are now integrated into umbrello binary by using a qrc file.
> 
> BUG:364120
> FIXED-IN:2.19.80 (KDE Applications 16.07.80)
> 
> M  +1    -0    CMakeLists.txt
> M  +1    -0    umbrello/CMakeLists.txt
> M  +29   -5    umbrello/icon_utils.cpp
> A  +174  -0    umbrello/icons.qrc
> M  +1    -0    umbrello/main.cpp
> 
> 
http://commits.kde.org/umbrello/4bc648dbc006212ed1d6aa16295f03cce15
> 3327a
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 33aef8d..1f04e74 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -25,6 +25,7 @@ if(NOT BUILD_KF5)
>      cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
> 
>      set(CMAKE_AUTOMOC ON)
> +    set(CMAKE_AUTORCC ON)

Could you commit the equivalent also for BUILD_KF5=ON case?
It fails with this error:

CMakeFiles/umbrello.dir/main.cpp.o: In function `main':
main.cpp:(.text+0x1161): undefined reference to 
`qInitResources_icons()'
collect2: error: ld returned 1 exit status
make[2]: *** [umbrello/umbrello] Error 1

>      set(CMAKE_INCLUDE_CURRENT_DIR ON)
>      find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest)
> 

-- 
Christoph Feck
KDE Quality Team