[Development] What's the magic incantation for developing effectively from the Qt git repo?

[Olivier Goffart]

On Sunday 01 December 2013 13:53:50 Chris Colbert wrote:
> I recently had a change-set merged which fixed the WA_StaticContents flag
> on Windows. However, when I update my git repo according to the advice on
> the website:
> 
> 
>    1. git pull
>    2. git submodule sync
>    3. git submodule update --recursive
> 
> 
> I get a checkout which does not include my recent changes. If update my
> qtbase to 'stable', I see my changes, but the build fails with the
> following error in qquicktextnode.cpp (this is after a full clean and
> reconfigure):
[...]
> How does build-breaking code make it into stable, and how should one
> continue to submit bug-fixes which depend upon code which was recently
> merged to stable?
> 
> By the same token, is there a way to effectively rebuild my git checkout
> without going through a costly reconfigure step, which appears to have been
> required by this recent change?
> https://qt.gitorious.org/qt/qtbase/commit/982da20cf2b58dd6f42e70d406c37219ea
> 204a78
> 
> Surely the core Qt developers have a way of working in this environment,
> which doesn't cost them several hours and build headaches to submit a
> change. Am I missing something obvious?

Personally, I don't use qt5.git,   but check out the repository that I need.
(I clone separately qtbase, qtxmlpattern, and qtdeclarative)

I think that your problem is that your versions of qtbase and qtdeclarative 
did not match.
All the module needs to be on the same branch.  So if you checkout qtbase 
stable,  you also need to checkout qtdeclarative stable.

Notice that qt5.git is often lagging behind.  (But there are plans to change 
that)

--
Olivier

Woboq - Qt services and support - http://woboq.com