call syncqt before building qmake
otherwise non-developer builds (which don't have it run by the configure bootstrap) don't work. Change-Id: Ide49c0d1646b22687d16366530b246c3754926eb Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
parent
cef552a741
commit
0b2d55390c
@ -3383,6 +3383,9 @@ void Configure::displayConfig()
|
||||
#if !defined(EVAL)
|
||||
void Configure::generateHeaders()
|
||||
{
|
||||
if (dictionary["SYNCQT"] == "auto")
|
||||
dictionary["SYNCQT"] = defaultTo("SYNCQT");
|
||||
|
||||
if (dictionary["SYNCQT"] == "yes") {
|
||||
if (findFile("perl.exe")) {
|
||||
cout << "Running syncqt..." << endl;
|
||||
|
@ -70,6 +70,10 @@ int runConfigure( int argc, char** argv )
|
||||
|
||||
app.generateQConfigCpp();
|
||||
|
||||
app.generateHeaders();
|
||||
if (!app.isOk())
|
||||
return 3;
|
||||
|
||||
app.buildQmake();
|
||||
if (!app.isOk())
|
||||
return 3;
|
||||
@ -92,8 +96,6 @@ int runConfigure( int argc, char** argv )
|
||||
app.generateBuildKey();
|
||||
if( !app.isDone() )
|
||||
app.generateConfigfiles();
|
||||
if( !app.isDone() )
|
||||
app.generateHeaders();
|
||||
// must be done after buildQmake()
|
||||
if (!app.isDone())
|
||||
app.detectArch();
|
||||
|
Loading…
x
Reference in New Issue
Block a user