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

[Chris Colbert]

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):

        cl -c -nologo -Zm200 -Zc:wchar_t -Zi -MDd -GR -W3 -w34100 -w34189
-DUNIC
ODE -DWIN32 -DWIN64 -DQT_NO_URL_CAST_FROM_STRING
-DQT_NO_INTEGER_EVENT_COORDINAT
ES -D_CRT_SECURE_NO_WARNINGS -DQT_BUILD_QUICK_LIB -DQT_BUILDING_QT
-DQT_NO_CAST_
TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_USE_QSTRINGBUILDER
-DQT_D
EPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x040800
-D_USE_MATH_DEFINES -
DQT_NO_EXCEPTIONS -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_
NETWORK_LIB -DQT_CORE_LIB -DQT_OPENGL_ES_2 -DQT_OPENGL_ES_2_ANGLE
-I"C:\Users\Ch
ris\Development\Qt5\qtbase\include"
-I"C:\Users\Chris\Development\Qt5\qtbase\inc
lude\QtQuick"
-I"C:\Users\Chris\Development\Qt5\qtbase\include\QtQuick\5.2.0" -I
"C:\Users\Chris\Development\Qt5\qtbase\include\QtQuick\5.2.0\QtQuick"
-I"tmp" -I
"." -I"C:\Users\Chris\Development\Qt5\qtbase\include\QtQml\5.2.0"
-I"C:\Users\Ch
ris\Development\Qt5\qtbase\include\QtQml\5.2.0\QtQml"
-I"C:\Users\Chris\Developm
ent\Qt5\qtbase\include\QtQml"
-I"C:\Users\Chris\Development\Qt5\qtbase\include\Q
tGui\5.2.1"
-I"C:\Users\Chris\Development\Qt5\qtbase\include\QtGui\5.2.1\QtGui"
-I"C:\Users\Chris\Development\Qt5\qtbase\include\QtNetwork"
-I"C:\Users\Chris\De
velopment\Qt5\qtbase\include\QtGui"
-I"C:\Users\Chris\Development\Qt5\qtbase\inc
lude\QtANGLE"
-I"C:\Users\Chris\Development\Qt5\qtbase\include\QtCore\5.2.1" -I"
C:\Users\Chris\Development\Qt5\qtbase\include\QtCore\5.2.1\QtCore"
-I"C:\Users\C
hris\Development\Qt5\qtbase\include\QtCore" -I".moc\debug"
-I"C:\Users\Chris\Dev
elopment\Qt5\qtbase\mkspecs\win32-msvc2012" -Fo.obj\debug\
@C:\Users\Chris\AppDa
ta\Local\Temp\nm49C7.tmp
qquickwindow.cpp
qquicktextnode.cpp
items\qquicktextnode.cpp(148) : error C2039: 'smoothScalable' : is not a
member
of 'QFontEngine'

c:\users\chris\development\qt5\qtbase\include\qtgui\5.2.1\qtgui\private\
../../../../../src/gui/text/qfontengine_p.h(90) : see declaration of
'QFontEngin
e'
qquickflipable.cpp
qquickstateoperations.cpp
qquickwindowmodule.cpp
qquickframebufferobject.cpp
qquickshadereffectsource.cpp
Generating Code...
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio
11.0
\VC\BIN\x86_amd64\cl.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Microsoft Visual Studio
11.0
\VC\BIN\nmake.EXE"' : return code '0x2'
Stop.
NMAKE : fatal error U1077: 'cd' : return code '0x2'
Stop.
NMAKE : fatal error U1077: 'cd' : return code '0x2'
Stop.
NMAKE : fatal error U1077: 'cd' : return code '0x2'
Stop.


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/982da20cf2b58dd6f42e70d406c37219ea204a78

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?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20131201/e33d1d99/attachment.html>