diff options
Diffstat (limited to 'tools/configure/main.cpp')
-rw-r--r-- | tools/configure/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index d91e124..0e13c7a 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the tools applications of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -92,15 +92,15 @@ int runConfigure( int argc, char** argv ) app.generateHeaders(); if( !app.isDone() ) app.buildQmake(); - if( !app.isOk() ) - return 2; #endif if( !app.isDone() ) app.generateMakefiles(); - if( app.isOk() ) + if( !app.isDone() && app.isOk() ) app.buildHostTools(); if( !app.isDone() ) app.showSummary(); + if( !app.isOk() ) + return 2; return 0; } |