Changeset 36763 in webkit

Timestamp:

Sep 22, 2008 6:27:51 AM (16 years ago)

Author:

vestbo@webkit.org

Message:

2008-09-22 Tor Arne Vestbø <​tavestbo@trolltech.com>

Reviewed by Simon.

Initialize QCoreApplication in kjs binary/Shell.cpp

This allows us to use QCoreApplication::instance() to
get the main thread in ThreadingQt.cpp

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/Shell.cpp (modified) (2 diffs)
• wtf/ThreadingQt.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-09-22  Tor Arne Vestbø  <tavestbo@trolltech.com>
+
+        Reviewed by Simon.
+
+        Initialize QCoreApplication in kjs binary/Shell.cpp
+        
+        This allows us to use QCoreApplication::instance() to
+        get the main thread in ThreadingQt.cpp
+
+        * kjs/Shell.cpp:
+        (main):
+        * wtf/ThreadingQt.cpp:
+        (WTF::initializeThreading):
+
 2008-09-21  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/kjs/Shell.cpp

@@ -70 +70 @@
 
 #if PLATFORM(QT)
+#include <QCoreApplication>
 #include <QDateTime>
 #endif
@@ -300 +301 @@
     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
+#endif
+
+#if PLATFORM(QT)
+    QCoreApplication app(argc, argv);
 #endif
 

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -34 +34 @@
 #include "MathExtras.h"
 
-#if PLATFORM(DARWIN)
 #include <QCoreApplication>
-#endif
 #include <QMutex>
 #include <QThread>
@@ -129 +127 @@
         threadMapMutex();
         wtf_random_init();
-#if PLATFORM(DARWIN)
         QThread* mainThread = QCoreApplication::instance()->thread();
         mainThreadIdentifier = establishIdentifierForThread(mainThread);
-#else
-        mainThreadIdentifier = currentThread();
-#endif
         initializeMainThread();
     }