From kde-commits  Thu Sep 29 19:28:04 2016
From: Cyrille Berger <cberger () cberger ! net>
Date: Thu, 29 Sep 2016 19:28:04 +0000
To: kde-commits
Subject: [krita/berger-scripting] /: Merge branch 'master' into berger-scripting
Message-Id: <E1bph00-0006X0-GQ () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=147517729310284

Git commit de6cedcb6fded58c97579f81402f68ae9d75a0b7 by Cyrille Berger.
Committed on 29/09/2016 at 18:00.
Pushed by berger into branch 'berger-scripting'.

Merge branch 'master' into berger-scripting

M  +20   -10   3rdparty/README.md
M  +8    -3    krita/krita.xmlgui
M  +21   -3    libs/ui/CMakeLists.txt
M  +35   -96   libs/ui/KisMainWindow.cpp
M  +1    -0    libs/ui/KisViewManager.cpp
M  +5    -0    libs/ui/KisViewManager.h
M  +1    -0    plugins/extensions/CMakeLists.txt
M  +1    -1    plugins/extensions/gmic/CMakeLists.txt

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

diff --cc 3rdparty/README.md
index eda5beb,f59a6b6..c2ac369
--- a/3rdparty/README.md
+++ b/3rdparty/README.md
@@@ -78,9 -74,9 +76,11 @@@ Note: on all operating systems the enti
  =

  Note that the cmake command needs to point to your BUILDROOT like /dev/d,=
 not c:\dev\d.
  =

 +    set PATH=3D%BUILDROOT%\i\bin\;%BUILDROOT%\i\lib;%PATH%
 +    set PYTHONHOME=3D%BUILDROOT%/i (only if you want to build your own py=
thon)
-     cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=3D%BUILDROOT%/d -DIN=
STALL_ROOT=3D%BUILDROOT%/i -G "MinGW Makefiles"
+     set PATH=3DBUILDROOT\i\bin\;BUILDROOT\i\lib;%PATH%
+     cmake ..\krita\3rdparty -DEXTERNALS_DOWNLOAD_DIR=3D/dev/d -DINSTALL_R=
OOT=3D/dev/i  -G "MinGW Makefiles"
+ =

  3. build the packages:
  =

  With a judicious application of DEPENDS statements, it's possible to buil=
d it all in one go, but in my experience that fails always, so it's better =
to build the dependencies independently.