Commit 6274386a authored by Sharaf Zaman's avatar Sharaf Zaman

Merge branch 'master' of invent.kde.org:kde/krita into sh-zam/android-improvements

parents e7f29e1d 225e4593
......@@ -154,8 +154,8 @@ if (MINGW)
if (ENABLE_PYTHON_2)
message(FATAL_ERROR "Python 2.7 is not supported on Windows at the moment.")
else(ENABLE_PYTHON_2)
find_package(PythonInterp 3.6 EXACT)
find_package(PythonLibs 3.6 EXACT)
find_package(PythonInterp 3.8 EXACT)
find_package(PythonLibs 3.8 EXACT)
endif()
if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
message(STATUS "Python requirements met.")
......
......@@ -154,6 +154,8 @@ Note: on all operating systems the entire procedure is done in a terminal window
cmake --build . --config RelWithDebInfo --target ext_libraw
cmake --build . --config RelWithDebInfo --target ext_giflib
cmake --build . --config RelWithDebInfo --target ext_openjpeg
cmake --build . --config RelWithDebInfo --target ext_quazip
```
On Linux (if you want to build your own SIP and PyQt instead of the system one)
```
......
......@@ -2,8 +2,8 @@ SET(EXTPREFIX_eigen3 "${EXTPREFIX}" )
ExternalProject_Add( ext_eigen3
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
# eigen 3.3.4: bitbucket does weird things when downloading.
URL http://files.kde.org/krita/build/dependencies/eigen-eigen-5a0156e40feb.tar.gz
URL_MD5 1a47e78efe365a97de0c022d127607c3
URL http://files.kde.org/krita/build/dependencies/eigen-3.3.7.tar.bz2
URL_MD5 05b1f7511c93980c385ebe11bd3c93fa
INSTALL_DIR ${EXTPREFIX_eigen3}
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/dart.diff
......
diff --git a/cmake/EigenConfigureTesting.cmake b/cmake/EigenConfigureTesting.cmake
index 2b11d83..8cf56ff 100644
index 3a82439..4c28246 100644
--- a/cmake/EigenConfigureTesting.cmake
+++ b/cmake/EigenConfigureTesting.cmake
@@ -26,19 +26,6 @@ include(CTest)
set(EIGEN_TEST_BUILD_FLAGS " " CACHE STRING "Options passed to the build command of unit tests")
@@ -21,19 +21,6 @@ set(EIGEN_TEST_BUILD_FLAGS "" CACHE STRING "Options passed to the build command
set(EIGEN_DASHBOARD_BUILD_TARGET "buildtests" CACHE STRING "Target to be built in dashboard mode, default is buildtests")
set(EIGEN_CTEST_ERROR_EXCEPTION "" CACHE STRING "Regular expression for build error messages to be filtered out")
-# Overwrite default DartConfiguration.tcl such that ctest can build our unit tests.
-# Recall that our unit tests are not in the "all" target, so we have to explicitely ask ctest to build our custom 'buildtests' target.
......@@ -15,7 +15,7 @@ index 2b11d83..8cf56ff 100644
-if(NOT CMAKE_MATCH_1)
-string(REGEX MATCH "MakeCommand:.*[^c]make (.*)\nDefaultCTestConfigurationType" EIGEN_DUMMY ${EIGEN_DART_CONFIG_FILE})
-endif()
-string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target buildtests --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType"
-string(REGEX REPLACE "MakeCommand:.*DefaultCTestConfigurationType" "MakeCommand: ${CMAKE_COMMAND} --build . --target ${EIGEN_DASHBOARD_BUILD_TARGET} --config \"\${CTEST_CONFIGURATION_TYPE}\" -- ${CMAKE_MATCH_1} ${EIGEN_TEST_BUILD_FLAGS}\nDefaultCTestConfigurationType"
- EIGEN_DART_CONFIG_FILE2 ${EIGEN_DART_CONFIG_FILE})
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/DartConfiguration.tcl" ${EIGEN_DART_CONFIG_FILE2})
-
......
commit 09b46c2a9acb0b7cb52968599499cb19fa5d8904
Author: Boudewijn Rempt <boud@valdyas.org>
Date: Fri Jan 5 16:09:39 2018 +0100
Disable tests: they need blas
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f584002..dcb461b 100644
index 2bfb6d5..81bffbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -418,24 +418,6 @@ add_subdirectory(doc EXCLUDE_FROM_ALL)
@@ -435,7 +435,7 @@ add_subdirectory(Eigen)
include(EigenConfigureTesting)
add_subdirectory(doc EXCLUDE_FROM_ALL)
-option(BUILD_TESTING "Enable creation of Eigen tests." ON)
+option(BUILD_TESTING "Enable creation of Eigen tests." OFF)
if(BUILD_TESTING)
include(EigenConfigureTesting)
-# fixme, not sure this line is still needed:
-enable_testing() # must be called from the root CMakeLists, see man page
-
-
-if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
- add_subdirectory(test) # can't do EXCLUDE_FROM_ALL here, breaks CTest
-else()
- add_subdirectory(test EXCLUDE_FROM_ALL)
-endif()
-
-if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
- add_subdirectory(blas)
- add_subdirectory(lapack)
-else()
- add_subdirectory(blas EXCLUDE_FROM_ALL)
- add_subdirectory(lapack EXCLUDE_FROM_ALL)
-endif()
-
# add SYCL
option(EIGEN_TEST_SYCL "Add Sycl support." OFF)
if(EIGEN_TEST_SYCL)
......@@ -30,7 +30,7 @@ elseif(MINGW)
list(APPEND _PYQT_conf
--confirm-license
--target-py-version 3.6
--target-py-version 3.8
--bindir ${PREFIX_ext_pyqt}/bin
--qt ${PREFIX_ext_pyqt}
--sip ${PREFIX_ext_pyqt}/bin/sip.exe
......
SET(PREFIX_ext_python "${EXTPREFIX}" )
if (UNIX)
if (APPLE)
set(PYTHON_VERSION "3.5")
set(PYTHON_VERSION "3.8")
ExternalProject_Add( ext_python
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/Python-3.5.2.tar.gz
URL_MD5 ea334d398990037a4b8be324bd475c83
URL https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz
URL_MD5 b3fb85fd479c0bf950c626ef80cacb57
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/pyport_osx.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/osx_fixappinstall.diff
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/osx_fixappinstall.diff
CONFIGURE_COMMAND <SOURCE_DIR>/configure MACOSX_DEPLOYMENT_TARGET=10.11 -prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE}
--with-cxx-main=/usr/bin/g++ --without-ensurepip --disable-tests --without-test --without-tests --enable-framework=${PREFIX_ext_python}/lib
CONFIGURE_COMMAND <SOURCE_DIR>/configure MACOSX_DEPLOYMENT_TARGET=10.13 --prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE}
--without-ensurepip --enable-framework=${PREFIX_ext_python}/lib --enable-optimizations
BUILD_COMMAND make
INSTALL_COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_python}/bin/python3 ${PREFIX_ext_python}/bin/python
......@@ -29,10 +28,10 @@ if (UNIX)
ExternalProject_Add( ext_python
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/Python-3.5.2.tar.gz
URL_MD5 ea334d398990037a4b8be324bd475c83
URL https://www.python.org/ftp/python/3.8.1/Python-3.8.1.tar.xz
URL_MD5 b3fb85fd479c0bf950c626ef80cacb57
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE} --enable-shared
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${PREFIX_ext_python} ${GLOBAL_AUTOMAKE_PROFILE} --enable-shared
BUILD_COMMAND make
INSTALL_COMMAND make install
COMMAND ${CMAKE_COMMAND} -E copy ${PREFIX_ext_python}/bin/python3 ${PREFIX_ext_python}/bin/python
......@@ -45,30 +44,30 @@ elseif(MINGW)
if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add( ext_python
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://www.python.org/ftp/python/3.6.2/python-3.6.2-embed-amd64.zip
URL_MD5 0fdfe9f79e0991815d6fc1712871c17f
URL https://www.python.org/ftp/python/3.8.0/python-3.8.0-embed-amd64.zip
URL_MD5 99cca948512b53fb165084787143ef19
INSTALL_DIR ${PREFIX_ext_python}
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying python3 64-bit binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ ${PREFIX_ext_python}/python
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python3.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python36.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python38.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/vcruntime140.dll ${PREFIX_ext_python}/bin
UPDATE_COMMAND ""
)
else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
ExternalProject_Add( ext_python
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL https://www.python.org/ftp/python/3.6.2/python-3.6.2-embed-win32.zip
URL_MD5 2ca4768fdbadf6e670e97857bfab83e8
URL https://www.python.org/ftp/python/3.8.0/python-3.8.0-embed-win32.zip
URL_MD5 2ec3abf05f3f1046e0dbd1ca5c74ce88
INSTALL_DIR ${PREFIX_ext_python}
CONFIGURE_COMMAND ""
BUILD_COMMAND ${CMAKE_COMMAND} -E echo deploying python3 32-bit binary
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/ ${PREFIX_ext_python}/python
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python3.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python36.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/python38.dll ${PREFIX_ext_python}/bin
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/vcruntime140.dll ${PREFIX_ext_python}/bin
UPDATE_COMMAND ""
)
......
diff --git a/configure b/configure
old mode 100755
new mode 100644
index c892a99..97c8f0d
index 2a933cd..4dfb4fb 100755
--- a/configure
+++ b/configure
@@ -3207,7 +3207,7 @@ if test "${enable_framework+set}" = set; then :
@@ -3149,7 +3149,7 @@ if test "${enable_framework+set}" = set; then :
FRAMEWORKINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools"
FRAMEWORKALTINSTALLLAST="frameworkinstallmaclib frameworkinstallapps frameworkaltinstallunixtools"
FRAMEWORKPYTHONW="frameworkpythonw"
......@@ -13,7 +11,7 @@ index c892a99..97c8f0d
if test "x${prefix}" = "xNONE" ; then
FRAMEWORKUNIXTOOLSPREFIX="${ac_default_prefix}"
@@ -3218,7 +3218,7 @@ if test "${enable_framework+set}" = set; then :
@@ -3160,7 +3160,7 @@ if test "${enable_framework+set}" = set; then :
case "${enableval}" in
/System*)
......@@ -22,7 +20,7 @@ index c892a99..97c8f0d
if test "${prefix}" = "NONE" ; then
# See below
FRAMEWORKUNIXTOOLSPREFIX="/usr"
@@ -3226,13 +3226,13 @@ if test "${enable_framework+set}" = set; then :
@@ -3168,13 +3168,13 @@ if test "${enable_framework+set}" = set; then :
;;
/Library*)
......@@ -38,7 +36,7 @@ index c892a99..97c8f0d
if test "${prefix}" = "NONE"; then
# User hasn't specified the
@@ -3246,7 +3246,7 @@ if test "${enable_framework+set}" = set; then :
@@ -3188,7 +3188,7 @@ if test "${enable_framework+set}" = set; then :
;;
*)
......@@ -46,4 +44,4 @@ index c892a99..97c8f0d
+ FRAMEWORKINSTALLAPPSPREFIX="${prefix}/Applications"
;;
esac
\ No newline at end of file
......@@ -118,6 +118,7 @@ elseif (ANDROID)
PATCH_COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/show-proper-error.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/workaround-null-eglconfig-crash.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/fix-android-menu64bit.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/android-add-pen-tilt-rot.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0081-non-native-file-dialog-overwrite-warnings-based-on-filter.patch
COMMAND ${PATCH_COMMAND} -p1 -d qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/0082-jpeg-extensions-handling-in-non-native-file-dialogs.patch
......
From 35ae5101395b96c5505cdaa76f9f2ce9da089cfe Mon Sep 17 00:00:00 2001
From: Max Thomas <mtinc2@gmail.com>
Date: Wed, 08 Jan 2020 10:34:10 -0700
Subject: [PATCH] Add support for pen tilt/rotation for Android
Change-Id: I195c891b47841ac86048dc38ea95beaeced8b70a
---
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
index dee5628..0862383 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
@@ -515,8 +515,13 @@
if (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE) {
sendMouseEvent(event, id);
} else if (m_tabletEventSupported && pointerType != 0) {
+ float tiltRot = event.getAxisValue(MotionEvent.AXIS_TILT);
+ float orientation = event.getAxisValue(MotionEvent.AXIS_ORIENTATION);
+ float tiltX = (float) Math.toDegrees(-Math.sin(orientation) * tiltRot);
+ float tiltY = (float) Math.toDegrees(Math.cos(orientation) * tiltRot);
tabletEvent(id, event.getDeviceId(), event.getEventTime(), event.getAction(), pointerType,
- event.getButtonState(), event.getX(), event.getY(), event.getPressure());
+ event.getButtonState(), event.getX(), event.getY(), event.getPressure(), tiltX, tiltY,
+ (float) Math.toDegrees(orientation));
} else {
touchBegin(id);
for (int i = 0; i < event.getPointerCount(); ++i) {
@@ -1069,7 +1074,7 @@
// tablet methods
public static native boolean isTabletEventSupported();
- public static native void tabletEvent(int winId, int deviceId, long time, int action, int pointerType, int buttonState, float x, float y, float pressure);
+ public static native void tabletEvent(int winId, int deviceId, long time, int action, int pointerType, int buttonState, float x, float y, float pressure, float tiltX, float tiltY, float rotation);
// tablet methods
// keyboard methods
diff --git a/src/plugins/platforms/android/androidjniinput.cpp b/src/plugins/platforms/android/androidjniinput.cpp
index 049f9b0..9768e52 100644
--- a/src/plugins/platforms/android/androidjniinput.cpp
+++ b/src/plugins/platforms/android/androidjniinput.cpp
@@ -304,7 +304,7 @@
}
static void tabletEvent(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint deviceId, jlong time, jint action,
- jint pointerType, jint buttonState, jfloat x, jfloat y, jfloat pressure)
+ jint pointerType, jint buttonState, jfloat x, jfloat y, jfloat pressure, jfloat tiltX, jfloat tiltY, jfloat rotation)
{
#if QT_CONFIG(tabletevent)
QPointF globalPosF(x, y);
@@ -347,7 +347,7 @@
QWindowSystemInterface::handleTabletEvent(tlw, ulong(time),
localPos, globalPosF, QTabletEvent::Stylus, pointerType,
- buttons, pressure, 0, 0, 0., 0., 0, deviceId, Qt::NoModifier);
+ buttons, pressure, tiltX, tiltY, 0., rotation, 0, deviceId, Qt::NoModifier);
#endif // QT_CONFIG(tabletevent)
}
@@ -852,7 +852,7 @@
{"mouseWheel", "(IIIFF)V", (void *)mouseWheel},
{"longPress", "(III)V", (void *)longPress},
{"isTabletEventSupported", "()Z", (void *)isTabletEventSupported},
- {"tabletEvent", "(IIJIIIFFF)V", (void *)tabletEvent},
+ {"tabletEvent", "(IIJIIIFFFFFF)V", (void *)tabletEvent},
{"keyDown", "(IIIZ)V", (void *)keyDown},
{"keyUp", "(IIIZ)V", (void *)keyUp},
{"keyboardVisibilityChanged", "(Z)V", (void *)keyboardVisibilityChanged},
......@@ -12,7 +12,7 @@ if (UNIX)
URL https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz
URL_MD5 236578d2199da630ae1251671b9a7bfe
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py -b ${PREFIX_ext_sip}/bin -d ${PREFIX_ext_sip}/lib/python3.5/site-packages -e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/sip --target-py-version 3.5 --sip-module PyQt5.sip
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE_PATH} <SOURCE_DIR>/configure.py -b ${PREFIX_ext_sip}/bin -d ${PREFIX_ext_sip}/lib/python3.5/site-packages -e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/sip --target-py-version 3.8 --sip-module PyQt5.sip
BUILD_COMMAND make
INSTALL_COMMAND make install
......@@ -37,7 +37,7 @@ if (UNIX)
CMAKE_ARGS -DPYTHON_INCLUDE_DIR=${PREFIX_ext_sip}/lib/Python.framework/Headers
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} <SOURCE_DIR>/configure.py --deployment-target=10.11
-b ${PREFIX_ext_sip}/bin -d ${PREFIX_ext_sip}/lib/Python.framework/Versions/Current/site-packages/
-e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/share/sip --target-py-version 3.5 --sip-module PyQt5.sip
-e ${PREFIX_ext_sip}/include --sipdir ${PREFIX_ext_sip}/share/sip --target-py-version 3.8 --sip-module PyQt5.sip
BUILD_COMMAND make
INSTALL_COMMAND make install
# COMMAND ${CMAKE_COMMAND} -E create_symlink ./PyQt5/sip.so ${PREFIX_ext_sip}/lib/Python.framework/Versions/Current/site-packages/sip.so
......@@ -55,7 +55,7 @@ elseif (MINGW)
-d ${PREFIX_ext_sip}/lib/krita-python-libs
-e ${PREFIX_ext_sip}/include
--sipdir ${PREFIX_ext_sip}/share/sip
--target-py-version 3.6
--target-py-version 3.8
--sip-module PyQt5.sip
)
ExternalProject_Add( ext_sip
......
......@@ -90,7 +90,6 @@ set(KRITA_VERSION_REVISION 0)
set(KRITA_ALPHA 1) # uncomment only for Alpha
#set(KRITA_BETA 1) # uncomment only for Beta
#set(KRITA_RC 1) # uncomment only for RC
set(KRITA_YEAR 2018) # update every year
if(NOT DEFINED KRITA_ALPHA AND NOT DEFINED KRITA_BETA AND NOT DEFINED KRITA_RC)
set(KRITA_STABLE 1) # do not edit
......@@ -220,14 +219,14 @@ if(MINGW)
if(ENABLE_PYTHON_2)
message(FATAL_ERROR "Python 2.7 is not supported on Windows at the moment.")
else(ENABLE_PYTHON_2)
find_package(PythonInterp 3.6 EXACT)
find_package(PythonLibs 3.6 EXACT)
find_package(PythonInterp 3.8 EXACT)
find_package(PythonLibs 3.8 EXACT)
endif(ENABLE_PYTHON_2)
if (PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND)
if(ENABLE_PYTHON_2)
find_package(PythonLibrary 2.7)
else(ENABLE_PYTHON_2)
find_package(PythonLibrary 3.6)
find_package(PythonLibrary 3.8)
endif(ENABLE_PYTHON_2)
TestCompileLinkPythonLibs(CAN_USE_PYTHON_LIBS)
if (NOT CAN_USE_PYTHON_LIBS)
......@@ -251,7 +250,7 @@ endif(MINGW)
########################
find_package(ECM 5.22 REQUIRED NOMODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
include(ECMOptionalAddSubdirectory)
include(ECMAddAppIcon)
include(ECMSetupVersion)
......@@ -381,7 +380,7 @@ macro_ensure_out_of_source_build("Compiling Krita inside the source directory is
find_package(Qt5Multimedia ${MIN_QT_VERSION})
set_package_properties(Qt5Multimedia PROPERTIES
DESCRIPTION "Qt multimedia integration"
URL "http://www.qt.io/"
URL "https://www.qt.io/"
TYPE OPTIONAL
PURPOSE "Optionally used to provide sound support for animations")
......@@ -392,7 +391,7 @@ if (NOT APPLE)
find_package(Qt5Quick ${MIN_QT_VERSION})
set_package_properties(Qt5Quick PROPERTIES
DESCRIPTION "QtQuick"
URL "http://www.qt.io/"
URL "https://www.qt.io/"
TYPE OPTIONAL
PURPOSE "Optionally used for the touch gui for Krita")
......@@ -401,7 +400,7 @@ macro_bool_to_01(Qt5Quick_FOUND HAVE_QT_QUICK)
find_package(Qt5QuickWidgets ${MIN_QT_VERSION})
set_package_properties(Qt5QuickWidgets PROPERTIES
DESCRIPTION "QtQuickWidgets"
URL "http://www.qt.io/"
URL "https://www.qt.io/"
TYPE OPTIONAL
PURPOSE "Optionally used for the touch gui for Krita")
endif()
......@@ -414,7 +413,7 @@ if (NOT WIN32 AND NOT APPLE AND NOT ANDROID)
set(HAVE_DBUS ${Qt5DBus_FOUND})
set_package_properties(Qt5DBus PROPERTIES
DESCRIPTION "Qt DBUS integration"
URL "http://www.qt.io/"
URL "https://www.qt.io/"
TYPE OPTIONAL
PURPOSE "Optionally used to provide a dbus api on Linux")
......@@ -422,7 +421,7 @@ if (NOT WIN32 AND NOT APPLE AND NOT ANDROID)
macro_bool_to_01(KF5Crash_FOUND HAVE_KCRASH)
set_package_properties(KF5Crash PROPERTIES
DESCRIPTION "KDE's Crash Handler"
URL "http://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/index.html"
URL "https://api.kde.org/frameworks-api/frameworks5-apidocs/kcrash/html/index.html"
TYPE OPTIONAL
PURPOSE "Optionally used to provide crash reporting on Linux")
......@@ -559,7 +558,7 @@ find_package(PNG REQUIRED)
list (APPEND ANDROID_EXTRA_LIBS ${PNG_LIBRARY})
if (APPLE)
# this is not added correctly on OSX -- see http://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242
# this is not added correctly on OSX -- see https://forum.kde.org/viewtopic.php?f=139&t=101867&p=221242#p221242
include_directories(SYSTEM ${PNG_INCLUDE_DIR})
endif()
......@@ -571,7 +570,7 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
##
find_package(GSL)
set_package_properties(GSL PROPERTIES
URL "http://www.gnu.org/software/gsl"
URL "https://www.gnu.org/software/gsl"
TYPE RECOMMENDED
PURPOSE "Required by Krita's Transform tool.")
macro_bool_to_01(GSL_FOUND HAVE_GSL)
......@@ -589,7 +588,7 @@ endif()
find_package(ZLIB)
set_package_properties(ZLIB PROPERTIES
DESCRIPTION "Compression library"
URL "http://www.zlib.net/"
URL "https://www.zlib.net/"
TYPE OPTIONAL
PURPOSE "Optionally used by the G'Mic and the PSD plugins")
macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
......@@ -597,7 +596,7 @@ macro_bool_to_01(ZLIB_FOUND HAVE_ZLIB)
find_package(OpenEXR)
set_package_properties(OpenEXR PROPERTIES
DESCRIPTION "High dynamic-range (HDR) image file format"
URL "http://www.openexr.com"
URL "https://www.openexr.com"
TYPE OPTIONAL
PURPOSE "Required by the Krita OpenEXR filter")
macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
......@@ -611,7 +610,7 @@ endif()
find_package(TIFF)
set_package_properties(TIFF PROPERTIES
DESCRIPTION "TIFF Library and Utilities"
URL "http://www.remotesensing.org/libtiff"
URL "http://www.libtiff.org"
TYPE OPTIONAL
PURPOSE "Required by the Krita TIFF filter")
if (TIFF_FOUND)
......@@ -621,7 +620,7 @@ endif()
find_package(JPEG)
set_package_properties(JPEG PROPERTIES
DESCRIPTION "Free library for JPEG image compression. Note: libjpeg8 is NOT supported."