various cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 418954d..4054fb8 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -163,8 +163,6 @@ bool QCoreApplicationPrivate::checkInstance(const char *function)
     return b;
 }
 
-Q_GLOBAL_STATIC(QString, qmljs_debug_arguments);
-
 void QCoreApplicationPrivate::processCommandLineArguments()
 {
     int j = argc ? 1 : 0;
@@ -173,15 +171,7 @@ void QCoreApplicationPrivate::processCommandLineArguments()
             argv[j++] = argv[i];
             continue;
         }
-        QByteArray arg = argv[i];
-        if (arg.startsWith("-qmljsdebugger=")) {
-            *qmljs_debug_arguments() = QString::fromLocal8Bit(arg.right(arg.length() - 15));
-        } else if (arg == "-qmljsdebugger" && i < argc - 1) {
-            ++i;
-            *qmljs_debug_arguments() = QString::fromLocal8Bit(argv[i]);
-        } else {
-            argv[j++] = argv[i];
-        }
+        argv[j++] = argv[i];
     }
 
     if (j < argc) {
@@ -462,11 +452,6 @@ void QCoreApplicationPrivate::appendApplicationPathToLibraryPaths()
 #endif
 }
 
-QString QCoreApplicationPrivate::qmljsDebugArguments()
-{
-    return *qmljs_debug_arguments();
-}
-
 QString qAppName()
 {
     if (!QCoreApplicationPrivate::checkInstance("qAppName"))
@@ -2025,11 +2010,9 @@ QStringList QCoreApplication::arguments()
                 l1arg == "-stylesheet" ||
                 l1arg == "-widgetcount")
                 ;
-            else if (l1arg.startsWith("-style=") ||
-                     l1arg.startsWith("-qmljsdebugger="))
+            else if (l1arg.startsWith("-style="))
                 ;
             else if (l1arg == "-style" ||
-                     l1arg == "-qmljsdebugger" ||
                      l1arg == "-session" ||
                      l1arg == "-graphicssystem" ||
                      l1arg == "-testability")

diff --git a/src/core/kernel/qcoreapplication_p.h b/src/core/kernel/qcoreapplication_p.h
index 99a9b59..7b7d7a5 100644 (file)
--- a/src/core/kernel/qcoreapplication_p.h
+++ b/src/core/kernel/qcoreapplication_p.h
@@ -103,8 +103,6 @@ public:
     void appendApplicationPathToLibraryPaths(void);
     void processCommandLineArguments();
 
-    static QString qmljsDebugArguments(); // access arguments from other libraries
-
 #ifndef QT_NO_TRANSLATION
     QTranslatorList translators;
 #endif

diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index 57388a0..23242b6 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -188,7 +188,7 @@
 //
 
 //
-// This file is automatically generated from qmljs.g.
+// This file is automatically generated from qdeclarativejs.g.
 // Changes will be lost.
 //
 
@@ -378,7 +378,7 @@ protected:
 #include <QVarLengthArray>
 
 //
-// This file is automatically generated from qmljs.g.
+// This file is automatically generated from qdeclarativejs.g.
 // Changes will be lost.
 //
 

diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp
index d52eac1..cb63120 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsparser.cpp
+++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp
@@ -55,7 +55,7 @@
 #include <QVarLengthArray>
 
 //
-// This file is automatically generated from qmljs.g.
+// This file is automatically generated from qdeclarativejs.g.
 // Changes will be lost.
 //
 

diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h
index 1ac60bb..955d605 100644 (file)
--- a/src/declarative/qml/parser/qdeclarativejsparser_p.h
+++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h
@@ -52,7 +52,7 @@
 //
 
 //
-// This file is automatically generated from qmljs.g.
+// This file is automatically generated from qdeclarativejs.g.
 // Changes will be lost.
 //
 

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 2345ad5..9455121 100644 (file)
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -660,9 +660,6 @@ void QApplicationPrivate::process_cmdline()
             Qt::RightToLeft
         \o  -graphicssystem, sets the backend to be used for on-screen widgets
             and QPixmaps. Available options are \c{raster} and \c{opengl}.
-        \o  -qmljsdebugger=, activates the QML/JS debugger with a specified port.
-            The value must be of format port:1234[,block], where block is optional
-            and will make the application wait until a debugger connects to it.
     \endlist
 
     The X11 version of Qt supports some traditional X11 command line options:

diff --git a/src/phonon/Mainpage.dox b/src/phonon/Mainpage.dox
deleted file mode 100644 (file)
index a5df2f5..0000000
--- a/src/phonon/Mainpage.dox
+++ /dev/null
@@ -1,75 +0,0 @@
-/** @mainpage The Phonon Library API Reference
-
-<p><b>
-Overview |
-@ref development
-</b></p>
-
-<a href="http://phonon.kde.org/">Phonon</a> provides a Qt-style interface for audio
-and video.  It is aimed at the average desktop application, whether that is a game
-that needs sound effects or a full-blown multimedia playback application like
-<a href="http://amarok.kde.org/">Amarok</a> or
-<a href="http://bangarangkde.wordpress.com/">Bangarang</a>.
-
-If you writing a Qt program and want audio or video playback, then Phonon is
-almost certainly the right choice for you.  It provides an API that any Qt
-developer will be comfortable with, and uses the native multimedia frameworks
-on Windows and MacOS.  On UNIX systems, where there is no one standard
-multimedia system, it offers <a href="http://www.gstreamer.net/">GStreamer</a>
-and <a href="http://www.videolan.org/">VLC</a> backends.
-
-However, Phonon is not aimed at professional audio applications (in the style of
-<a href="http://audacity.sourceforge.net/">Audacity</a>, say).  For these applications,
-you will probably want more control over the audio layer than Phonon will give you,
-and you should probably be using something like <a href="http://jackaudio.org/">JACK</a>.
-
-@authors
-Matthias Kretz \<kretz@kde.org\><br/>
-Ricardo Villalba \<rvm@escomposlinux.org\><br/>
-Ian Monroe \<ian@monroe.nu\><br/>
-Colin Guthrie \<phonon@colin.guthr.ie\><br/>
-Martin Sandsmark \<martin.sandsmark@kde.org\><br/>
-Harald Sitter \<sitter@kde.org\><br/>
-Nokia Corporation and/or its subsidiary(-ies)
-
-@maintainers
-Harald Sitter \<sitter@kde.org\>
-
-@licenses
-Libraries: @lgpl<br>
-Examples: @mit<br>
-Backends: @lgpl or @gpl
-
-*/
-
-/** @page development Development
-
-<p><b>
-@ref index "Overview" |
-Development
-</b></p>
-
-If you want to get involved with Phonon backend development please subscribe to
-<a href="https://mail.kde.org/mailman/listinfo/phonon-backends">phonon-backends@kde.org</a>.
-
-If you want to contribute, make comments or useful suggestions you can also
-write to the
-<a href="mailto:kde-multimedia@kde.org">KDE Multimedia mailinglist</a>.
-You can join the mailinglist using the
-<a href="https://mail.kde.org/mailman/listinfo/kde-multimedia">webinterface</a>
-or take a look at the
-<a href="http://lists.kde.org/?l=kde-multimedia">archives</a>
-
-If you want more immediate help, try the \#phonon IRC channel on Freenode.
-
-*/
-
-// DOXYGEN_VERSION=4.7.0
-// DOXYGEN_NAME=Phonon
-// DOXYGEN_ENABLE=YES
-// DOXYGEN_SET_INPUT = @topdir@/phonon/
-// DOXYGEN_SET_EXCLUDE = @topdir@/phonon/backend/ @topdir@/phonon/experimental/
-// DOXYGEN_SET_FILE_PATTERNS = *.h *.dox
-// DOXYGEN_SET_EXCLUDE_PATTERNS = *interface.h *_p.h
-
-// vim:ts=4:sw=4:expandtab:filetype=doxygen