1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call syncqt before building qmake

Browse Source 
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:
Oswald Buddenhagen 2012-09-11 15:08:48 +02:00 committed by Qt by Nokia
parent cef552a741
commit 0b2d55390c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/configure/configureapp.cpp
View File

@ -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;

6
tools/configure/main.cpp
View File

@ -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();