Changeset 561 for trunk/qmake/main.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• qmake/main.cpp (modified) (6 diffs)

trunk/qmake/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the qmake application of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** 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.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -89 +89 @@
 int runQMake(int argc, char **argv)
 {
-#ifndef QT_BUILD_QMAKE
-    // create application instance so that QLibraryInfo will pick up a qt.conf
-    // file if there is any in the executable's directory
-    QCoreApplication coreApp(argc, argv);
-#endif
+    // stderr is unbuffered by default, but stdout buffering depends on whether
+    // 
+    // 
+    
+    setvbuf(stdout, (char *)NULL, _IONBF, 0);
 
     // parse command line
@@ -102 +102 @@
         return 0;
     }
-
-    // report Qt usage for commercial customers with a "metered license" (currently experimental)
-#if QT_EDITION != QT_EDITION_OPENSOURCE
-    QString reporterPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator()
-                           + "qtusagereporter";
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
-    reporterPath += ".exe";
-#endif
-    if (QFile::exists(reporterPath))
-        system(qPrintable(reporterPath + " qmake"));
-#endif
 
     QString oldpwd = qmake_getpwd();
@@ -184 +173 @@
         }
 
-        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false);
+        bool success = true;
+        MetaMakefileGenerator *mkfile = MetaMakefileGenerator::createMetaGenerator(&project, QString(), false, &success);
+        if (!success)
+            exit_val = 3;
+
         if(mkfile && !mkfile->write(oldpwd)) {
             if(Option::qmake_mode == Option::QMAKE_GENERATE_PROJECT)