* Add the Developer Extras to the WebAttribute and propagate it

  to WebCore::Settings. This will enable the Inspect Element menu item
* CodingStyle fixes in QWebSettings
* Enable the Developer Extras in the QtLauncher

Signed-off-by: Simon
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28347 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 48dc638a0d991139e4974f8a2d39949c3480bab0..aefc7587934cfa671982e61864ec21baab8c9ec7 100644 (file)
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -129,6 +129,10 @@ void QWebSettingsPrivate::apply()
                                       global->attributes.value(QWebSettings::JavascriptCanAccessClipboard));
         settings->setDOMPasteAllowed(value);
 
+        value = attributes.value(QWebSettings::DeveloperExtrasEnabled,
+                                      global->attributes.value(QWebSettings::DeveloperExtrasEnabled));
+        settings->setDeveloperExtrasEnabled(value);
+
         QString location = (!userStyleSheetLocation.isEmpty()) ? userStyleSheetLocation : global->userStyleSheetLocation;
         settings->setUserStyleSheetLocation(WebCore::KURL(location));
     } else {

diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index b665e7bdcfb7e497bd18b0d7f6c25d713d6c7895..8c26ab69a88fbdc0ee874ca0f24cc743ea19ea29 100644 (file)
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -55,7 +55,8 @@ public:
         PluginsEnabled,
         PrivateBrowsingEnabled,
         JavascriptCanOpenWindows,
-        JavascriptCanAccessClipboard
+        JavascriptCanAccessClipboard,
+        DeveloperExtrasEnabled
     };
     enum WebGraphic {
         MissingImageGraphic,

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f410da17bb08ba6bbbbfe68d3689382b9c4bcba6..ebbe6872b3447b48763c262243a4cd72a6c935af 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,19 @@
+2007-12-03  Holger Hans Peter Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Simon.
+
+        * Add the Developer Extras to the WebAttribute and propagate it
+        to WebCore::Settings. This will enable the Inspect Element menu item
+        * CodingStyle fixes in QWebSettings
+        * Enable the Developer Extras in the QtLauncher
+        
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+        * QtLauncher/main.cpp:
+        (main):
+
 2007-12-03  Geoffrey Garen  <ggaren@apple.com>
 
         Removed unnecessary and possibly incorrect #include from my last 

diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 7dbc1c61c73091931e572c9febf5a1e23dc5b36d..b0dc0e9e084a0ee2c6557fd6e18bed1a7f472e17 100644 (file)
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -379,6 +379,7 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
 
     QWebSettings::defaultSettings()->setAttribute(QWebSettings::PluginsEnabled);
+    QWebSettings::defaultSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled);
 
     const QStringList args = app.arguments();
     if (args.count() > 1)