Differential D15596

Make SDK dependencies optional
ClosedPublic
Actions

Authored by vpinon on Sep 18 2018, 9:15 PM.

Details

Reviewers
vonreth
Commits
R877:592af90e1155: Make SDK dependencies optional
Summary
  • KI18n was requesting the obsolete QtScript, while 5.50 has been ported to QtQML
  • KConfig now needs QtTools
  • and QtTools requested LLVM from 5.10 actually to build QDoc: this is wanted only for SDK
Test Plan

builds with QtSDK=False (on Linux)

Diff Detail

Repository
R877 Craft Blueprints for KDE
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
vpinon requested review of this revision.Sep 18 2018, 9:15 PM
vpinon created this revision.
vonreth added inline comments.Sep 18 2018, 9:35 PM
kde/frameworks/tier1/ki18n/ki18n.py
11–12

No need for the sdk check

libs/qt5/qttools/qttools.py
14–16

Sounds good

37

I'm not sure why a sdk check is needed here
Or did you mean the inverse check?

vpinon updated this revision to Diff 41922.Sep 19 2018, 12:23 AM

Remove wrong SDK check in Ki18n

vpinon marked an inline comment as done.Sep 19 2018, 12:28 AM
vpinon added inline comments.
kde/frameworks/tier1/ki18n/ki18n.py
11–12

Sorry you are right, copy/paste & distracted :-|

libs/qt5/qttools/qttools.py
37

I believe that we can skip LLVM use (QDoc generation) if we are not building a SDK release, only libraries for an application bundle. Am I missing something?
If we have skipped LLVM at dependecy stage, running with FORCE_MINGW_QDOC_BUILD would lead to fail?

vonreth added inline comments.Sep 19 2018, 12:46 PM
libs/qt5/qttools/qttools.py
37

SDK mode means that we won't build qt but use the prebuild version.

vpinon updated this revision to Diff 42696.Oct 1 2018, 9:45 PM
vpinon marked an inline comment as done.
  • rebased on master updates ("default" -> None)
  • introduce a qttools option "qdocThroughLLVM" (False by default) to skip LLVM compilation (instead of misunderstood "QtSDK" boolean)
vonreth accepted this revision.Oct 2 2018, 7:30 AM

maybe apply my suggested change and then ship it.
Thx :)

libs/qt5/qttools/qttools.py
41
env = {}
if foo:
    env = {"foo":bar}
ScopedEnv(env)
This revision is now accepted and ready to land.Oct 2 2018, 7:30 AM
vonreth added inline comments.Oct 2 2018, 7:33 AM
libs/qt5/qttools/qttools.py
11

Please set the default to true so that our cache builds are with qtdoc

Closed by commit R877:592af90e1155: Make SDK dependencies optional (authored by vpinon). · Explain WhyOct 2 2018, 10:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 42759

View Options

kde/frameworks/tier1/kconfig/kconfig.py

Loading...
View Options

kde/frameworks/tier1/ki18n/ki18n.py

Loading...
View Options

libs/qt5/qttools/qttools.py

Loading...