Changeset 769 for trunk/src/corelib/kernel/qcoreapplication.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/kernel/qcoreapplication.cpp (modified) (3 diffs)

trunk/src/corelib/kernel/qcoreapplication.cpp

@@ -68 +68 @@
 #  include <exception>
 #  include <f32file.h>
+
 #  include "qeventdispatcher_symbian_p.h"
 #  include "private/qcore_symbian_p.h"
@@ -597 +598 @@
     extern void qt_core_eval_init(uint);
     qt_core_eval_init(d->application_type);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif
 
@@ -2250 +2272 @@
             TInt err = finder.FindByDir(tempPathPtr, tempPathPtr);
             while (err == KErrNone) {
-                QString foundDir = QString::fromUtf16(finder.File().Ptr(), finder.File().Length());
+                QString foundDir(reinterpret_cast<const QChar *>(finder.File().Ptr()),
+                                 finder.File().Length());
                 foundDir = QDir(foundDir).canonicalPath();
                 if (!app_libpaths->contains(foundDir))