diff options
| author | Treeve Jelbert | 2021-10-01 17:45:29 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2021-10-01 17:46:21 +0200 |
| commit | 3b77012865044a9e1544d248bfcc9f448d60ccf0 (patch) | |
| tree | 9acaff58cb0828e25af0c7be8ebc01c9a91ff6b5 /qt5-cmake | |
| parent | 391de0e96f87e4028e46aeade0288469dd0a9791 (diff) | |
qt-creator - add qt6 support
Diffstat (limited to 'qt5-cmake')
| -rwxr-xr-x | qt5-cmake/qt-creator/DEPENDS | 26 | ||||
| -rw-r--r-- | qt5-cmake/qt-creator/HISTORY | 1 |
2 files changed, 19 insertions, 8 deletions
diff --git a/qt5-cmake/qt-creator/DEPENDS b/qt5-cmake/qt-creator/DEPENDS index e7f1cad73a..a82a50300f 100755 --- a/qt5-cmake/qt-creator/DEPENDS +++ b/qt5-cmake/qt-creator/DEPENDS @@ -1,13 +1,23 @@ source $GRIMOIRE/CMAKE_DEPENDS && depends -sub CXX gcc && -depends qtbase && -depends qtx11extras && -depends qtdeclarative && -depends zstd && -optional_depends syntax-highlighting '' '' 'syntax highlighting' && -optional_depends qtsvg '' '' 'SVG support' && -optional_depends qttools '' '' '' && -optional_depends qtwebengine '' '' 'help browser' && +optional_depends qt6base " -DCMAKE_PREFIX_PATH=$QT6DIR" "" 'use Qt6' && +if is_depends_enabled $SPELL qt6base;then + depends qt6declarative && + depends qt5compat && + optional_depends qt6svg '' '' 'SVG support' && + optional_depends qt6tools '' '' '' && + optional_depends qt6webengine '' '' 'help browser' +else + depends qtbase && + depends qtx11extras && + depends qtdeclarative && + optional_depends qtsvg '' '' 'SVG support' && + optional_depends qttools '' '' '' && + optional_depends qtwebengine '' '' 'help browser' && + optional_depends syntax-highlighting '' '' 'syntax highlighting' +fi && +depends python3 && +depends zstd && optional_depends -sub CLANG llvm '' '' 'build Clang Code Model' && #optional_depends qbs '' '' 'use system qbs' optional_depends elfutils '' '' '' && diff --git a/qt5-cmake/qt-creator/HISTORY b/qt5-cmake/qt-creator/HISTORY index 7e7feec0f5..3573241f8f 100644 --- a/qt5-cmake/qt-creator/HISTORY +++ b/qt5-cmake/qt-creator/HISTORY @@ -1,5 +1,6 @@ 2021-10-01 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.0.2 + * DEPENDS: enable build with qt6 2020-12-18 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 4.14.0 (both) |