[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/rempt-osx-port] /: Merge branch 'master' into rempt-osx-port
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2016-01-26 18:55:49
Message-ID: E1aO8mL-0005oK-O9 () scm ! kde ! org
[Download RAW message or body]

Git commit ee42f799c6fa945840813538fbd68c696e1604fb by Boudewijn Rempt.
Committed on 26/01/2016 at 18:55.
Pushed by rempt into branch 'rempt-osx-port'.

Merge branch 'master' into rempt-osx-port

M  +51   -0    CMakeLists.txt
M  +6    -74   krita/CMakeLists.txt
M  +0    -0    libs/ui/KisApplication.h
M  +0    -0    libs/ui/KisAutoSaveRecoveryDialog.cpp
M  +0    -0    libs/ui/kis_animation_cache_populator.cpp
M  +0    -0    libs/ui/opengl/kis_opengl.cpp
M  +0    -0    libs/ui/opengl/kis_opengl_canvas2.cpp
M  +0    -0    libs/ui/opengl/kis_opengl_canvas2.h
M  +0    -0    libs/ui/opengl/kis_opengl_canvas2_p.h
M  +0    -0    libs/ui/widgets/kis_scratch_pad_event_filter.cpp
M  +0    -0    plugins/impex/exr/exr_converter.cc

http://commits.kde.org/krita/ee42f799c6fa945840813538fbd68c696e1604fb

diff --cc krita/CMakeLists.txt
index b205ed0,3f15686..0c287a5
--- a/krita/CMakeLists.txt
+++ b/krita/CMakeLists.txt
@@@ -93,30 -29,13 +29,26 @@@ add_subdirectory( data =

  add_subdirectory( integration )
  add_subdirectory( pics/app )
  =

- if (NOT WIN32)
-     add_subdirectory( benchmarks )
- endif ()
- =

  set(krita_SRCS main.cc)
  =

 +set(ICON_SRCS
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/16-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/32-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/48-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/128-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/256-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/512-apps-calligrakrita.png"
 +     "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/1024-apps-calligrakrita.png"
 +)
  if (NOT APPLE)
 -    file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/*-apps-cal=
ligrakrita.png")
 -    ecm_add_app_icon(krita_SRCS ICONS ${ICONS_SRCS})
 +    set(ICON_SRCS ${ICON_SRCS}
 +        "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/22-apps-calligrakrita.png"
 +        "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/64-apps-calligrakrita.png"
 +    )
  endif()
  =

 +ecm_add_app_icon(krita_SRCS ICONS ${ICON_SRCS})
 +
  # separate listing, both used by Krita and KritaSketch
  set(krita_QRCS
      ${CMAKE_SOURCE_DIR}/krita/krita.qrc
[prev in list] [next in list] [prev in thread] [next in thread]