diff --git a/desktop/toolkit/qtcreator/actions.py b/desktop/toolkit/qtcreator/actions.py index 54743c0724..0fa4d2ccb1 100644 --- a/desktop/toolkit/qtcreator/actions.py +++ b/desktop/toolkit/qtcreator/actions.py @@ -8,9 +8,15 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import pisitools from pisi.actionsapi import get -WorkDir="qt-creator-opensource-src-%s" % get.srcVERSION() +#WorkDir="qt-creator-opensource-src-%s" % get.srcVERSION() def setup(): - shelltools.system("qmake qtcreator.pro CONFIG+=release QTC_PREFIX=/usr") + pisitools.dosed("qtcreator.pri", "libexec/qtcreator", "lib/qtcreator") + pisitools.dosed("src/tools/tools.pro", "libexec", "lib") + + shelltools.system("qmake LLVM_INSTALL_DIR=/usr QBS_INSTALL_DIR=/usr \ + CONFIG+=release QMAKE_CFLAGS_ISYSTEM=-I \ + DEFINES+=QBS_ENABLE_PROJECT_FILE_UPDATES \ + QTC_PREFIX=/usr qtcreator.pro") def build(): diff --git a/desktop/toolkit/qtcreator/pspec.xml b/desktop/toolkit/qtcreator/pspec.xml index 2ce21db804..1358d2ebd9 100644 --- a/desktop/toolkit/qtcreator/pspec.xml +++ b/desktop/toolkit/qtcreator/pspec.xml @@ -13,7 +13,8 @@ app:gui Lightweight, cross-platform integrated development environment Lightweight, cross-platform integrated development environment - http://download.qt.io/official_releases/qtcreator/4.11/4.11.2/qt-creator-opensource-src-4.11.2.tar.xz + + http://download.qt.io/development_releases/qtcreator/4.12/4.12.0-rc1/qt-creator-opensource-src-4.12.0-rc1.tar.xz libgcc libX11-devel @@ -39,6 +40,9 @@ llvm-clang-devel llvm + + + @@ -81,10 +85,10 @@ 2020-04-06 - 4.11.2 + 4.12.0 Version bump. - Mustafa Cinasal - muscnsl@gmail.com + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org 2020-01-20