[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 6f2270bc9b1951f4cc8d4ab673e7189122fe4fa8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 14:12:05 2009 +0000

    2009-11-19  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Add instantiation tests for QWebInspector.
    
            * tests/qwebinspector/qwebinspector.pro: Added.
            * tests/qwebinspector/tst_qwebinspector.cpp: Added.
            (tst_QWebInspector::attachAndDestroy):
            * tests/tests.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7be049d..7ed361b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Kenneth Rohde Christiansen.
 
+        [Qt] Add instantiation tests for QWebInspector.
+
+        * tests/qwebinspector/qwebinspector.pro: Added.
+        * tests/qwebinspector/tst_qwebinspector.cpp: Added.
+        (tst_QWebInspector::attachAndDestroy):
+        * tests/tests.pro:
+
+2009-11-19  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
         [Qt] Fix QWebInspector destruction problem.
         https://bugs.webkit.org/show_bug.cgi?id=31664
 
diff --git a/WebKit/qt/tests/qwebinspector/qwebinspector.pro b/WebKit/qt/tests/qwebinspector/qwebinspector.pro
new file mode 100644
index 0000000..520887e
--- /dev/null
+++ b/WebKit/qt/tests/qwebinspector/qwebinspector.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+TARGET = tst_qwebinspector
+include(../../../../WebKit.pri)
+SOURCES  += tst_qwebinspector.cpp
+QT += testlib network
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
diff --git a/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp b/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
new file mode 100644
index 0000000..12cd630
--- /dev/null
+++ b/WebKit/qt/tests/qwebinspector/tst_qwebinspector.cpp
@@ -0,0 +1,68 @@
+/*
+    Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include <QtTest/QtTest>
+
+#include <qdir.h>
+#include <qwebinspector.h>
+#include <qwebpage.h>
+#include <qwebsettings.h>
+
+class tst_QWebInspector : public QObject {
+    Q_OBJECT
+
+private slots:
+    void attachAndDestroy();
+};
+
+void tst_QWebInspector::attachAndDestroy()
+{
+    {   // External inspector + manual destruction of page first
+        QWebPage* page = new QWebPage();
+        page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        QWebInspector* inspector = new QWebInspector();
+        inspector->setPage(page);
+        page->updatePositionDependentActions(QPoint(0, 0));
+        page->triggerAction(QWebPage::InspectElement);
+
+        delete page;
+        delete inspector;
+    }
+    {   // External inspector + manual destruction of inspector first
+        QWebPage* page = new QWebPage();
+        page->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        QWebInspector* inspector = new QWebInspector();
+        inspector->setPage(page);
+        page->updatePositionDependentActions(QPoint(0, 0));
+        page->triggerAction(QWebPage::InspectElement);
+
+        delete inspector;
+        delete page;
+    }
+    {   // Internal inspector
+        QWebPage page;
+        page.settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+        page.updatePositionDependentActions(QPoint(0, 0));
+        page.triggerAction(QWebPage::InspectElement);
+    }
+}
+
+QTEST_MAIN(tst_QWebInspector)
+
+#include "tst_qwebinspector.moc"
diff --git a/WebKit/qt/tests/tests.pro b/WebKit/qt/tests/tests.pro
index 939cd22..b967ca9 100644
--- a/WebKit/qt/tests/tests.pro
+++ b/WebKit/qt/tests/tests.pro
@@ -1,4 +1,4 @@
 
 TEMPLATE = subdirs
-SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory
+SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qwebinspector
 greaterThan(QT_MINOR_VERSION, 4): SUBDIRS += benchmarks/painting/tst_painting.pro benchmarks/loading/tst_loading.pro

-- 
WebKit Debian packaging