Changeset 407

Timestamp:

Dec 10, 2009, 12:57:16 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Create application instance so that QLibraryInfo will pick up a qt.conf file if there is any in the qmake executable's directory.

File:

• trunk/qmake/main.cpp (modified) (2 diffs)

trunk/qmake/main.cpp

@@ -56 +56 @@
 #include <sys/stat.h>
 
+#ifndef QT_BUILD_QMAKE
+#include <qcoreapplication.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
@@ -85 +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
+
     // parse command line
     int ret = Option::init(argc, argv);