Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch

1 files changed, 7 insertions, 8 deletions

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index a23b2dd..e4bd664 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -377,12 +377,12 @@ QString qAppName()
     QLibrary) can be retrieved with libraryPaths() and manipulated by
     setLibraryPaths(), addLibraryPath(), and removeLibraryPath().
 
-	On Unix/Linux Qt is configured to use the system local settings by 
-	default. This can cause a conflict when using POSIX functions, for 
-	instance, when converting between data types such as floats and 
-	strings, since the notation may differ between locales. To get 
-	around this problem call the POSIX function setlocale(LC_NUMERIC,"C") 
-	right after initializing QApplication or QCoreApplication to reset 
+	On Unix/Linux Qt is configured to use the system local settings by
+	default. This can cause a conflict when using POSIX functions, for
+	instance, when converting between data types such as floats and
+	strings, since the notation may differ between locales. To get
+	around this problem call the POSIX function setlocale(LC_NUMERIC,"C")
+	right after initializing QApplication or QCoreApplication to reset
 	the locale that is used for number formatting to "C"-locale.
 
     \sa QApplication, QAbstractEventDispatcher, QEventLoop,
@@ -1908,8 +1908,7 @@ QStringList QCoreApplication::arguments()
                 l1arg == "-qdebug" ||
                 l1arg == "-reverse" ||
                 l1arg == "-stylesheet" ||
-                l1arg == "-widgetcount" ||
-                l1arg == "-direct3d")
+                l1arg == "-widgetcount")
                 ;
             else if (l1arg.startsWith("-style="))
                 ;