From b6ee151c09e4066f0d6767bfd2e0d8aafd763cd1 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Tue, 6 Apr 2010 09:36:36 +0200
Subject: qdoc: Added <div> elements to some html output for Fake nodes.

Task: QTBUG-9504
---
 tools/qdoc3/htmlgenerator.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index fb9fa95..df9662f 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1356,10 +1356,10 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
 
     if (!inner->doc().isEmpty()) {
         out() << "<hr />\n"
-              << "<div class=\"descr\"/>\n"
+              << "<div class=\"descr\"/>\n" // QTBUG-9504
               << "<h2>" << "Detailed Description" << "</h2>\n";
         generateBody(inner, marker);
-        out() << "</div>\n";
+        out() << "</div>\n"; // QTBUG-9504
         generateAlsoList(inner, marker);
     }
 
@@ -1368,7 +1368,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
     while (s != sections.end()) {
         out() << "<hr />\n";
         if (!(*s).divClass.isEmpty())
-            out() << "<div class=\"" << (*s).divClass << "\"/>\n";
+            out() << "<div class=\"" << (*s).divClass << "\"/>\n"; // QTBUG-9504
         out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
 
         NodeList::ConstIterator m = (*s).members.begin();
@@ -1419,7 +1419,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
             ++m;
         }
         if (!(*s).divClass.isEmpty())
-            out() << "</div>\n";
+            out() << "</div>\n"; // QTBUG-9504
         ++s;
     }
     generateFooter(inner);
@@ -1591,10 +1591,14 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     Text brief = fake->doc().briefText();
     if (fake->subType() == Node::Module && !brief.isEmpty()) {
         out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
+        out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
         out() << "<h2>" << "Detailed Description" << "</h2>\n";
     }
+    else
+        out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
 
     generateBody(fake, marker);
+    out() << "</div>\n"; // QTBUG-9504
     generateAlsoList(fake, marker);
 
     if (!fake->groupMembers().isEmpty()) {
-- 
cgit v0.12


From c1ce854d745b28e2f14057d29e726b8327034e9b Mon Sep 17 00:00:00 2001
From: miniak <milan.burda@gmail.com>
Date: Wed, 7 Apr 2010 11:01:03 +0200
Subject: fix QMenu::popup()

Merge-request: 551
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
---
 src/gui/widgets/qmenu.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 404d46e..42f3a15 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -1913,10 +1913,9 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
                 pos.setX(screen.left() + desktopFrame);
         }
         if (pos.y() + size.height() - 1 > screen.bottom() - desktopFrame) {
-            if(snapToMouse)
-                pos.setY(qMin(mouse.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1));
-            else
-                pos.setY(qMax(p.y() - (size.height() + desktopFrame), screen.bottom()-desktopFrame-size.height()+1));
+            const int bestPos = (snapToMouse ? mouse.y() : p.y()) - desktopFrame - size.height() + 1;
+            const int fallbackPos = screen.bottom() - desktopFrame - size.height() + 1;
+            pos.setY(qMin(bestPos, fallbackPos));
         } else if (pos.y() < screen.top() + desktopFrame) {
             pos.setY(screen.top() + desktopFrame);
         }
-- 
cgit v0.12


From ee3a237262071721755075d6ae958aec744f5c87 Mon Sep 17 00:00:00 2001
From: miniak <milan.burda@gmail.com>
Date: Wed, 7 Apr 2010 11:01:04 +0200
Subject: QMenu::popup() code style fixes

Merge-request: 551
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
---
 src/gui/widgets/qmenu.cpp | 50 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index 42f3a15..b752ae2 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -1803,7 +1803,7 @@ QSize QMenu::sizeHint() const
 void QMenu::popup(const QPoint &p, QAction *atAction)
 {
     Q_D(QMenu);
-    if (d->scroll) { //reset scroll state from last popup
+    if (d->scroll) { // reset scroll state from last popup
         d->scroll->scrollOffset = 0;
         d->scroll->scrollFlags = QMenuPrivate::QMenuScroller::ScrollNone;
     }
@@ -1858,9 +1858,9 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     }
 #endif
     if (d->ncols > 1) {
-        pos.setY(screen.top()+desktopFrame);
+        pos.setY(screen.top() + desktopFrame);
     } else if (atAction) {
-        for(int i = 0, above_height = 0; i < d->actions.count(); i++) {
+        for (int i = 0, above_height = 0; i < d->actions.count(); i++) {
             QAction *action = d->actions.at(i);
             if (action == atAction) {
                 int newY = pos.y() - above_height;
@@ -1875,7 +1875,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
                 if (d->scroll && d->scroll->scrollFlags != QMenuPrivate::QMenuScroller::ScrollNone
                     && !style()->styleHint(QStyle::SH_Menu_FillScreenWithScroll, 0, this)) {
                     int below_height = above_height + d->scroll->scrollOffset;
-                    for(int i2 = i; i2 < d->actionRects.count(); i2++)
+                    for (int i2 = i; i2 < d->actionRects.count(); i2++)
                         below_height += d->actionRects.at(i2).height();
                     size.setHeight(below_height);
                 }
@@ -1888,28 +1888,28 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
 
     QPoint mouse = QCursor::pos();
     d->mousePopupPos = mouse;
-    const bool snapToMouse = (QRect(p.x()-3, p.y()-3, 6, 6).contains(mouse));
+    const bool snapToMouse = (QRect(p.x() - 3, p.y() - 3, 6, 6).contains(mouse));
 
     if (adjustToDesktop) {
-        //handle popup falling "off screen"
+        // handle popup falling "off screen"
         if (isRightToLeft()) {
-            if(snapToMouse) //position flowing left from the mouse
-                pos.setX(mouse.x()-size.width());
+            if (snapToMouse) // position flowing left from the mouse
+                pos.setX(mouse.x() - size.width());
 
 #ifndef QT_NO_MENUBAR
-            //if in a menubar, it should be right-aligned
+            // if in a menubar, it should be right-aligned
             if (qobject_cast<QMenuBar*>(d->causedPopup.widget))
                 pos.rx() -= size.width();
 #endif //QT_NO_MENUBAR
 
-            if (pos.x() < screen.left()+desktopFrame)
-                pos.setX(qMax(p.x(), screen.left()+desktopFrame));
-            if (pos.x()+size.width()-1 > screen.right()-desktopFrame)
-                pos.setX(qMax(p.x()-size.width(), screen.right()-desktopFrame-size.width()+1));
+            if (pos.x() < screen.left() + desktopFrame)
+                pos.setX(qMax(p.x(), screen.left() + desktopFrame));
+            if (pos.x() + size.width() - 1 > screen.right() - desktopFrame)
+                pos.setX(qMax(p.x() - size.width(), screen.right() - desktopFrame - size.width() + 1));
         } else {
-            if (pos.x()+size.width()-1 > screen.right()-desktopFrame)
-                pos.setX(screen.right()-desktopFrame-size.width()+1);
-            if (pos.x() < screen.left()+desktopFrame)
+            if (pos.x() + size.width() - 1 > screen.right() - desktopFrame)
+                pos.setX(screen.right() - desktopFrame - size.width() + 1);
+            if (pos.x() < screen.left() + desktopFrame)
                 pos.setX(screen.left() + desktopFrame);
         }
         if (pos.y() + size.height() - 1 > screen.bottom() - desktopFrame) {
@@ -1922,14 +1922,14 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
 
         if (pos.y() < screen.top() + desktopFrame)
             pos.setY(screen.top() + desktopFrame);
-        if (pos.y()+size.height()-1 > screen.bottom() - desktopFrame) {
+        if (pos.y() + size.height() - 1 > screen.bottom() - desktopFrame) {
             if (d->scroll) {
                 d->scroll->scrollFlags |= uint(QMenuPrivate::QMenuScroller::ScrollDown);
                 int y = qMax(screen.y(),pos.y());
-                size.setHeight(screen.bottom()-(desktopFrame*2)-y);
+                size.setHeight(screen.bottom() - (desktopFrame * 2) - y);
             } else {
                 // Too big for screen, bias to see bottom of menu (for some reason)
-                pos.setY(screen.bottom()-size.height()+1);
+                pos.setY(screen.bottom() - size.height() + 1);
             }
         }
     }
@@ -1938,19 +1938,19 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
     int hGuess = isRightToLeft() ? QEffects::LeftScroll : QEffects::RightScroll;
     int vGuess = QEffects::DownScroll;
     if (isRightToLeft()) {
-        if ((snapToMouse && (pos.x() + size.width()/2 > mouse.x())) ||
-           (qobject_cast<QMenu*>(d->causedPopup.widget) && pos.x() + size.width()/2 > d->causedPopup.widget->x()))
+        if ((snapToMouse && (pos.x() + size.width() / 2 > mouse.x())) ||
+           (qobject_cast<QMenu*>(d->causedPopup.widget) && pos.x() + size.width() / 2 > d->causedPopup.widget->x()))
             hGuess = QEffects::RightScroll;
     } else {
-        if ((snapToMouse && (pos.x() + size.width()/2 < mouse.x())) ||
-           (qobject_cast<QMenu*>(d->causedPopup.widget) && pos.x() + size.width()/2 < d->causedPopup.widget->x()))
+        if ((snapToMouse && (pos.x() + size.width() / 2 < mouse.x())) ||
+           (qobject_cast<QMenu*>(d->causedPopup.widget) && pos.x() + size.width() / 2 < d->causedPopup.widget->x()))
             hGuess = QEffects::LeftScroll;
     }
 
 #ifndef QT_NO_MENUBAR
-    if ((snapToMouse && (pos.y() + size.height()/2 < mouse.y())) ||
+    if ((snapToMouse && (pos.y() + size.height() / 2 < mouse.y())) ||
        (qobject_cast<QMenuBar*>(d->causedPopup.widget) &&
-        pos.y() + size.width()/2 < d->causedPopup.widget->mapToGlobal(d->causedPopup.widget->pos()).y()))
+        pos.y() + size.width() / 2 < d->causedPopup.widget->mapToGlobal(d->causedPopup.widget->pos()).y()))
        vGuess = QEffects::UpScroll;
 #endif
     if (QApplication::isEffectEnabled(Qt::UI_AnimateMenu)) {
-- 
cgit v0.12


From 6947390e5d331ae653e91acecad70108915328e7 Mon Sep 17 00:00:00 2001
From: miniak <milan.burda@gmail.com>
Date: Wed, 7 Apr 2010 11:01:05 +0200
Subject: Test case for QMenu::popup()

Verifies that the menu shown is fully contained on the screen.
The actual menu position on the screen is checked as well.

Merge-request: 551
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
---
 tests/auto/qmenu/tst_qmenu.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp
index e10d7ee..4be6fdd 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/qmenu/tst_qmenu.cpp
@@ -106,6 +106,8 @@ private slots:
     void pushButtonPopulateOnAboutToShow();
     void QTBUG7907_submenus_autoselect();
     void QTBUG7411_submenus_activate();
+    void menuGeometry_data();
+    void menuGeometry();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -967,6 +969,60 @@ void tst_QMenu::QTBUG7411_submenus_activate()
     QTRY_VERIFY(sub1.isVisible());
 }
 
+void tst_QMenu::menuGeometry_data()
+{
+    QTest::addColumn<QRect>("screen");
+    QTest::addColumn<QPoint>("pos");
+    QTest::addColumn<QPoint>("expectedPos");
+
+    QMenu menu("Test Menu");
+    for (int i = 0; i < 3; ++i)
+        menu.addAction("Hello World!");
+
+    menu.adjustSize();
+
+    const int screenCount = QApplication::desktop()->screenCount();
+    const int desktopFrame = menu.style()->pixelMetric(QStyle::PM_MenuDesktopFrameWidth, 0, &menu);
+
+    for (int i = 0; i < screenCount; ++i) {
+        const QRect screen = QApplication::desktop()->screenGeometry(i);
+
+        if (screen.width() < menu.width() || screen.height() < menu.height())
+            continue;
+
+        QTest::newRow("topLeft") << screen << screen.topLeft()
+            << QPoint(screen.left() + desktopFrame, screen.top() + desktopFrame);
+
+        QTest::newRow("topRight") << screen << screen.topRight()
+            << QPoint(screen.right() - desktopFrame - menu.width() + 1, screen.top() + desktopFrame);
+
+        QTest::newRow("bottomLeft") << screen << screen.bottomLeft()
+            << QPoint(screen.left() + desktopFrame, screen.bottom() - desktopFrame - menu.height() + 1);
+
+        QTest::newRow("bottomRight") << screen << screen.bottomRight()
+            << QPoint(screen.right() - desktopFrame - menu.width() + 1, screen.bottom() - desktopFrame - menu.height() + 1);
+
+        const QPoint pos = QPoint(screen.right() - qMax(desktopFrame, 20), screen.bottom() - qMax(desktopFrame, 20));
+        QTest::newRow("position") << screen << pos
+            << QPoint(screen.right() - menu.width() + 1, pos.y() - menu.height() + 1);
+    }
+}
+
+void tst_QMenu::menuGeometry()
+{
+    QFETCH(QRect, screen);
+    QFETCH(QPoint, pos);
+    QFETCH(QPoint, expectedPos);
+
+    QMenu menu("Test Menu");
+    for (int i = 0; i < 3; ++i)
+        menu.addAction("Hello World!");
+
+    menu.popup(pos);
+    QTest::qWaitForWindowShown(&menu);
+    QVERIFY(screen.contains(menu.geometry()));
+    QCOMPARE(menu.pos(), expectedPos);
+}
 
 
 QTEST_MAIN(tst_QMenu)
-- 
cgit v0.12


From eeccdc0cec9a616e740e3b59a6f011bfe703ce09 Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Wed, 7 Apr 2010 11:47:20 +0200
Subject: qdoc: Added many png, js, and css files for new format.

Coming soon!

Task: QTBUG-9504
---
 tools/qdoc3/htmlgenerator.cpp                      |    3 +
 tools/qdoc3/pagegenerator.cpp                      |    2 +
 tools/qdoc3/test/template/images/api_examples.png  |  Bin 0 -> 1302 bytes
 tools/qdoc3/test/template/images/api_lookup.png    |  Bin 0 -> 1879 bytes
 tools/qdoc3/test/template/images/api_topics.png    |  Bin 0 -> 1216 bytes
 tools/qdoc3/test/template/images/bg_l.png          |  Bin 0 -> 139 bytes
 tools/qdoc3/test/template/images/bg_l_blank.png    |  Bin 0 -> 123 bytes
 tools/qdoc3/test/template/images/bg_ll.png         |  Bin 0 -> 514 bytes
 tools/qdoc3/test/template/images/bg_ll_blank.png   |  Bin 0 -> 320 bytes
 tools/qdoc3/test/template/images/bg_lr.png         |  Bin 0 -> 458 bytes
 tools/qdoc3/test/template/images/bg_r.png          |  Bin 0 -> 136 bytes
 tools/qdoc3/test/template/images/bg_ul.png         |  Bin 0 -> 516 bytes
 tools/qdoc3/test/template/images/bg_ul_blank.png   |  Bin 0 -> 304 bytes
 tools/qdoc3/test/template/images/bg_ur.png         |  Bin 0 -> 437 bytes
 tools/qdoc3/test/template/images/bg_ur_blank.png   |  Bin 0 -> 437 bytes
 tools/qdoc3/test/template/images/box_bg.png        |  Bin 0 -> 129 bytes
 tools/qdoc3/test/template/images/breadcrumb.png    |  Bin 0 -> 195 bytes
 tools/qdoc3/test/template/images/bullet_gt.png     |  Bin 0 -> 185 bytes
 tools/qdoc3/test/template/images/bullet_sq.png     |  Bin 0 -> 117 bytes
 tools/qdoc3/test/template/images/content_bg.png    |  Bin 0 -> 1498 bytes
 .../qdoc3/test/template/images/feedbackground.png  |  Bin 0 -> 263 bytes
 tools/qdoc3/test/template/images/form_bg.png       |  Bin 0 -> 390 bytes
 tools/qdoc3/test/template/images/horBar.png        |  Bin 0 -> 2807 bytes
 tools/qdoc3/test/template/images/page_bg.png       |  Bin 0 -> 126 bytes
 tools/qdoc3/test/template/images/print.png         |  Bin 0 -> 575 bytes
 tools/qdoc3/test/template/images/qt_guide.png      |  Bin 0 -> 12685 bytes
 tools/qdoc3/test/template/images/qt_icon.png       |  Bin 0 -> 4775 bytes
 tools/qdoc3/test/template/images/qt_ref_doc.png    |  Bin 0 -> 2600 bytes
 tools/qdoc3/test/template/images/qt_tools.png      |  Bin 0 -> 17508 bytes
 tools/qdoc3/test/template/images/sep.png           |  Bin 0 -> 120 bytes
 .../test/template/images/sprites-combined.png      |  Bin 0 -> 18070 bytes
 tools/qdoc3/test/template/scripts/functions.js     |   58 +
 tools/qdoc3/test/template/scripts/jquery.js        |  152 +++
 tools/qdoc3/test/template/style/style.css          | 1150 ++++++++++++++++++++
 tools/qdoc3/test/template/style/style_ie6.css      |   54 +
 tools/qdoc3/test/template/style/style_ie7.css      |   19 +
 tools/qdoc3/test/template/style/style_ie8.css      |    0
 37 files changed, 1438 insertions(+)
 create mode 100755 tools/qdoc3/test/template/images/api_examples.png
 create mode 100755 tools/qdoc3/test/template/images/api_lookup.png
 create mode 100755 tools/qdoc3/test/template/images/api_topics.png
 create mode 100755 tools/qdoc3/test/template/images/bg_l.png
 create mode 100755 tools/qdoc3/test/template/images/bg_l_blank.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ll.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ll_blank.png
 create mode 100755 tools/qdoc3/test/template/images/bg_lr.png
 create mode 100755 tools/qdoc3/test/template/images/bg_r.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ul.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ul_blank.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ur.png
 create mode 100755 tools/qdoc3/test/template/images/bg_ur_blank.png
 create mode 100755 tools/qdoc3/test/template/images/box_bg.png
 create mode 100755 tools/qdoc3/test/template/images/breadcrumb.png
 create mode 100755 tools/qdoc3/test/template/images/bullet_gt.png
 create mode 100755 tools/qdoc3/test/template/images/bullet_sq.png
 create mode 100755 tools/qdoc3/test/template/images/content_bg.png
 create mode 100755 tools/qdoc3/test/template/images/feedbackground.png
 create mode 100755 tools/qdoc3/test/template/images/form_bg.png
 create mode 100755 tools/qdoc3/test/template/images/horBar.png
 create mode 100755 tools/qdoc3/test/template/images/page_bg.png
 create mode 100755 tools/qdoc3/test/template/images/print.png
 create mode 100755 tools/qdoc3/test/template/images/qt_guide.png
 create mode 100755 tools/qdoc3/test/template/images/qt_icon.png
 create mode 100755 tools/qdoc3/test/template/images/qt_ref_doc.png
 create mode 100755 tools/qdoc3/test/template/images/qt_tools.png
 create mode 100755 tools/qdoc3/test/template/images/sep.png
 create mode 100755 tools/qdoc3/test/template/images/sprites-combined.png
 create mode 100755 tools/qdoc3/test/template/scripts/functions.js
 create mode 100755 tools/qdoc3/test/template/scripts/jquery.js
 create mode 100755 tools/qdoc3/test/template/style/style.css
 create mode 100755 tools/qdoc3/test/template/style/style_ie6.css
 create mode 100755 tools/qdoc3/test/template/style/style_ie7.css
 create mode 100755 tools/qdoc3/test/template/style/style_ie8.css

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index df9662f..8d06e11 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1861,6 +1861,9 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
     }
 }
 
+/*!
+  Generates a table of contents begining at \a node.
+ */
 void HtmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
                                             Doc::SectioningUnit sectioningUnit,
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index f0f14fe..b701565 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -217,6 +217,8 @@ void PageGenerator::generateInnerNode(const InnerNode *node,
 
     if (node->parent() != 0) {
 	beginSubPage(node->location(), fileName(node));
+        // <!--Put all your content here-->
+        //generateTableOfContents(node,marker,Doc::Section4,1,relative);
 	if (node->type() == Node::Namespace || node->type() == Node::Class) {
 	    generateClassLikeNode(node, marker);
 	}
diff --git a/tools/qdoc3/test/template/images/api_examples.png b/tools/qdoc3/test/template/images/api_examples.png
new file mode 100755
index 0000000..1fcbc96
Binary files /dev/null and b/tools/qdoc3/test/template/images/api_examples.png differ
diff --git a/tools/qdoc3/test/template/images/api_lookup.png b/tools/qdoc3/test/template/images/api_lookup.png
new file mode 100755
index 0000000..1cffd5e
Binary files /dev/null and b/tools/qdoc3/test/template/images/api_lookup.png differ
diff --git a/tools/qdoc3/test/template/images/api_topics.png b/tools/qdoc3/test/template/images/api_topics.png
new file mode 100755
index 0000000..a76a6c3
Binary files /dev/null and b/tools/qdoc3/test/template/images/api_topics.png differ
diff --git a/tools/qdoc3/test/template/images/bg_l.png b/tools/qdoc3/test/template/images/bg_l.png
new file mode 100755
index 0000000..95470c7
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_l.png differ
diff --git a/tools/qdoc3/test/template/images/bg_l_blank.png b/tools/qdoc3/test/template/images/bg_l_blank.png
new file mode 100755
index 0000000..e0eca3f
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_l_blank.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ll.png b/tools/qdoc3/test/template/images/bg_ll.png
new file mode 100755
index 0000000..99796e7
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ll.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ll_blank.png b/tools/qdoc3/test/template/images/bg_ll_blank.png
new file mode 100755
index 0000000..95a1c45
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ll_blank.png differ
diff --git a/tools/qdoc3/test/template/images/bg_lr.png b/tools/qdoc3/test/template/images/bg_lr.png
new file mode 100755
index 0000000..fef1d17
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_lr.png differ
diff --git a/tools/qdoc3/test/template/images/bg_r.png b/tools/qdoc3/test/template/images/bg_r.png
new file mode 100755
index 0000000..42a35a5
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_r.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ul.png b/tools/qdoc3/test/template/images/bg_ul.png
new file mode 100755
index 0000000..303181f
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ul.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ul_blank.png b/tools/qdoc3/test/template/images/bg_ul_blank.png
new file mode 100755
index 0000000..7051261
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ul_blank.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ur.png b/tools/qdoc3/test/template/images/bg_ur.png
new file mode 100755
index 0000000..bfa51a4
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ur.png differ
diff --git a/tools/qdoc3/test/template/images/bg_ur_blank.png b/tools/qdoc3/test/template/images/bg_ur_blank.png
new file mode 100755
index 0000000..5779961
Binary files /dev/null and b/tools/qdoc3/test/template/images/bg_ur_blank.png differ
diff --git a/tools/qdoc3/test/template/images/box_bg.png b/tools/qdoc3/test/template/images/box_bg.png
new file mode 100755
index 0000000..232655a
Binary files /dev/null and b/tools/qdoc3/test/template/images/box_bg.png differ
diff --git a/tools/qdoc3/test/template/images/breadcrumb.png b/tools/qdoc3/test/template/images/breadcrumb.png
new file mode 100755
index 0000000..f0571ce
Binary files /dev/null and b/tools/qdoc3/test/template/images/breadcrumb.png differ
diff --git a/tools/qdoc3/test/template/images/bullet_gt.png b/tools/qdoc3/test/template/images/bullet_gt.png
new file mode 100755
index 0000000..8875925
Binary files /dev/null and b/tools/qdoc3/test/template/images/bullet_gt.png differ
diff --git a/tools/qdoc3/test/template/images/bullet_sq.png b/tools/qdoc3/test/template/images/bullet_sq.png
new file mode 100755
index 0000000..db85ee3
Binary files /dev/null and b/tools/qdoc3/test/template/images/bullet_sq.png differ
diff --git a/tools/qdoc3/test/template/images/content_bg.png b/tools/qdoc3/test/template/images/content_bg.png
new file mode 100755
index 0000000..416397d
Binary files /dev/null and b/tools/qdoc3/test/template/images/content_bg.png differ
diff --git a/tools/qdoc3/test/template/images/feedbackground.png b/tools/qdoc3/test/template/images/feedbackground.png
new file mode 100755
index 0000000..3a38d99
Binary files /dev/null and b/tools/qdoc3/test/template/images/feedbackground.png differ
diff --git a/tools/qdoc3/test/template/images/form_bg.png b/tools/qdoc3/test/template/images/form_bg.png
new file mode 100755
index 0000000..bf2ee54
Binary files /dev/null and b/tools/qdoc3/test/template/images/form_bg.png differ
diff --git a/tools/qdoc3/test/template/images/horBar.png b/tools/qdoc3/test/template/images/horBar.png
new file mode 100755
index 0000000..100fe91
Binary files /dev/null and b/tools/qdoc3/test/template/images/horBar.png differ
diff --git a/tools/qdoc3/test/template/images/page_bg.png b/tools/qdoc3/test/template/images/page_bg.png
new file mode 100755
index 0000000..fb7d051
Binary files /dev/null and b/tools/qdoc3/test/template/images/page_bg.png differ
diff --git a/tools/qdoc3/test/template/images/print.png b/tools/qdoc3/test/template/images/print.png
new file mode 100755
index 0000000..4581da1
Binary files /dev/null and b/tools/qdoc3/test/template/images/print.png differ
diff --git a/tools/qdoc3/test/template/images/qt_guide.png b/tools/qdoc3/test/template/images/qt_guide.png
new file mode 100755
index 0000000..9f53a05
Binary files /dev/null and b/tools/qdoc3/test/template/images/qt_guide.png differ
diff --git a/tools/qdoc3/test/template/images/qt_icon.png b/tools/qdoc3/test/template/images/qt_icon.png
new file mode 100755
index 0000000..fbaee35
Binary files /dev/null and b/tools/qdoc3/test/template/images/qt_icon.png differ
diff --git a/tools/qdoc3/test/template/images/qt_ref_doc.png b/tools/qdoc3/test/template/images/qt_ref_doc.png
new file mode 100755
index 0000000..141488b
Binary files /dev/null and b/tools/qdoc3/test/template/images/qt_ref_doc.png differ
diff --git a/tools/qdoc3/test/template/images/qt_tools.png b/tools/qdoc3/test/template/images/qt_tools.png
new file mode 100755
index 0000000..cc24179
Binary files /dev/null and b/tools/qdoc3/test/template/images/qt_tools.png differ
diff --git a/tools/qdoc3/test/template/images/sep.png b/tools/qdoc3/test/template/images/sep.png
new file mode 100755
index 0000000..c895646
Binary files /dev/null and b/tools/qdoc3/test/template/images/sep.png differ
diff --git a/tools/qdoc3/test/template/images/sprites-combined.png b/tools/qdoc3/test/template/images/sprites-combined.png
new file mode 100755
index 0000000..4186022
Binary files /dev/null and b/tools/qdoc3/test/template/images/sprites-combined.png differ
diff --git a/tools/qdoc3/test/template/scripts/functions.js b/tools/qdoc3/test/template/scripts/functions.js
new file mode 100755
index 0000000..c510410
--- /dev/null
+++ b/tools/qdoc3/test/template/scripts/functions.js
@@ -0,0 +1,58 @@
+
+/* START non link areas where cursor should change to pointing hand */
+$('.t_button').mouseover(function() {
+    $(this).css('cursor','pointer');
+		/*document.getElementById(this.id).style.cursor='pointer';*/
+});
+
+/* END non link areas  */
+$('#smallA').click(function() {
+		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+
+$('#medA').click(function() {
+		$('.content .heading').css('font','600 16px/1 Arial');
+		$('.content h1').css('font','600 18px/1.2 Arial');
+		$('.content h2').css('font','600 16px/1.2 Arial');
+		$('.content h3').css('font','600 14px/1.2 Arial');
+		$('.content p').css('font','13px/1.2 Verdana');
+		$('.content li').css('font','600 10pt/1 Verdana');
+		$('.content li').css('line-height','14px');
+		$('.content table').css('font','13px/1.2 Verdana');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+
+$('#bigA').click(function() {
+		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large');
+		$('.content li').css('line-height','14px');
+		$('.t_button').removeClass('active')
+		$(this).addClass('active')
+});
+
+function doSearch(str){
+
+if (str.length>3)
+  {
+  alert('start search');
+ // document.getElementById("refWrapper").innerHTML="";
+  return;
+  }
+ else
+  return;
+    
+//    var url="indexSearch.php";
+//    url=url+"?q="+str;
+ //   url=url+"&sid="+Math.random();
+   // var url="http://localhost:8983/solr/select?";
+   // url=url+"&q="+str;
+   // url=url+"&fq=&start=0&rows=10&fl=&qt=&wt=&explainOther=&hl.fl=";
+    
+  //  $.get(url, function(data){ 
+   // alert(data);
+  // document.getElementById("refWrapper").innerHTML=data; 
+ //});
+   
+}
\ No newline at end of file
diff --git a/tools/qdoc3/test/template/scripts/jquery.js b/tools/qdoc3/test/template/scripts/jquery.js
new file mode 100755
index 0000000..0c7294c
--- /dev/null
+++ b/tools/qdoc3/test/template/scripts/jquery.js
@@ -0,0 +1,152 @@
+/*!
+ * jQuery JavaScript Library v1.4.1
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Mon Jan 25 19:43:33 2010 -0500
+ */
+(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j?
+e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if(!(a.button&&a.type==="click")){for(o in x){j=x[o];if(j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f,
+a.currentTarget);m=0;for(s=i.length;m<s;m++)for(o in x){j=x[o];n=i[m].elem;f=null;if(i[m].selector===j.selector){if(j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if(!f||f!==n)d.push({elem:n,fn:j})}}m=0;for(s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if(i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType===
+11}function qa(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var i in f)for(var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if(i=c.fragments[a[0]])if(i!==1)f=i}if(!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment();
+c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent,
+va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]],
+[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a,
+this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this,
+a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};
+c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(i in e){j=a[i];n=e[i];if(a!==n)if(f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if(n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$=
+Oa;if(a)z.jQuery=Na;return c},isReady:false,ready:function(){if(!c.isReady){if(!r.body)return setTimeout(c.ready,13);c.isReady=true;if(P){for(var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if(!va){va=true;if(r.readyState==="complete")return c.ready();if(r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if(r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload",
+c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for(b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;
+return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]||
+r.documentElement,d=r.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if(d)if(j)for(f in a){if(b.apply(a[f],d)===false)break}else for(;e<i;){if(b.apply(a[e++],d)===false)break}else if(j)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=
+a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==
+v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=v}else if(b&&!c.isFunction(b)){d=b;b=v}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},
+uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if(O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if(c.browser.webkit)c.browser.safari=true;if(wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if(r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded",
+L,false);c.ready()};else if(r.attachEvent)L=function(){if(r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support=
+{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};
+b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild);
+c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props=
+{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true,
+{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,
+a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);
+return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||
+a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=
+c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className)for(var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if(i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string"||a===v)for(var b=(a||"").split(ca),
+d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,i=0,j=c(this),n=b,o=
+a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||
+{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i<d;i++){var j=e[i];if(j.selected){a=c(j).val();if(b)return a;f.push(a)}}return f}if(za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if(this.nodeType===1){if(n)s=a.call(this,o,m.val());
+if(typeof s==="number")s+="";if(c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d);
+f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=
+""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j=
+function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a,
+d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+
+s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a,
+"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,
+b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b,
+d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
+d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b=
+0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};
+c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b=
+a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!==
+"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this,
+"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"||
+d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a=
+a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,
+f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a,
+b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+
+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if(c.isFunction(f)){e=f;f=v}for(d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector,
+live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
+(function(){function a(g){for(var h="",k,l=0;g[l];l++){k=g[l];if(k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if(k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===k){y=l[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===
+k){y=l[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=k;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||
+typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u=
+l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&
+y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if(!g)return[];for(var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if(q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q,
+h,k);if(l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for(var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for(var H in m.filter)if((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(u===p)p=[];if(m.preFilter[H])if(t=m.preFilter[H](t,u,k,p,l,R)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=u[U])!=null;U++)if(D){I=M(D,t,U,u);var Da=
+l^!!I;if(k&&I!=null)if(Da)y=true;else u[U]=false;else if(Da){p.push(D);y=true}}if(I!==v){k||(u=p);g=g.replace(m.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if(l)h=h.toLowerCase();l=0;for(var q=g.length,
+p;l<q;l++)if(p=g[l]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l<q;l++){var p=g[l];if(p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for(q=g.length;l<q;l++)if(p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=
+h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if(typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for(var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}},
+TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var u;(u=h[p])!=null;p++)if(u)if(q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&
+"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);
+return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===
+g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2===
+0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k<l;k++)if(h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+
+q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for(;l=l.previousSibling;)if(l.nodeType===1)return false;if(k==="first")return true;l=g;case "last":for(;l=l.nextSibling;)if(l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if(k===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for(l=p.firstChild;l;l=l.nextSibling)if(l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>=
+0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="?
+k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};
+try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k<l;k++)h.push(g[k]);else for(k=0;g[k];k++)h.push(g[k]);return h}}var C;if(r.documentElement.compareDocumentPosition)C=function(g,h){if(!g.compareDocumentPosition||!h.compareDocumentPosition){if(g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===
+h?0:1;if(g===0)j=true;return g};else if("sourceIndex"in r.documentElement)C=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)j=true;return g};else if(r.createRange)C=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END,
+l);if(g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id");
+return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href",
+2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===
+0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[],
+l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if(b.nodeType)return c.grep(a,
+function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if(f>0)for(var i=d;i<b.length;i++)for(var j=0;j<d;j++)if(b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=
+0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for(;f&&f.ownerDocument&&f!==b;){for(j in i){e=i[j];if(e.jquery?e.index(f)>
+-1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),
+a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},
+nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):
+e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==
+b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],
+col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)},
+wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?
+d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,
+false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&
+!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)||
+["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,
+b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if(!c.support.checkClone&&arguments.length===3&&typeof j===
+"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if(this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if(i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for(var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n,
+Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for(var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if(!a||c.filter(a,[this]).length){if(!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&&
+this.parentNode.removeChild(this)}},empty:function(){for(this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if(typeof j==="number")j+="";if(j){if(typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if(typeof j===
+"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for(i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if(!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for(o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild);
+j=c.makeArray(i.childNodes)}if(j.nodeType)e.push(j);else e=c.merge(e,j)}});if(d)for(a=0;e[a];a++)if(f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for(var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i,
+Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===v)return c.curCSS(d,f);if(typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})};
+c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return v;if((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if(ga.test(b))b=La;b=b.replace(ha,ia);if(e)f[b]=d;return f[b]},css:function(a,
+b,d,f){if(b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&
+a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ga.test(b))b=La;if(!d&&e&&e[b])f=e[b];else if(ob){if(ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if(!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left=
+a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb=
+J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if(typeof a!=="string")return this._load(a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=
+c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if(n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&
+(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,
+b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}:
+function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}
+function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||
+N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if(e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if(e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&
+c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if(e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if(e.scriptCharset)B.charset=e.scriptCharset;if(!i){var C=false;B.onload=B.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&&
+A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if(w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if(e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",
+e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if(e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if(!w||w.readyState===0||q==="abort"){E||d();E=true;if(w)w.onreadystatechange=c.noop}else if(!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)?
+"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if(j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if(j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if(e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e,
+w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=
+f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if(c.isArray(n))c.each(n,
+function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if(b===v)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/,
+W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();
+ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&
+c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"),
+o=this;for(j in a){var m=j.replace(ha,ia);if(j!==m){a[m]=a[j];delete a[j];j=m}if(a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if(c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if(i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if(wb.test(x))A[x==="toggle"?n?"show":"hide":x](a);
+else{var B=xb.exec(x),C=A.cur(true)||0;if(B){x=parseFloat(B[2]);var E=B[3]||"px";if(E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if(B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",
+1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,
+b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==
+null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop===
+"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=
+this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=
+c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=
+null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),
+f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(s){c.offset.setOffset(this,a,s)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=
+b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if(b===d){o+=b.offsetTop;m+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)||
+0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if(f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if(c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"),
+d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);
+d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop},
+bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left-
+e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=
+this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if(!e)return null;if(f!==v)return this.each(function(){if(i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}});
+c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||
+e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window);
diff --git a/tools/qdoc3/test/template/style/style.css b/tools/qdoc3/test/template/style/style.css
new file mode 100755
index 0000000..4668c23
--- /dev/null
+++ b/tools/qdoc3/test/template/style/style.css
@@ -0,0 +1,1150 @@
+@media screen
+{
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
+    {
+        margin: 0;
+        padding: 0;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+        font-weight: normal;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup
+    {
+        vertical-align: baseline;
+    }
+    sub
+    {
+        vertical-align: baseline;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    input, button, textarea, select, optgroup, option
+    {
+        font-family: inherit;
+        font-size: inherit;
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    input, button, textarea, select
+    {
+        font-size: 100%;
+    }
+    html
+    {
+        background-color: #e5e5e5;
+    }
+    body
+    {
+        background: #e6e7e8 url(../images/page_bg.png) repeat-x 0 0;
+        font: normal 13px/1.2 Verdana;
+        color: #363534;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+    .header, .footer, .wrapper
+    {
+        min-width: 600px;
+        max-width: 1500px;
+        margin: 0 30px;
+    }
+    .wrapper
+    {
+        background: url(../images/bg_r.png) repeat-y 100% 0;
+    }
+
+    .wrapper .hd
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/bg_ul.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+
+    .offline .wrapper .hd
+    {
+        background: url(../images/bg_ul_blank.png) no-repeat 0 0;
+    }
+
+    .wrapper .hd span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/bg_ur.png) no-repeat 100% 0;
+        overflow: hidden;
+    }
+
+    .offline .wrapper .hd span
+    {
+        /*         background: url(../images/bg_ur_blank.png) no-repeat 100% 0; */
+    }
+
+    .wrapper .bd
+    {
+        background: url(../images/bg_l.png) repeat-y 0 0;
+        position: relative;
+    }
+
+    .offline .wrapper .bd
+    {
+        background: url(../images/bg_l_blank.png) repeat-y 0 0;
+    }
+
+    .wrapper .ft
+    {
+        padding-left: 216px;
+        height: 15px;
+        background: url(../images/bg_ll.png) no-repeat 0 0;
+        overflow: hidden;
+    }
+
+    .offline .wrapper .ft
+    {
+        background: url(../images/bg_ll_blank.png) no-repeat 0 0;
+    }
+
+    .wrapper .ft span
+    {
+        height: 15px;
+        display: block;
+        background: url(../images/bg_lr.png) no-repeat 100% 0;
+        overflow: hidden;
+    }
+
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+
+    /*    .header
+        {
+            height: 130px;
+            position: relative;
+        }
+    */
+
+    .header
+    {
+        height: 115px;
+        position: relative;
+    }
+
+    .header .icon
+    {
+        position: absolute;
+        top: 13px;
+        left: 0;
+    }
+
+    .header .qtref
+    {
+        position: absolute;
+        top: 28px;
+        left: 88px;
+        width: 302px;
+        height: 22px;
+    }
+
+    .header .qtref span
+    {
+        display: block;
+        width: 302px;
+        height: 22px;
+        text-indent: -999em;
+        background: url(../images/qt_ref_doc.png) no-repeat 0 0;
+    }
+
+    .sidebar
+    {
+        float: left;
+        margin-left: 5px;
+        width: 200px;
+        font-size: 11px;
+    }
+
+    .sidebar a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+    .offline .sidebar, .offline .feedback
+    {
+        display: none;
+    }
+
+    .sidebar .searchlabel
+    {
+        padding: 0 0 2px 17px;
+        font: normal bold 11px/1.2 Verdana;
+    }
+
+    .sidebar .search
+    {
+        padding: 0 15px 0 16px;
+    }
+
+
+    .sidebar .search form
+    {
+        width: 167px;
+        height: 21px;
+        padding: 2px 0 0 5px;
+        background: url(../images/form_bg.png) no-repeat 0 0;
+    }
+
+    .sidebar .search form fieldset input#searchstring
+    {
+        width: 158px;
+        height: 19px;
+        padding: 0;
+        border: none;
+        outline: none;
+        font: 13px/1.2 Verdana;
+    }
+
+    .sidebar .box
+    {
+        padding: 17px 15px 5px 16px;
+    }
+
+    .sidebar .box .first
+    {
+        background-image: none;
+    }
+
+    .sidebar .box h2
+    {
+        font: normal 18px/1.2 Arial;
+        padding: 15px 0 0 40px;
+        min-height: 32px;
+    }
+
+    .sidebar .box#lookup h2
+    {
+        background: url(../images/api_lookup.png) no-repeat 0 0;
+    }
+
+    .sidebar .box#topics h2
+    {
+        background: url(../images/api_topics.png) no-repeat 0 0;
+    }
+
+    .sidebar .box#examples h2
+    {
+        background: url(../images/api_examples.png) no-repeat 0 0;
+    }
+
+    .sidebar .box .list
+    {
+        display: block;
+    }
+
+    .sidebar .box .live
+    {
+        display: none;
+        height: 100px;
+        overflow: auto;
+    }
+
+    .list li a:hover, .live li a:hover
+    {
+        text-decoration: underline;
+    }
+
+
+    .sidebar .box ul
+    {
+    }
+
+    .sidebar .box ul li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_gt.png) no-repeat 0 5px;
+        margin-bottom: 15px;
+    }
+
+    .sidebar .bottombar
+    {
+        background: url(../images/box_bg.png) repeat-x 0 bottom;
+    }
+
+    .wrap
+    {
+        /*  margin: 0 5px 0 0px;*/
+        overflow: hidden;
+    }
+
+    .offline .wrap
+    {
+        margin: 0 5px 0 5px;
+    }
+
+    .wrap .toolbar
+    {
+        background-color: #fafafa;
+        border-bottom: 1px solid #d1d1d1;
+        height: 20px;
+        margin-left: 3px;
+        margin-right: 5px;
+        position: relative;
+    }
+
+    .wrap .toolbar .toolblock
+    {
+        position: absolute;
+    }
+
+    .wrap .toolbar .breadcrumb
+    {
+        font-size: 11px;
+        line-height: 1;
+        padding: 0 0 10px 21px;
+        height: 10px;
+    }
+    .wrap .toolbar .toolbuttons
+    {
+        padding: 0 0 10px 21px;
+        right: 5px;
+        vertical-align: top;
+        overflow: hidden;
+    }
+
+    .wrap .toolbar .toolbuttons .active
+    {
+        color: #00732F;
+    }
+
+    .wrap .toolbar .toolbuttons ul
+    {
+        float: right;
+    }
+    .wrap .toolbar .toolbuttons li
+    {
+        float: left;
+        text-indent: -10px;
+        margin-top: -5px;
+        margin-right: 15px;
+        font-weight: bold;
+        color: #B0ADAB;
+    }
+
+    #smallA
+    {
+        font-size: 10pt;
+    }
+    #medA
+    {
+        font-size: 12pt;
+    }
+    #bigA
+    {
+        font-size: 14pt;
+    }
+
+    #smallA:hover, #medA:hover, #bigA:hover
+    {
+        color: #00732F;
+    }
+
+    #print
+    {
+        font-size: 14pt;
+        line-height: 20pt;
+    }
+
+    #printIcon
+    {
+        margin-left: 5px;
+    }
+
+    .offline .wrap .breadcrumb
+    {
+    }
+
+    .wrap .breadcrumb ul
+    {
+    }
+
+    .wrap .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 15px;
+        margin-left: 15px;
+        font-weight: bold;
+    }
+
+    .wrap .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .wrap .breadcrumb ul li a
+    {
+    }
+
+    .wrap .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .wrap .content
+    {
+        /* left 30 top 27*/
+        padding: 30px;
+        position: relative;
+    }
+
+    .heading
+    {
+        font: normal 600 16px/1.0 Arial;
+        padding-bottom: 15px;
+    }
+
+    .wrap .content h1
+    {
+        font: 600 18px/1.2 Arial;
+        padding-bottom: 15px;
+    }
+
+    .wrap .content h2
+    {
+        font: 600 16px/1.2 Arial;
+    }
+
+    .wrap .content h3
+    {
+        font: 600 14px/1.2 Arial;
+    }
+
+
+
+    .wrap .content p
+    {
+        padding-bottom: 10px;
+    }
+
+    .wrap .content ul
+    {
+        padding-left: 15px;
+    }
+    .wrap .content li
+    {
+        padding-left: 12px;
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        font: normal 600 10pt/1 Verdana;
+        margin-bottom: 10px;
+        line-height: 14px;
+    }
+
+    .content li:hover
+    {
+        text-decoration: none;
+    }
+
+    .content li
+    {
+        text-decoration: none;
+    }
+
+    /*.content*/    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+    }
+
+    .offline .wrap .content
+    {
+        padding-top: 15px;
+    }
+
+
+    .footer
+    {
+        min-height: 100px;
+        color: #797775;
+        font: normal 9px/1 Verdana;
+        text-align: center;
+        padding-top: 40px;
+    }
+
+    .feedback
+    {
+        float: right;
+        padding-right: 10px;
+        font: normal 8px/1 Verdana;
+        color: #B0ADAB;
+    }
+
+    .feedback:hover
+    {
+        float: right;
+        font: normal 8px/1 Verdana;
+        color: #00732F;
+        text-decoration: underline;
+    }
+
+
+
+    /* Clearing */
+    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
+    {
+        content: ".";
+        display: block;
+        height: 0;
+        clear: both;
+        visibility: hidden;
+    }
+    /* ^ Clearing */
+
+
+    /* header elements */
+
+
+    #nav-topright
+    {
+        height: 70px;
+    }
+
+    #nav-topright ul
+    {
+        list-style-type: none;
+        float: right;
+        width: 347px;
+        margin-top: 11px;
+    }
+
+    #nav-topright li
+    {
+        display: inline-block;
+        margin-right: 20px;
+        float: left;
+    }
+
+    #nav-topright li.nav-topright-last
+    {
+        margin-right: 0;
+    }
+
+    #nav-topright li a
+    {
+        background: transparent url(../images/sprites-combined.png) no-repeat;
+        height: 18px;
+        display: block;
+        overflow: hidden;
+        text-indent: -9999px;
+    }
+
+    #nav-topright li.nav-topright-home a
+    {
+        width: 65px;
+        background-position: -2px -91px;
+    }
+
+    #nav-topright li.nav-topright-home a:hover
+    {
+        background-position: -2px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-dev a
+    {
+        width: 30px;
+        background-position: -76px -91px;
+    }
+
+    #nav-topright li.nav-topright-dev a:hover
+    {
+        background-position: -76px -117px;
+    }
+
+
+    #nav-topright li.nav-topright-labs a
+    {
+        width: 40px;
+        background-position: -114px -91px;
+    }
+
+    #nav-topright li.nav-topright-labs a:hover
+    {
+        background-position: -114px -117px;
+    }
+
+    #nav-topright li.nav-topright-doc a
+    {
+        width: 32px;
+        background-position: -162px -91px;
+    }
+
+    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
+    {
+        background-position: -162px -117px;
+    }
+
+    #nav-topright li.nav-topright-blog a
+    {
+        width: 40px;
+        background-position: -203px -91px;
+    }
+
+    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
+    {
+        background-position: -203px -117px;
+    }
+
+    #nav-topright li.nav-topright-shop a
+    {
+        width: 40px;
+        background-position: -252px -91px;
+    }
+
+    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
+    {
+        background-position: -252px -117px;
+    }
+
+    #nav-logo
+    {
+        background: transparent url(    "../images/sprites-combined.png" ) no-repeat 0 -225px;
+        left: -3px;
+        position: absolute;
+        width: 75px;
+        height: 75px;
+        top: 13px;
+    }
+    #nav-logo a
+    {
+        width: 75px;
+        height: 75px;
+        display: block;
+        text-indent: -9999px;
+        overflow: hidden;
+    }
+
+
+    .shortCut-topleft-inactive
+    {
+        padding-left: 3px;
+        background: transparent url(    "../images/sprites-combined.png" ) no-repeat 0px -58px;
+        height: 20px;
+        width: 93px;
+    }
+
+    .shortCut-topleft-inactive span
+    {
+        font-variant: normal;
+    }
+
+    #shortCut
+    {
+        padding-top: 10px;
+        font-weight: bolder;
+        color: #b0adab;
+    }
+
+    #shortCut ul
+    {
+        list-style-type: none;
+        float: left;
+        width: 347px;
+        margin-left: 100px;
+    }
+
+    #shortCut li
+    {
+        display: inline-block;
+        margin-right: 25px;
+        float: left;
+        white-space: nowrap;
+    }
+
+    #shortCut li a
+    {
+        color: #b0adab;
+        text-decoration: none;
+    }
+
+    #shortCut li a:hover
+    {
+        color: #44a51c;
+        text-decoration: none;
+    }
+
+
+    /* end of header elements */
+
+    hr
+    {
+        background-color: #e0e0e0;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 15px 0px 15px 0px;
+    }
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+    table.valuelist
+    {
+        border-width: 0px 0px 1px 0px;
+        border-style: solid;
+        border-color: #b0adab;
+        border-collapse: collapse;
+        background-color: #f0f0f0; /*  border-bottom: solid 1px #b0adab;*/
+    }
+
+    table.valuelist th
+    {
+        border-width: 0px 0px 0px 0px;
+        padding: 4px;
+        color: #00732F;
+        font: 600 10pt/1 Verdana;
+    }
+
+    table.generic, table.annotated
+    {
+        border: none;
+        padding-left: 15px;
+        padding-right: 15px;
+        margin-bottom: 15px;
+    }
+
+
+    table td.memItemLeft
+    {
+        width: 180px;
+        padding: 2px 0px 0px 8px;
+        margin: 4px;
+        border-width: 1px;
+        border-color: #b0adab;
+        border-style: none;
+        font-size: 100%;
+        white-space: nowrap;
+    }
+
+    table td.memItemRight
+    {
+        padding: 2px 8px 0px 8px;
+        margin: 4px;
+        border-width: 1px;
+        border-color: #b0adab;
+        border-style: none;
+        font-size: 100%;
+    }
+
+    table tr.odd
+    {
+        background: #EBEBEB;
+        color: #66666E;
+    }
+
+    table tr.even
+    {
+        background: #F4F4F4;
+        color: #66666E;
+    }
+
+    table.annotated th
+    {
+        padding: 3px;
+        text-align: left;
+    }
+
+    table td, table th
+    {
+        padding: 3px; /*  border:solid 1px #FFFFFF;*/
+    }
+
+    table tr pre
+    {
+        padding-top: 0px;
+        padding-bottom: 0px;
+        padding-left: 0px;
+        padding-right: 0px;
+        border: none;
+        background: none;
+    }
+
+    tr.qt-style /* change me - widgets-sliders.html*/
+    {
+        background: #BCBCBC;
+        border-bottom: solid 1px #b0adab;
+    }
+
+    table tr.qt-code pre /* investigate */
+    {
+        padding: 0.2em;
+        border: #e7e7e7 1px solid;
+        background: #f1f1f1;
+        color: black;
+    }
+
+    span.preprocessor, span.preprocessor a
+    {
+        color: darkblue;
+    }
+
+    span.comment
+    {
+        color: darkred;
+        font-style: italic;
+    }
+
+    span.string, span.char
+    {
+        color: darkgreen;
+    }
+
+    .subtitle
+    {
+        font-size: 13px;
+    }
+
+    .small-subtitle
+    {
+        font-size: 13px;
+    }
+
+    .qmlitem
+    {
+        padding: 0;
+    }
+
+    .qmlname
+    {
+        white-space: nowrap;
+    }
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 160%;
+    }
+
+    .qmlproto
+    {
+        background-color: #eee;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #ddd;
+        font-weight: bold;
+        padding: 6px 10px 6px 10px;
+        margin: 42px 0px 0px 0px;
+    }
+
+    .qmlreadonly
+    {
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    *.qmlitem p
+    {
+    }
+
+
+    thead
+    {
+        margin-top: 5px;
+    }
+
+    td
+    {
+        padding: 5px;
+    }
+    th
+    {
+        padding: 5px;
+    }
+
+
+    #feedbackBox
+    {
+        display: none;
+        position: fixed;
+        left: 33%;
+        bottom: 200px;
+        height: 190px;
+        width: 400px;
+        padding: 5px;
+        background-color: #e6e7e8;
+        z-index: 4;
+    }
+
+    #feedcloseX a
+    {
+        padding-top: 5px;
+        padding-right: 5px;
+        color: #333333;
+        float: right;
+        text-decoration: none;
+    }
+
+    #feedbox
+    {
+        float: none;
+        width: 350px;
+        height: 120px;
+        margin-top: 5px;
+        margin-left: 25px;
+        margin-right: 25px;
+    }
+
+    #feedsubmit
+    {
+        float: right;
+        margin-top: 4px;
+        margin-right: 22px;
+    }
+
+    #blurpage
+    {
+        display: none;
+        position: fixed;
+        float: none;
+        top: 0px;
+        left: 0px;
+        right: 0px;
+        bottom: 0px;
+        background: transparent url(../images/feedbackground.png) 0 0;
+        z-index: 3;
+    }
+    /* page elements */
+    .toc
+    {
+        float: right;
+        border: solid 1px #666600;
+        background-color: #FFFFCC;
+        margin: 15px;
+        height: auto;
+        width: 200px;
+    }
+
+    .toc ul
+    {
+        float: left;
+        padding: 15px;
+    }
+
+    .content .toc li
+    {
+        font: normal 13px/1.2 Verdana;
+    }
+    
+    .relpage /* edit */
+    {
+        clear:both;
+        border: solid 1px #666600;
+        background-color: #FFFFCC;
+        height: auto;
+        width: 100%;                
+        }
+     .relpage ul
+     {
+        float:none;
+        padding: 15px;
+
+        }
+     .relpage li
+     {
+                font: normal 13px/1.2 Verdana;
+
+        }
+/* edit */
+    h3.fn, span.fn
+    {
+        background-color: #eee;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #ddd;
+        font-weight: bold;
+      /*  padding: 6px 0px 6px 10px;*/
+   /*     margin: 42px 0px 0px 0px;*/
+    }
+    /* edit */
+
+    .indexbox
+    {
+        /*   max-width:785px;*/
+        width: 100%; /*  margin-bottom: 30px;*/
+    }
+
+    .indexbox a
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+        .indexbox a:hover
+    {
+        color: #00732f;
+        text-decoration: underline;
+    }
+    .indexbox a:visited
+    {
+        color: #00732f;
+        text-decoration: none;
+    }
+
+    .indexboxcont
+    {
+        display: block;
+    }
+
+    .indexboxbar
+    {
+        background: transparent url(    "../images/horBar.png" ) repeat-x left bottom;
+        margin-bottom: 25px;
+    }
+
+    .indexboxcont .section
+    {
+        display: inline-block; /*Pål         padding-right: 20px;         padding-left: 10px; */
+        width: 49%;
+        *width:42%;
+        _width:42%;
+        padding:0 2% 0 1%;
+        vertical-align:top;
+}
+
+    .indexboxcont .indexIcon
+    { 
+        /*PÅL        width: 115px;*/
+        width: 13%;
+        *width:18%;
+        _width:18%;
+        overflow:hidden;
+}
+    .indexboxcont .section p
+    { /*PÅL        max-width: 350px;*/
+        padding-top: 20px;
+        padding-bottom: 20px;
+    }
+
+    .indexboxcont .sectionlist
+    {
+        display: inline-block;
+        width: 34%;
+        margin-right:-2px;
+        vertical-align:top;
+        padding: 0;
+    }
+    .tricol
+    {
+      /*  margin-left: 10px; *//*PÅL        padding-right:76px;*/
+    }
+    .indexboxcont .sectionlist ul
+    {
+        margin-bottom: 20px;
+    }
+
+    .indexboxcont .sectionlist ul li
+    {
+        line-height: 12px;
+    }
+
+    .lastcol
+    {
+        display: inline-block;
+        vertical-align:top;
+        padding: 0;
+        max-width: 25%;
+    }
+
+    .tricol .lastcol
+    {
+    }
+
+
+    /* end page elements */
+}
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        position: absolute;
+        top: 0px;
+        left: 0px;
+        background: none;
+        display: block;
+    }
+}
+/* end of print media */
diff --git a/tools/qdoc3/test/template/style/style_ie6.css b/tools/qdoc3/test/template/style/style_ie6.css
new file mode 100755
index 0000000..16fb850
--- /dev/null
+++ b/tools/qdoc3/test/template/style/style_ie6.css
@@ -0,0 +1,54 @@
+.indexbox, .indexboxcont, .group {
+  zoom: 1;
+  height: 1%;
+}
+
+.sidebar {
+  margin-left: 3px;
+  width: 199px;
+  overflow: hidden;
+}
+
+.sidebar .search form {
+  position: relative;
+}
+
+.sidebar .search form fieldset {
+  position: absolute;
+  margin-top: -1px;
+}
+
+.sidebar .search form input#searchstring  {
+  border: 1px solid #fff;
+  height: 18px;
+}
+
+.wrap {
+  zoom: 1;
+}
+
+.content,
+.toolbar {
+  zoom: 1;
+  margin-left: -3px;
+  position: relative;
+}
+
+.indexbox {
+  clear: both;
+}
+
+.indexboxcont .section {
+  zoom: 1;
+  float: left;
+}
+
+.indexboxcont .sectionlist {
+  zoom: 1;
+  float: left;
+}
+
+.wrap .toolbar .toolbuttons li {
+  text-indent: 0;
+  margin-right: 8px;
+}
\ No newline at end of file
diff --git a/tools/qdoc3/test/template/style/style_ie7.css b/tools/qdoc3/test/template/style/style_ie7.css
new file mode 100755
index 0000000..afbff5f
--- /dev/null
+++ b/tools/qdoc3/test/template/style/style_ie7.css
@@ -0,0 +1,19 @@
+.indexbox, .indexboxcont, .group {
+  min-height: 1px;
+}
+
+.sidebar .search form input#searchstring  {
+  border: 1px solid #fff;
+  height: 17px;
+}
+
+
+.indexboxcont .section {
+  zoom: 1;
+  float: left;
+}
+
+.indexboxcont .sectionlist {
+  zoom: 1;
+  float: left;
+}
diff --git a/tools/qdoc3/test/template/style/style_ie8.css b/tools/qdoc3/test/template/style/style_ie8.css
new file mode 100755
index 0000000..e69de29
-- 
cgit v0.12


From 600ec57606ef0c02a51f9875e0a201ff71d09c19 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 24 Mar 2010 13:19:38 +0100
Subject: Autotest: added more tests to macnativeevents

---
 tests/auto/macnativeevents/expectedeventlist.cpp   | 169 +++++++++
 tests/auto/macnativeevents/expectedeventlist.h     |  70 ++++
 tests/auto/macnativeevents/macnativeevents.pro     |   6 +-
 tests/auto/macnativeevents/nativeeventlist.cpp     | 107 ++++++
 tests/auto/macnativeevents/nativeeventlist.h       |  81 +++++
 tests/auto/macnativeevents/qnativeevents.cpp       | 378 ++++++++++++++++++++
 tests/auto/macnativeevents/qnativeevents.h         | 228 ++++++++++++
 tests/auto/macnativeevents/qnativeevents_mac.cpp   | 382 +++++++++++++++++++++
 tests/auto/macnativeevents/qnativeinput.cpp        | 378 --------------------
 tests/auto/macnativeevents/qnativeinput.h          | 228 ------------
 tests/auto/macnativeevents/qnativeinput_mac.cpp    | 382 ---------------------
 tests/auto/macnativeevents/qnativeplayer.cpp       | 139 --------
 tests/auto/macnativeevents/qnativeplayer.h         |  92 -----
 tests/auto/macnativeevents/tst_macnativeevents.cpp | 124 ++++++-
 14 files changed, 1534 insertions(+), 1230 deletions(-)
 create mode 100644 tests/auto/macnativeevents/expectedeventlist.cpp
 create mode 100644 tests/auto/macnativeevents/expectedeventlist.h
 create mode 100644 tests/auto/macnativeevents/nativeeventlist.cpp
 create mode 100644 tests/auto/macnativeevents/nativeeventlist.h
 create mode 100644 tests/auto/macnativeevents/qnativeevents.cpp
 create mode 100644 tests/auto/macnativeevents/qnativeevents.h
 create mode 100644 tests/auto/macnativeevents/qnativeevents_mac.cpp
 delete mode 100644 tests/auto/macnativeevents/qnativeinput.cpp
 delete mode 100644 tests/auto/macnativeevents/qnativeinput.h
 delete mode 100644 tests/auto/macnativeevents/qnativeinput_mac.cpp
 delete mode 100644 tests/auto/macnativeevents/qnativeplayer.cpp
 delete mode 100644 tests/auto/macnativeevents/qnativeplayer.h

diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/macnativeevents/expectedeventlist.cpp
new file mode 100644
index 0000000..48cfe1f
--- /dev/null
+++ b/tests/auto/macnativeevents/expectedeventlist.cpp
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "expectedeventlist.h"
+#include <QDebug>
+#include <QCoreApplication>
+#include <QAbstractEventDispatcher>
+#include <QtTest/QtTest>
+
+ExpectedEventList::ExpectedEventList(QObject *target)
+    : QObject(target), eventCount(0)
+{
+    target->installEventFilter(this);
+}
+
+ExpectedEventList::~ExpectedEventList()
+{
+    qDeleteAll(eventList);
+}
+
+void ExpectedEventList::append(QEvent *e)
+{
+    eventList.append(e);
+    ++eventCount;
+}
+
+void ExpectedEventList::timerEvent(QTimerEvent *)
+{
+    timer.stop();
+    QAbstractEventDispatcher::instance()->interrupt();
+}
+
+bool ExpectedEventList::waitForAllEvents(int maxEventWaitTime)
+{
+    if (eventList.isEmpty())
+        return true;
+
+    int eventCount = eventList.size();
+    timer.start(maxEventWaitTime, this);
+
+    while (timer.isActive()) {
+        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+        if (eventList.isEmpty())
+            return true;
+
+        if (eventCount < eventList.size()){
+            eventCount = eventList.size();
+            timer.start(maxEventWaitTime, this);
+        }
+    }
+
+    int eventListNr = eventCount - eventList.size() + 1;
+    qWarning() << "Stopped waiting for expected event nr" << eventListNr;
+    return false;
+}
+
+void ExpectedEventList::compareMouseEvents(QEvent *expected, QEvent *received)
+{
+    QMouseEvent *e1 = static_cast<QMouseEvent *>(expected);
+    QMouseEvent *e2 = static_cast<QMouseEvent *>(received);
+    if (e1->pos() == e2->pos()
+            && (e1->globalPos() == e2->globalPos())
+            && (e1->button() == e2->button())
+            && (e1->buttons() == e2->buttons())
+            && (e1->modifiers() == e2->modifiers()))
+        return; // equal
+
+    int eventListNr = eventCount - eventList.size();
+    qWarning() << "Expected event" << eventListNr << "about to fail:";
+    qWarning() << "Expected:" << e1;
+    qWarning() << "Received:" << e2;
+    QCOMPARE(e1->pos(), e2->pos());
+    QCOMPARE(e1->globalPos(), e2->globalPos());
+    QCOMPARE(e1->button(), e2->button());
+    QCOMPARE(e1->buttons(), e2->buttons());
+    QCOMPARE(e1->modifiers(), e2->modifiers());
+}
+
+void ExpectedEventList::compareKeyEvents(QEvent *event1, QEvent *event2)
+{
+    QKeyEvent *e1 = static_cast<QKeyEvent *>(event1);
+    QKeyEvent *e2 = static_cast<QKeyEvent *>(event2);
+    Q_UNUSED(e1);
+    Q_UNUSED(e2);
+}
+
+bool ExpectedEventList::eventFilter(QObject *, QEvent *received)
+{
+    if (eventList.isEmpty())
+        return false;
+
+    QEvent *expected = eventList.first();
+    if (expected->type() == received->type()) {
+        eventList.removeFirst();
+        switch (received->type()) {
+            case QEvent::MouseButtonPress:
+            case QEvent::MouseButtonRelease:
+            case QEvent::MouseMove:
+            case QEvent::MouseButtonDblClick:
+            case QEvent::NonClientAreaMouseButtonPress:
+            case QEvent::NonClientAreaMouseButtonRelease:
+            case QEvent::NonClientAreaMouseButtonDblClick:
+            case QEvent::NonClientAreaMouseMove: {
+                compareMouseEvents(expected, received);
+                break;
+            }
+            case QEvent::KeyPress: {
+                break;
+            }
+            case QEvent::KeyRelease: {
+                break;
+            }
+            case QEvent::Resize: {
+                break;
+            }
+            case QEvent::WindowActivate: {
+                break;
+            }
+            case QEvent::WindowDeactivate: {
+                break;
+            }
+            default:
+                break;
+        }
+        if (eventList.isEmpty())
+            QAbstractEventDispatcher::instance()->interrupt();
+    }
+
+    return false;
+}
+
diff --git a/tests/auto/macnativeevents/expectedeventlist.h b/tests/auto/macnativeevents/expectedeventlist.h
new file mode 100644
index 0000000..3bdbb67
--- /dev/null
+++ b/tests/auto/macnativeevents/expectedeventlist.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef EVENTFILTER
+#define EVENTFILTER
+
+#include <QWidget>
+#include <QList>
+#include <QEvent>
+#include <QBasicTimer>
+
+class ExpectedEventList : public QObject
+{
+    QList<QEvent *> eventList;
+    QBasicTimer timer;
+    int eventCount;
+    void timerEvent(QTimerEvent *);
+
+public:
+    ExpectedEventList(QObject *target);
+    ~ExpectedEventList();
+    void append(QEvent *e);
+    bool waitForAllEvents(int timeoutPerEvent = 2000);
+    bool eventFilter(QObject *obj, QEvent *event);
+
+private:
+    void compareMouseEvents(QEvent *event1, QEvent *event2);
+    void compareKeyEvents(QEvent *event1, QEvent *event2);
+};
+
+#endif
+
diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/macnativeevents/macnativeevents.pro
index a0293d4..af34942 100644
--- a/tests/auto/macnativeevents/macnativeevents.pro
+++ b/tests/auto/macnativeevents/macnativeevents.pro
@@ -8,9 +8,9 @@ DEPENDPATH += .
 INCLUDEPATH += .
 LIBS += -framework Carbon
 
-HEADERS += qnativeinput.h qnativeplayer.h
-SOURCES += qnativeinput.cpp qnativeplayer.cpp qnativeinput_mac.cpp
-
+HEADERS += qnativeevents.h nativeeventlist.h expectedeventlist.h
+SOURCES += qnativeevents.cpp qnativeevents_mac.cpp 
+SOURCES += expectedeventlist.cpp nativeeventlist.cpp
 SOURCES += tst_macnativeevents.cpp
 
 requires(mac)
diff --git a/tests/auto/macnativeevents/nativeeventlist.cpp b/tests/auto/macnativeevents/nativeeventlist.cpp
new file mode 100644
index 0000000..614e9d0
--- /dev/null
+++ b/tests/auto/macnativeevents/nativeeventlist.cpp
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "nativeeventlist.h"
+
+NativeEventList::NativeEventList(int defaultWaitMs)
+    : playbackMultiplier(1.0)
+    , currIndex(-1)
+    , wait(false)
+    , defaultWaitMs(defaultWaitMs)
+{
+}
+
+NativeEventList::~NativeEventList()
+{
+    for (int i=0; i<eventList.size(); i++)
+        delete eventList.takeAt(i).second;
+}
+
+void NativeEventList::sendNextEvent()
+{
+    QNativeEvent *e = eventList.at(currIndex).second;
+    if (e)
+        QNativeInput::sendNativeEvent(*e);
+    waitNextEvent();
+}
+
+void NativeEventList::waitNextEvent()
+{
+    if (++currIndex >= eventList.size()){
+        emit done();
+        stop();
+        return;
+    }
+
+    int interval = eventList.at(currIndex).first;
+    QTimer::singleShot(interval * playbackMultiplier, this, SLOT(sendNextEvent()));
+}
+
+void NativeEventList::append(QNativeEvent *event)
+{
+    eventList.append(QPair<int, QNativeEvent *>(defaultWaitMs, event));
+}
+
+void NativeEventList::append(int waitMs, QNativeEvent *event)
+{
+    eventList.append(QPair<int, QNativeEvent *>(waitMs, event));
+}
+
+void NativeEventList::append(int waitMs)
+{
+    eventList.append(QPair<int, QNativeEvent *>(waitMs, 0));
+}
+
+void NativeEventList::play(Playback playback)
+{
+    waitNextEvent();
+
+    wait = (playback == WaitUntilFinished);
+    while (wait)
+        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
+}
+
+void NativeEventList::stop()
+{
+    wait = false;
+    QAbstractEventDispatcher::instance()->interrupt();
+}
+
diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/macnativeevents/nativeeventlist.h
new file mode 100644
index 0000000..886ab78
--- /dev/null
+++ b/tests/auto/macnativeevents/nativeeventlist.h
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef Q_NATIVE_PLAYBACK
+#define Q_NATIVE_PLAYBACK
+
+#include <QtCore>
+#include "qnativeevents.h"
+
+class NativeEventList : public QObject
+{
+    Q_OBJECT;
+
+    public:
+    enum Playback {ReturnImmediately, WaitUntilFinished};
+
+    NativeEventList(int defaultWaitMs = 20);
+    ~NativeEventList();
+
+    void append(QNativeEvent *event);
+    void append(int waitMs, QNativeEvent *event = 0);
+    void append(int waitMs);
+
+    void play(Playback playback = WaitUntilFinished);
+    void stop();
+    float playbackMultiplier;
+
+signals:
+    void done();
+
+private slots:
+    void sendNextEvent();
+
+private:
+    void waitNextEvent();
+
+    QList<QPair<int, QNativeEvent *> > eventList;
+    int currIndex;
+    bool wait;
+    int defaultWaitMs;
+};
+
+#endif
diff --git a/tests/auto/macnativeevents/qnativeevents.cpp b/tests/auto/macnativeevents/qnativeevents.cpp
new file mode 100644
index 0000000..cb4b82e
--- /dev/null
+++ b/tests/auto/macnativeevents/qnativeevents.cpp
@@ -0,0 +1,378 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qnativeevents.h"
+
+QNativeInput::QNativeInput(bool subscribe)
+{
+    if (subscribe)
+        subscribeForNativeEvents();
+}
+
+QNativeInput::~QNativeInput()
+{
+    unsubscribeForNativeEvents();
+}
+
+void QNativeInput::notify(QNativeEvent *event)
+{
+    nativeEvent(event);
+}
+
+void QNativeInput::nativeEvent(QNativeEvent *event)
+{
+    switch (event->id()){
+        case QNativeMouseButtonEvent::eventId:{
+            QNativeMouseButtonEvent *e = static_cast<QNativeMouseButtonEvent *>(event);
+            (e->clickCount > 0) ? nativeMousePressEvent(e) : nativeMouseReleaseEvent(e);
+            break; }
+        case QNativeMouseMoveEvent::eventId:
+            nativeMouseMoveEvent(static_cast<QNativeMouseMoveEvent *>(event));
+            break;
+        case QNativeMouseDragEvent::eventId:
+            nativeMouseDragEvent(static_cast<QNativeMouseDragEvent *>(event));
+            break;
+        case QNativeMouseWheelEvent::eventId:
+            nativeMouseWheelEvent(static_cast<QNativeMouseWheelEvent *>(event));
+            break;
+        case QNativeKeyEvent::eventId:{
+            QNativeKeyEvent *e = static_cast<QNativeKeyEvent *>(event);
+            e->press ? nativeKeyPressEvent(e) : nativeKeyReleaseEvent(e);
+            break; }
+        case QNativeModifierEvent::eventId:
+            nativeModifierEvent(static_cast<QNativeModifierEvent *>(event));
+            break;
+        default:
+            break;
+    }
+}
+
+Qt::Native::Status QNativeInput::sendNativeEvent(const QNativeEvent &event, int pid)
+{
+    switch (event.id()){
+        case QNativeMouseMoveEvent::eventId:
+            return sendNativeMouseMoveEvent(static_cast<const QNativeMouseMoveEvent &>(event));
+        case QNativeMouseButtonEvent::eventId:
+            return sendNativeMouseButtonEvent(static_cast<const QNativeMouseButtonEvent &>(event));
+        case QNativeMouseDragEvent::eventId:
+            return sendNativeMouseDragEvent(static_cast<const QNativeMouseDragEvent &>(event));
+        case QNativeMouseWheelEvent::eventId:
+            return sendNativeMouseWheelEvent(static_cast<const QNativeMouseWheelEvent &>(event));
+        case QNativeKeyEvent::eventId:
+            return sendNativeKeyEvent(static_cast<const QNativeKeyEvent &>(event), pid);
+        case QNativeModifierEvent::eventId:
+            return sendNativeModifierEvent(static_cast<const QNativeModifierEvent &>(event));
+        case QNativeEvent::eventId:
+            qWarning() << "Warning: Cannot send a pure native event. Use a sub class.";
+        default:
+            return Qt::Native::Failure;
+    }
+}
+
+QNativeEvent::QNativeEvent(Qt::KeyboardModifiers modifiers)
+    : modifiers(modifiers){}
+
+QNativeMouseEvent::QNativeMouseEvent(QPoint pos, Qt::KeyboardModifiers modifiers)
+    : QNativeEvent(modifiers), globalPos(pos){}
+
+QNativeMouseMoveEvent::QNativeMouseMoveEvent(QPoint pos, Qt::KeyboardModifiers modifiers)
+    : QNativeMouseEvent(pos, modifiers){}
+
+QNativeMouseButtonEvent::QNativeMouseButtonEvent(QPoint globalPos, Qt::MouseButton button, int clickCount, Qt::KeyboardModifiers modifiers)
+    : QNativeMouseEvent(globalPos, modifiers), button(button), clickCount(clickCount){}
+
+QNativeMouseDragEvent::QNativeMouseDragEvent(QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers)
+    : QNativeMouseButtonEvent(globalPos, button, true, modifiers){}
+
+QNativeMouseWheelEvent::QNativeMouseWheelEvent(QPoint globalPos, int delta, Qt::KeyboardModifiers modifiers)
+    : QNativeMouseEvent(globalPos, modifiers), delta(delta){}
+
+QNativeKeyEvent::QNativeKeyEvent(int nativeKeyCode, bool press, Qt::KeyboardModifiers modifiers)
+    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode), press(press), character(QChar()){}
+
+QNativeModifierEvent::QNativeModifierEvent(Qt::KeyboardModifiers modifiers, int nativeKeyCode)
+    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode){}
+
+QNativeKeyEvent::QNativeKeyEvent(int nativeKeyCode, bool press, QChar character, Qt::KeyboardModifiers modifiers)
+    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode), press(press), character(character){}
+
+static QString getButtonAsString(const QNativeMouseButtonEvent *e)
+{
+    switch (e->button){
+        case Qt::LeftButton:
+            return "button = LeftButton";
+            break;
+        case Qt::RightButton:
+            return "button = RightButton";
+            break;
+        case Qt::MidButton:
+            return "button = MidButton";
+            break;
+        default:
+            return "button = Other";
+            break;
+    }
+}
+
+static QString getModifiersAsString(const QNativeEvent *e)
+{
+    if (e->modifiers == 0)
+        return "modifiers = none";
+
+    QString tmp = "modifiers = ";
+    if (e->modifiers.testFlag(Qt::ShiftModifier))
+        tmp += "Shift";
+    if (e->modifiers.testFlag(Qt::ControlModifier))
+        tmp += "Control";
+    if (e->modifiers.testFlag(Qt::AltModifier))
+        tmp += "Alt";
+    if (e->modifiers.testFlag(Qt::MetaModifier))
+        tmp += "Meta";
+    return tmp;
+}
+
+static QString getPosAsString(QPoint pos)
+{
+    return QString("QPoint(%1, %2)").arg(pos.x()).arg(pos.y());
+}
+
+static QString getBoolAsString(bool b)
+{
+    return b ? QString("true") : QString("false");
+}
+
+QString QNativeMouseMoveEvent::toString() const
+{
+    return QString("QNativeMouseMoveEvent(globalPos = %1 %2)").arg(getPosAsString(globalPos))
+        .arg(getModifiersAsString(this));
+}
+
+QString QNativeMouseButtonEvent::toString() const
+{
+    return QString("QNativeMouseButtonEvent(globalPos = %1, %2, clickCount = %3, %4)").arg(getPosAsString(globalPos))
+        .arg(getButtonAsString(this)).arg(clickCount).arg(getModifiersAsString(this));
+}
+
+QString QNativeMouseDragEvent::toString() const
+{
+    return QString("QNativeMouseDragEvent(globalPos = %1, %2, clickCount = %3, %4)").arg(getPosAsString(globalPos))
+    .arg(getButtonAsString(this)).arg(clickCount).arg(getModifiersAsString(this));
+}
+
+QString QNativeMouseWheelEvent::toString() const
+{
+    return QString("QNativeMouseWheelEvent(globalPos = %1, delta = %2, %3)").arg(getPosAsString(globalPos))
+        .arg(delta).arg(getModifiersAsString(this));
+}
+
+QString QNativeKeyEvent::toString() const
+{
+    return QString("QNativeKeyEvent(press = %1, native key code = %2, character = %3, %4)").arg(getBoolAsString(press))
+        .arg(nativeKeyCode).arg(character.isPrint() ? character : QString("<no char>"))
+        .arg(getModifiersAsString(this));
+}
+
+QString QNativeModifierEvent::toString() const
+{
+    return QString("QNativeModifierEvent(%1, native key code = %2)").arg(getModifiersAsString(this))
+        .arg(nativeKeyCode);
+}
+
+QDebug operator<<(QDebug d, QNativeEvent *e)
+{
+    Q_UNUSED(e);
+    return d << e->toString();
+}
+
+QDebug operator<<(QDebug d, const QNativeEvent &e)
+{
+    Q_UNUSED(e);
+    return d << e.toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeEvent *e)
+{
+    return s << e->eventId << " " << e->modifiers << " QNativeEvent";
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeMouseEvent *e)
+{
+    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeMouseMoveEvent *e)
+{
+    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeMouseButtonEvent *e)
+{
+    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->button
+        << " " << e->clickCount << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeMouseDragEvent *e)
+{
+    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->button << " " << e->clickCount
+        << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeMouseWheelEvent *e)
+{
+    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->delta
+        << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeKeyEvent *e)
+{
+    return s << e->eventId << " " << e->press << " " << e->nativeKeyCode << " " << e->character
+        << " " << e->modifiers << " " << e->toString();
+}
+
+QTextStream &operator<<(QTextStream &s, QNativeModifierEvent *e)
+{
+    return s << e->eventId << " " << e->modifiers << " " << e->nativeKeyCode << " " << e->toString();
+}
+
+
+
+
+QTextStream &operator>>(QTextStream &s, QNativeMouseMoveEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int x, y, modifiers;
+    s >> x >> y >> modifiers >> humanReadable;
+    e->globalPos.setX(x);
+    e->globalPos.setY(y);
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    return s;
+}
+
+QTextStream &operator>>(QTextStream &s, QNativeMouseButtonEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int x, y, button, clickCount, modifiers;
+    s >> x >> y >> button >> clickCount >> modifiers >> humanReadable;
+    e->globalPos.setX(x);
+    e->globalPos.setY(y);
+    e->clickCount = clickCount;
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    switch (button){
+        case 1:
+            e->button = Qt::LeftButton;
+            break;
+        case 2:
+            e->button = Qt::RightButton;
+            break;
+        case 3:
+            e->button = Qt::MidButton;
+            break;
+        default:
+            e->button = Qt::NoButton;
+            break;
+    }
+    return s;
+}
+
+QTextStream &operator>>(QTextStream &s, QNativeMouseDragEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int x, y, button, clickCount, modifiers;
+    s >> x >> y >> button >> clickCount >> modifiers >> humanReadable;
+    e->globalPos.setX(x);
+    e->globalPos.setY(y);
+    e->clickCount = clickCount;
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    switch (button){
+        case 1:
+            e->button = Qt::LeftButton;
+            break;
+        case 2:
+            e->button = Qt::RightButton;
+            break;
+        case 3:
+            e->button = Qt::MidButton;
+            break;
+        default:
+            e->button = Qt::NoButton;
+            break;
+    }
+    return s;
+}
+
+QTextStream &operator>>(QTextStream &s, QNativeMouseWheelEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int x, y, modifiers;
+    s >> x >> y >> e->delta >> modifiers >> humanReadable;
+    e->globalPos.setX(x);
+    e->globalPos.setY(y);
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    return s;
+}
+
+QTextStream &operator>>(QTextStream &s, QNativeKeyEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int press, modifiers;
+    QString character;
+    s >> press >> e->nativeKeyCode >> character >> modifiers >> humanReadable;
+    e->press = bool(press);
+    e->character = character[0];
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    return s;
+}
+
+QTextStream &operator>>(QTextStream &s, QNativeModifierEvent *e)
+{
+    // Skip reading eventId.
+    QString humanReadable;
+    int modifiers;
+    s >> modifiers >> e->nativeKeyCode >> humanReadable;
+    e->modifiers = Qt::KeyboardModifiers(modifiers);
+    return s;
+}
+
diff --git a/tests/auto/macnativeevents/qnativeevents.h b/tests/auto/macnativeevents/qnativeevents.h
new file mode 100644
index 0000000..a98e4e4
--- /dev/null
+++ b/tests/auto/macnativeevents/qnativeevents.h
@@ -0,0 +1,228 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef Q_NATIVE_INPUT
+#define Q_NATIVE_INPUT
+
+#include <QtCore>
+
+namespace Qt {
+namespace Native {
+    enum Status {Success, Failure};
+}}
+
+// ----------------------------------------------------------------------------
+// Declare a set of native events that can be used to communicate with
+// client applications in an platform independent way
+// ----------------------------------------------------------------------------
+
+class QNativeEvent
+{
+public:
+    static const int eventId = 1;
+
+    QNativeEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const = 0;
+    Qt::KeyboardModifiers modifiers; // Yields for mouse events too.
+};
+
+class QNativeMouseEvent : public QNativeEvent {
+public:
+    static const int eventId = 2;
+
+    QNativeMouseEvent(){};
+    QNativeMouseEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeMouseEvent(){};
+    virtual int id() const { return eventId; };
+
+    QPoint globalPos;
+};
+
+class QNativeMouseMoveEvent : public QNativeMouseEvent {
+public:
+    static const int eventId = 4;
+
+    QNativeMouseMoveEvent(){};
+    QNativeMouseMoveEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeMouseMoveEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+};
+
+class QNativeMouseButtonEvent : public QNativeMouseEvent {
+public:
+    static const int eventId = 8;
+
+    QNativeMouseButtonEvent(){};
+    QNativeMouseButtonEvent(QPoint globalPos, Qt::MouseButton button, int clickCount, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeMouseButtonEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+
+    Qt::MouseButton button;
+    int clickCount;
+};
+
+class QNativeMouseDragEvent : public QNativeMouseButtonEvent {
+public:
+    static const int eventId = 16;
+
+    QNativeMouseDragEvent(){};
+    QNativeMouseDragEvent(QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeMouseDragEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+};
+
+class QNativeMouseWheelEvent : public QNativeMouseEvent {
+public:
+    static const int eventId = 32;
+
+    QNativeMouseWheelEvent(){};
+    QNativeMouseWheelEvent(QPoint globalPos, int delta, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    virtual ~QNativeMouseWheelEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+
+    int delta;
+};
+
+class QNativeKeyEvent : public QNativeEvent {
+    public:
+    static const int eventId = 64;
+
+    QNativeKeyEvent(){};
+    QNativeKeyEvent(int nativeKeyCode, bool press, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+    QNativeKeyEvent(int nativeKeyCode, bool press, QChar character, Qt::KeyboardModifiers modifiers);
+    virtual ~QNativeKeyEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+
+    int nativeKeyCode;
+    bool press;
+    QChar character;
+
+    // Some Qt to Native mappings:
+    static int Key_A;
+    static int Key_B;
+    static int Key_C;
+    static int Key_1;
+    static int Key_Backspace;
+    static int Key_Enter;
+    static int Key_Del;
+};
+
+class QNativeModifierEvent : public QNativeEvent {
+public:
+    static const int eventId = 128;
+
+    QNativeModifierEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier, int nativeKeyCode = 0);
+    virtual ~QNativeModifierEvent(){};
+    virtual int id() const { return eventId; };
+    virtual QString toString() const;
+
+    int nativeKeyCode;
+};
+
+// ----------------------------------------------------------------------------
+// Declare a set of related output / input functions for convenience:
+// ----------------------------------------------------------------------------
+
+QDebug operator<<(QDebug d, QNativeEvent *e);
+QDebug operator<<(QDebug d, const QNativeEvent &e);
+
+QTextStream &operator<<(QTextStream &s, QNativeEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeMouseEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeMouseMoveEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeMouseButtonEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeMouseDragEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeMouseWheelEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeKeyEvent *e);
+QTextStream &operator<<(QTextStream &s, QNativeModifierEvent *e);
+
+QTextStream &operator>>(QTextStream &s, QNativeMouseMoveEvent *e);
+QTextStream &operator>>(QTextStream &s, QNativeMouseButtonEvent *e);
+QTextStream &operator>>(QTextStream &s, QNativeMouseDragEvent *e);
+QTextStream &operator>>(QTextStream &s, QNativeMouseWheelEvent *e);
+QTextStream &operator>>(QTextStream &s, QNativeKeyEvent *e);
+QTextStream &operator>>(QTextStream &s, QNativeModifierEvent *e);
+
+// ----------------------------------------------------------------------------
+// Declare the main class that is supposed to be sub-classed by components
+// that are to receive native events
+// ----------------------------------------------------------------------------
+
+class QNativeInput
+{
+    public:
+    QNativeInput(bool subscribe = true);
+    virtual ~QNativeInput();
+
+    // Callback methods. Should be implemented by interested sub-classes:
+    void notify(QNativeEvent *event);
+    virtual void nativeEvent(QNativeEvent *event);
+    virtual void nativeMousePressEvent(QNativeMouseButtonEvent *){};
+    virtual void nativeMouseReleaseEvent(QNativeMouseButtonEvent *){};
+    virtual void nativeMouseMoveEvent(QNativeMouseMoveEvent *){};
+    virtual void nativeMouseDragEvent(QNativeMouseDragEvent *){};
+    virtual void nativeMouseWheelEvent(QNativeMouseWheelEvent *){};
+    virtual void nativeKeyPressEvent(QNativeKeyEvent *){};
+    virtual void nativeKeyReleaseEvent(QNativeKeyEvent *){};
+    virtual void nativeModifierEvent(QNativeModifierEvent *){};
+
+    // The following methods will differ in implementation from OS to OS:
+    static Qt::Native::Status sendNativeMouseButtonEvent(const QNativeMouseButtonEvent &event);
+    static Qt::Native::Status sendNativeMouseMoveEvent(const QNativeMouseMoveEvent &event);
+    static Qt::Native::Status sendNativeMouseDragEvent(const QNativeMouseDragEvent &event);
+    static Qt::Native::Status sendNativeMouseWheelEvent(const QNativeMouseWheelEvent &event);
+    static Qt::Native::Status sendNativeKeyEvent(const QNativeKeyEvent &event, int pid = 0);
+    static Qt::Native::Status sendNativeModifierEvent(const QNativeModifierEvent &event);
+    // sendNativeEvent will NOT differ from OS to OS.
+    static Qt::Native::Status sendNativeEvent(const QNativeEvent &event, int pid = 0);
+
+    // The following methods will differ in implementation from OS to OS:
+    Qt::Native::Status subscribeForNativeEvents();
+    Qt::Native::Status unsubscribeForNativeEvents();
+};
+
+#endif // Q_NATIVE_INPUT
diff --git a/tests/auto/macnativeevents/qnativeevents_mac.cpp b/tests/auto/macnativeevents/qnativeevents_mac.cpp
new file mode 100644
index 0000000..6c04bf3
--- /dev/null
+++ b/tests/auto/macnativeevents/qnativeevents_mac.cpp
@@ -0,0 +1,382 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qnativeevents.h"
+#include <Carbon/Carbon.h>
+#include <QtCore>
+
+//  ************************************************************
+//  Quartz
+//  ************************************************************
+
+static Qt::KeyboardModifiers getModifiersFromQuartzEvent(CGEventRef inEvent)
+{
+    Qt::KeyboardModifiers m;
+    CGEventFlags flags = CGEventGetFlags(inEvent);
+    if (flags & kCGEventFlagMaskShift || flags & kCGEventFlagMaskAlphaShift)
+        m |= Qt::ShiftModifier;
+    if (flags & kCGEventFlagMaskControl)
+        m |= Qt::MetaModifier;
+    if (flags & kCGEventFlagMaskAlternate)
+        m |= Qt::AltModifier;
+    if (flags & kCGEventFlagMaskCommand)
+        m |= Qt::ControlModifier;
+    return m;
+}
+
+static void setModifiersFromQNativeEvent(CGEventRef inEvent, const QNativeEvent &event)
+{
+    CGEventFlags flags = 0;
+    if (event.modifiers.testFlag(Qt::ShiftModifier))
+        flags |= kCGEventFlagMaskShift;
+    if (event.modifiers.testFlag(Qt::MetaModifier))
+        flags |= kCGEventFlagMaskControl;
+    if (event.modifiers.testFlag(Qt::AltModifier))
+        flags |= kCGEventFlagMaskAlternate;
+    if (event.modifiers.testFlag(Qt::ControlModifier))
+        flags |= kCGEventFlagMaskCommand;
+    CGEventSetFlags(inEvent, flags);
+}
+
+static QPoint getMouseLocationFromQuartzEvent(CGEventRef inEvent)
+{
+    CGPoint pos = CGEventGetLocation(inEvent);
+    QPoint tmp;
+    tmp.setX(pos.x);
+    tmp.setY(pos.y);
+    return tmp;
+}
+
+static QChar getCharFromQuartzEvent(CGEventRef inEvent)
+{
+    UniCharCount count = 0;
+    UniChar c;
+    CGEventKeyboardGetUnicodeString(inEvent, 1, &count, &c);
+    return QChar(c);
+}
+
+static CGEventRef EventHandler_Quartz(CGEventTapProxy proxy, CGEventType type, CGEventRef inEvent, void *refCon)
+{
+    Q_UNUSED(proxy);
+    QNativeInput *nativeInput = static_cast<QNativeInput *>(refCon);
+    switch (type){
+        case kCGEventKeyDown:{
+            QNativeKeyEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
+            e.character = getCharFromQuartzEvent(inEvent);
+            e.press = true;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventKeyUp:{
+            QNativeKeyEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
+            e.character = getCharFromQuartzEvent(inEvent);
+            e.press = false;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventLeftMouseDown:{
+            QNativeMouseButtonEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
+            e.button = Qt::LeftButton;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventLeftMouseUp:{
+            QNativeMouseButtonEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            e.clickCount = 0;
+            e.button = Qt::LeftButton;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventRightMouseDown:{
+            QNativeMouseButtonEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
+            e.button = Qt::RightButton;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventRightMouseUp:{
+            QNativeMouseButtonEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            e.clickCount = 0;
+            e.button = Qt::RightButton;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventMouseMoved:{
+            QNativeMouseMoveEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventLeftMouseDragged:{
+            QNativeMouseDragEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
+            e.button = Qt::LeftButton;
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventScrollWheel:{
+            QNativeMouseWheelEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.delta = CGEventGetIntegerValueField(inEvent, kCGScrollWheelEventDeltaAxis1);
+            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
+            nativeInput->notify(&e);
+            break;
+        }
+        case kCGEventFlagsChanged:{
+            QNativeModifierEvent e;
+            e.modifiers = getModifiersFromQuartzEvent(inEvent);
+            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
+            nativeInput->notify(&e);
+            break;
+        }
+
+    }
+
+    return inEvent;
+}
+
+Qt::Native::Status insertEventHandler_Quartz(QNativeInput *nativeInput, int pid = 0)
+{
+    uid_t uid = geteuid();
+    if (uid != 0)
+        qWarning("MacNativeEvents: You must be root to listen for key events!");
+
+    CFMachPortRef port;
+    if (!pid){
+        port = CGEventTapCreate(kCGHIDEventTap,
+            kCGHeadInsertEventTap, kCGEventTapOptionListenOnly,
+            kCGEventMaskForAllEvents, EventHandler_Quartz, nativeInput);
+    } else {
+        ProcessSerialNumber psn;
+        GetProcessForPID(pid, &psn);
+        port = CGEventTapCreateForPSN(&psn,
+            kCGHeadInsertEventTap, kCGEventTapOptionListenOnly,
+            kCGEventMaskForAllEvents, EventHandler_Quartz, nativeInput);
+    }
+
+    CFRunLoopSourceRef eventSrc = CFMachPortCreateRunLoopSource(NULL, port, 0);
+    CFRunLoopAddSource((CFRunLoopRef) GetCFRunLoopFromEventLoop(GetMainEventLoop()),
+        eventSrc, kCFRunLoopCommonModes);
+
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status removeEventHandler_Quartz()
+{
+    return Qt::Native::Success; // ToDo:
+}
+
+Qt::Native::Status sendNativeKeyEventToProcess_Quartz(const QNativeKeyEvent &event, int pid)
+{
+    ProcessSerialNumber psn;
+    GetProcessForPID(pid, &psn);
+
+    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, event.press);
+    setModifiersFromQNativeEvent(e, event);
+    SetFrontProcess(&psn);
+    CGEventPostToPSN(&psn, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeKeyEvent_Quartz(const QNativeKeyEvent &event)
+{
+    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, event.press);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeMouseMoveEvent_Quartz(const QNativeMouseMoveEvent &event)
+{
+    CGPoint pos;
+    pos.x = event.globalPos.x();
+    pos.y = event.globalPos.y();
+
+    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeMouseButtonEvent_Quartz(const QNativeMouseButtonEvent &event)
+{
+    CGPoint pos;
+    pos.x = event.globalPos.x();
+    pos.y = event.globalPos.y();
+
+    CGEventType type = 0;
+    if (event.button == Qt::LeftButton)
+        type = (event.clickCount > 0) ? kCGEventLeftMouseDown : kCGEventLeftMouseUp;
+    else if (event.button == Qt::RightButton)
+        type = (event.clickCount > 0) ? kCGEventRightMouseDown : kCGEventRightMouseUp;
+    else
+        type = (event.clickCount > 0) ? kCGEventOtherMouseDown : kCGEventOtherMouseUp;
+
+    CGEventRef e = CGEventCreateMouseEvent(0, type, pos, event.button);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventSetIntegerValueField(e, kCGMouseEventClickState, event.clickCount);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeMouseDragEvent_Quartz(const QNativeMouseDragEvent &event)
+{
+    CGPoint pos;
+    pos.x = event.globalPos.x();
+    pos.y = event.globalPos.y();
+
+    CGEventType type = 0;
+    if (event.button == Qt::LeftButton)
+        type = kCGEventLeftMouseDragged;
+    else if (event.button == Qt::RightButton)
+        type = kCGEventRightMouseDragged;
+    else
+        type = kCGEventOtherMouseDragged;
+
+    CGEventRef e = CGEventCreateMouseEvent(0, type, pos, event.button);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeMouseWheelEvent_Quartz(const QNativeMouseWheelEvent &event)
+{
+    CGPoint pos;
+    pos.x = event.globalPos.x();
+    pos.y = event.globalPos.y();
+
+    CGEventRef e = CGEventCreateScrollWheelEvent(0, kCGScrollEventUnitPixel, 1, 0);
+    CGEventSetIntegerValueField(e, kCGScrollWheelEventDeltaAxis1, event.delta);
+    CGEventSetLocation(e, pos);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+
+    return Qt::Native::Success;
+}
+
+Qt::Native::Status sendNativeModifierEvent_Quartz(const QNativeModifierEvent &event)
+{
+    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, 0);
+    CGEventSetType(e, kCGEventFlagsChanged);
+    setModifiersFromQNativeEvent(e, event);
+    CGEventPost(kCGHIDEventTap, e);
+    CFRelease(e);
+    return Qt::Native::Success;
+}
+
+//  ************************************************************
+//  QNativeInput methods:
+//  ************************************************************
+
+Qt::Native::Status QNativeInput::sendNativeMouseButtonEvent(const QNativeMouseButtonEvent &event)
+{
+    return sendNativeMouseButtonEvent_Quartz(event);
+}
+
+Qt::Native::Status QNativeInput::sendNativeMouseMoveEvent(const QNativeMouseMoveEvent &event)
+{
+    return sendNativeMouseMoveEvent_Quartz(event);
+}
+
+Qt::Native::Status QNativeInput::sendNativeMouseDragEvent(const QNativeMouseDragEvent &event)
+{
+    return sendNativeMouseDragEvent_Quartz(event);
+}
+
+Qt::Native::Status QNativeInput::sendNativeMouseWheelEvent(const QNativeMouseWheelEvent &event)
+{
+    return sendNativeMouseWheelEvent_Quartz(event);
+}
+
+Qt::Native::Status QNativeInput::sendNativeKeyEvent(const QNativeKeyEvent &event, int pid)
+{
+    if (!pid)
+        return sendNativeKeyEvent_Quartz(event);
+    else
+        return sendNativeKeyEventToProcess_Quartz(event, pid);
+}
+
+Qt::Native::Status QNativeInput::sendNativeModifierEvent(const QNativeModifierEvent &event)
+{
+    return sendNativeModifierEvent_Quartz(event);
+}
+
+Qt::Native::Status QNativeInput::subscribeForNativeEvents()
+{
+    return insertEventHandler_Quartz(this);
+}
+
+Qt::Native::Status QNativeInput::unsubscribeForNativeEvents()
+{
+    return removeEventHandler_Quartz();
+}
+
+// Some Qt to Mac mappings:
+int QNativeKeyEvent::Key_A = 0;
+int QNativeKeyEvent::Key_B = 11;
+int QNativeKeyEvent::Key_C = 8;
+int QNativeKeyEvent::Key_1 = 18;
+int QNativeKeyEvent::Key_Backspace = 51;
+int QNativeKeyEvent::Key_Enter = 36;
+int QNativeKeyEvent::Key_Del = 117;
+
diff --git a/tests/auto/macnativeevents/qnativeinput.cpp b/tests/auto/macnativeevents/qnativeinput.cpp
deleted file mode 100644
index c9462a6..0000000
--- a/tests/auto/macnativeevents/qnativeinput.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnativeinput.h"
-
-QNativeInput::QNativeInput(bool subscribe)
-{
-    if (subscribe)
-        subscribeForNativeEvents();
-}
-
-QNativeInput::~QNativeInput()
-{
-    unsubscribeForNativeEvents();
-}
-
-void QNativeInput::notify(QNativeEvent *event)
-{
-    nativeEvent(event);
-}
-
-void QNativeInput::nativeEvent(QNativeEvent *event)
-{
-    switch (event->id()){
-        case QNativeMouseButtonEvent::eventId:{
-            QNativeMouseButtonEvent *e = static_cast<QNativeMouseButtonEvent *>(event);
-            (e->clickCount > 0) ? nativeMousePressEvent(e) : nativeMouseReleaseEvent(e);
-            break; }
-        case QNativeMouseMoveEvent::eventId:
-            nativeMouseMoveEvent(static_cast<QNativeMouseMoveEvent *>(event));
-            break;
-        case QNativeMouseDragEvent::eventId:
-            nativeMouseDragEvent(static_cast<QNativeMouseDragEvent *>(event));
-            break;
-        case QNativeMouseWheelEvent::eventId:
-            nativeMouseWheelEvent(static_cast<QNativeMouseWheelEvent *>(event));
-            break;
-        case QNativeKeyEvent::eventId:{
-            QNativeKeyEvent *e = static_cast<QNativeKeyEvent *>(event);
-            e->press ? nativeKeyPressEvent(e) : nativeKeyReleaseEvent(e);
-            break; }
-        case QNativeModifierEvent::eventId:
-            nativeModifierEvent(static_cast<QNativeModifierEvent *>(event));
-            break;
-        default:
-            break;
-    }
-}
-
-Qt::Native::Status QNativeInput::sendNativeEvent(const QNativeEvent &event, int pid)
-{
-    switch (event.id()){
-        case QNativeMouseMoveEvent::eventId:
-            return sendNativeMouseMoveEvent(static_cast<const QNativeMouseMoveEvent &>(event));
-        case QNativeMouseButtonEvent::eventId:
-            return sendNativeMouseButtonEvent(static_cast<const QNativeMouseButtonEvent &>(event));
-        case QNativeMouseDragEvent::eventId:
-            return sendNativeMouseDragEvent(static_cast<const QNativeMouseDragEvent &>(event));
-        case QNativeMouseWheelEvent::eventId:
-            return sendNativeMouseWheelEvent(static_cast<const QNativeMouseWheelEvent &>(event));
-        case QNativeKeyEvent::eventId:
-            return sendNativeKeyEvent(static_cast<const QNativeKeyEvent &>(event), pid);
-        case QNativeModifierEvent::eventId:
-            return sendNativeModifierEvent(static_cast<const QNativeModifierEvent &>(event));
-        case QNativeEvent::eventId:
-            qWarning() << "Warning: Cannot send a pure native event. Use a sub class.";
-        default:
-            return Qt::Native::Failure;
-    }
-}
-
-QNativeEvent::QNativeEvent(Qt::KeyboardModifiers modifiers)
-    : modifiers(modifiers){}
-
-QNativeMouseEvent::QNativeMouseEvent(QPoint pos, Qt::KeyboardModifiers modifiers)
-    : QNativeEvent(modifiers), globalPos(pos){}
-
-QNativeMouseMoveEvent::QNativeMouseMoveEvent(QPoint pos, Qt::KeyboardModifiers modifiers)
-    : QNativeMouseEvent(pos, modifiers){}
-
-QNativeMouseButtonEvent::QNativeMouseButtonEvent(QPoint globalPos, Qt::MouseButton button, int clickCount, Qt::KeyboardModifiers modifiers)
-    : QNativeMouseEvent(globalPos, modifiers), button(button), clickCount(clickCount){}
-
-QNativeMouseDragEvent::QNativeMouseDragEvent(QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers)
-    : QNativeMouseButtonEvent(globalPos, button, true, modifiers){}
-
-QNativeMouseWheelEvent::QNativeMouseWheelEvent(QPoint globalPos, int delta, Qt::KeyboardModifiers modifiers)
-    : QNativeMouseEvent(globalPos, modifiers), delta(delta){}
-
-QNativeKeyEvent::QNativeKeyEvent(int nativeKeyCode, bool press, Qt::KeyboardModifiers modifiers)
-    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode), press(press), character(QChar()){}
-
-QNativeModifierEvent::QNativeModifierEvent(Qt::KeyboardModifiers modifiers, int nativeKeyCode)
-    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode){}
-
-QNativeKeyEvent::QNativeKeyEvent(int nativeKeyCode, bool press, QChar character, Qt::KeyboardModifiers modifiers)
-    : QNativeEvent(modifiers), nativeKeyCode(nativeKeyCode), press(press), character(character){}
-
-static QString getButtonAsString(const QNativeMouseButtonEvent *e)
-{
-    switch (e->button){
-        case Qt::LeftButton:
-            return "button = LeftButton";
-            break;
-        case Qt::RightButton:
-            return "button = RightButton";
-            break;
-        case Qt::MidButton:
-            return "button = MidButton";
-            break;
-        default:
-            return "button = Other";
-            break;
-    }
-}
-
-static QString getModifiersAsString(const QNativeEvent *e)
-{
-    if (e->modifiers == 0)
-        return "modifiers = none";
-
-    QString tmp = "modifiers = ";
-    if (e->modifiers.testFlag(Qt::ShiftModifier))
-        tmp += "Shift";
-    if (e->modifiers.testFlag(Qt::ControlModifier))
-        tmp += "Control";
-    if (e->modifiers.testFlag(Qt::AltModifier))
-        tmp += "Alt";
-    if (e->modifiers.testFlag(Qt::MetaModifier))
-        tmp += "Meta";
-    return tmp;
-}
-
-static QString getPosAsString(QPoint pos)
-{
-    return QString("QPoint(%1, %2)").arg(pos.x()).arg(pos.y());
-}
-
-static QString getBoolAsString(bool b)
-{
-    return b ? QString("true") : QString("false");
-}
-
-QString QNativeMouseMoveEvent::toString() const
-{
-    return QString("QNativeMouseMoveEvent(globalPos = %1 %2)").arg(getPosAsString(globalPos))
-        .arg(getModifiersAsString(this));
-}
-
-QString QNativeMouseButtonEvent::toString() const
-{
-    return QString("QNativeMouseButtonEvent(globalPos = %1, %2, clickCount = %3, %4)").arg(getPosAsString(globalPos))
-        .arg(getButtonAsString(this)).arg(clickCount).arg(getModifiersAsString(this));
-}
-
-QString QNativeMouseDragEvent::toString() const
-{
-    return QString("QNativeMouseDragEvent(globalPos = %1, %2, clickCount = %3, %4)").arg(getPosAsString(globalPos))
-    .arg(getButtonAsString(this)).arg(clickCount).arg(getModifiersAsString(this));
-}
-
-QString QNativeMouseWheelEvent::toString() const
-{
-    return QString("QNativeMouseWheelEvent(globalPos = %1, delta = %2, %3)").arg(getPosAsString(globalPos))
-        .arg(delta).arg(getModifiersAsString(this));
-}
-
-QString QNativeKeyEvent::toString() const
-{
-    return QString("QNativeKeyEvent(press = %1, native key code = %2, character = %3, %4)").arg(getBoolAsString(press))
-        .arg(nativeKeyCode).arg(character.isPrint() ? character : QString("<no char>"))
-        .arg(getModifiersAsString(this));
-}
-
-QString QNativeModifierEvent::toString() const
-{
-    return QString("QNativeModifierEvent(%1, native key code = %2)").arg(getModifiersAsString(this))
-        .arg(nativeKeyCode);
-}
-
-QDebug operator<<(QDebug d, QNativeEvent *e)
-{
-    Q_UNUSED(e);
-    return d << e->toString();
-}
-
-QDebug operator<<(QDebug d, const QNativeEvent &e)
-{
-    Q_UNUSED(e);
-    return d << e.toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeEvent *e)
-{
-    return s << e->eventId << " " << e->modifiers << " QNativeEvent";
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeMouseEvent *e)
-{
-    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeMouseMoveEvent *e)
-{
-    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeMouseButtonEvent *e)
-{
-    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->button
-        << " " << e->clickCount << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeMouseDragEvent *e)
-{
-    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->button << " " << e->clickCount
-        << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeMouseWheelEvent *e)
-{
-    return s << e->eventId << " " << e->globalPos.x() << " " << e->globalPos.y() << " " << e->delta
-        << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeKeyEvent *e)
-{
-    return s << e->eventId << " " << e->press << " " << e->nativeKeyCode << " " << e->character
-        << " " << e->modifiers << " " << e->toString();
-}
-
-QTextStream &operator<<(QTextStream &s, QNativeModifierEvent *e)
-{
-    return s << e->eventId << " " << e->modifiers << " " << e->nativeKeyCode << " " << e->toString();
-}
-
-
-
-
-QTextStream &operator>>(QTextStream &s, QNativeMouseMoveEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int x, y, modifiers;
-    s >> x >> y >> modifiers >> humanReadable;
-    e->globalPos.setX(x);
-    e->globalPos.setY(y);
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    return s;
-}
-
-QTextStream &operator>>(QTextStream &s, QNativeMouseButtonEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int x, y, button, clickCount, modifiers;
-    s >> x >> y >> button >> clickCount >> modifiers >> humanReadable;
-    e->globalPos.setX(x);
-    e->globalPos.setY(y);
-    e->clickCount = clickCount;
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    switch (button){
-        case 1:
-            e->button = Qt::LeftButton;
-            break;
-        case 2:
-            e->button = Qt::RightButton;
-            break;
-        case 3:
-            e->button = Qt::MidButton;
-            break;
-        default:
-            e->button = Qt::NoButton;
-            break;
-    }
-    return s;
-}
-
-QTextStream &operator>>(QTextStream &s, QNativeMouseDragEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int x, y, button, clickCount, modifiers;
-    s >> x >> y >> button >> clickCount >> modifiers >> humanReadable;
-    e->globalPos.setX(x);
-    e->globalPos.setY(y);
-    e->clickCount = clickCount;
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    switch (button){
-        case 1:
-            e->button = Qt::LeftButton;
-            break;
-        case 2:
-            e->button = Qt::RightButton;
-            break;
-        case 3:
-            e->button = Qt::MidButton;
-            break;
-        default:
-            e->button = Qt::NoButton;
-            break;
-    }
-    return s;
-}
-
-QTextStream &operator>>(QTextStream &s, QNativeMouseWheelEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int x, y, modifiers;
-    s >> x >> y >> e->delta >> modifiers >> humanReadable;
-    e->globalPos.setX(x);
-    e->globalPos.setY(y);
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    return s;
-}
-
-QTextStream &operator>>(QTextStream &s, QNativeKeyEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int press, modifiers;
-    QString character;
-    s >> press >> e->nativeKeyCode >> character >> modifiers >> humanReadable;
-    e->press = bool(press);
-    e->character = character[0];
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    return s;
-}
-
-QTextStream &operator>>(QTextStream &s, QNativeModifierEvent *e)
-{
-    // Skip reading eventId.
-    QString humanReadable;
-    int modifiers;
-    s >> modifiers >> e->nativeKeyCode >> humanReadable;
-    e->modifiers = Qt::KeyboardModifiers(modifiers);
-    return s;
-}
-
diff --git a/tests/auto/macnativeevents/qnativeinput.h b/tests/auto/macnativeevents/qnativeinput.h
deleted file mode 100644
index a98e4e4..0000000
--- a/tests/auto/macnativeevents/qnativeinput.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q_NATIVE_INPUT
-#define Q_NATIVE_INPUT
-
-#include <QtCore>
-
-namespace Qt {
-namespace Native {
-    enum Status {Success, Failure};
-}}
-
-// ----------------------------------------------------------------------------
-// Declare a set of native events that can be used to communicate with
-// client applications in an platform independent way
-// ----------------------------------------------------------------------------
-
-class QNativeEvent
-{
-public:
-    static const int eventId = 1;
-
-    QNativeEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const = 0;
-    Qt::KeyboardModifiers modifiers; // Yields for mouse events too.
-};
-
-class QNativeMouseEvent : public QNativeEvent {
-public:
-    static const int eventId = 2;
-
-    QNativeMouseEvent(){};
-    QNativeMouseEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseEvent(){};
-    virtual int id() const { return eventId; };
-
-    QPoint globalPos;
-};
-
-class QNativeMouseMoveEvent : public QNativeMouseEvent {
-public:
-    static const int eventId = 4;
-
-    QNativeMouseMoveEvent(){};
-    QNativeMouseMoveEvent(QPoint globalPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseMoveEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-};
-
-class QNativeMouseButtonEvent : public QNativeMouseEvent {
-public:
-    static const int eventId = 8;
-
-    QNativeMouseButtonEvent(){};
-    QNativeMouseButtonEvent(QPoint globalPos, Qt::MouseButton button, int clickCount, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseButtonEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-
-    Qt::MouseButton button;
-    int clickCount;
-};
-
-class QNativeMouseDragEvent : public QNativeMouseButtonEvent {
-public:
-    static const int eventId = 16;
-
-    QNativeMouseDragEvent(){};
-    QNativeMouseDragEvent(QPoint globalPos, Qt::MouseButton button, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseDragEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-};
-
-class QNativeMouseWheelEvent : public QNativeMouseEvent {
-public:
-    static const int eventId = 32;
-
-    QNativeMouseWheelEvent(){};
-    QNativeMouseWheelEvent(QPoint globalPos, int delta, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    virtual ~QNativeMouseWheelEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-
-    int delta;
-};
-
-class QNativeKeyEvent : public QNativeEvent {
-    public:
-    static const int eventId = 64;
-
-    QNativeKeyEvent(){};
-    QNativeKeyEvent(int nativeKeyCode, bool press, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
-    QNativeKeyEvent(int nativeKeyCode, bool press, QChar character, Qt::KeyboardModifiers modifiers);
-    virtual ~QNativeKeyEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-
-    int nativeKeyCode;
-    bool press;
-    QChar character;
-
-    // Some Qt to Native mappings:
-    static int Key_A;
-    static int Key_B;
-    static int Key_C;
-    static int Key_1;
-    static int Key_Backspace;
-    static int Key_Enter;
-    static int Key_Del;
-};
-
-class QNativeModifierEvent : public QNativeEvent {
-public:
-    static const int eventId = 128;
-
-    QNativeModifierEvent(Qt::KeyboardModifiers modifiers = Qt::NoModifier, int nativeKeyCode = 0);
-    virtual ~QNativeModifierEvent(){};
-    virtual int id() const { return eventId; };
-    virtual QString toString() const;
-
-    int nativeKeyCode;
-};
-
-// ----------------------------------------------------------------------------
-// Declare a set of related output / input functions for convenience:
-// ----------------------------------------------------------------------------
-
-QDebug operator<<(QDebug d, QNativeEvent *e);
-QDebug operator<<(QDebug d, const QNativeEvent &e);
-
-QTextStream &operator<<(QTextStream &s, QNativeEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeMouseEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeMouseMoveEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeMouseButtonEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeMouseDragEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeMouseWheelEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeKeyEvent *e);
-QTextStream &operator<<(QTextStream &s, QNativeModifierEvent *e);
-
-QTextStream &operator>>(QTextStream &s, QNativeMouseMoveEvent *e);
-QTextStream &operator>>(QTextStream &s, QNativeMouseButtonEvent *e);
-QTextStream &operator>>(QTextStream &s, QNativeMouseDragEvent *e);
-QTextStream &operator>>(QTextStream &s, QNativeMouseWheelEvent *e);
-QTextStream &operator>>(QTextStream &s, QNativeKeyEvent *e);
-QTextStream &operator>>(QTextStream &s, QNativeModifierEvent *e);
-
-// ----------------------------------------------------------------------------
-// Declare the main class that is supposed to be sub-classed by components
-// that are to receive native events
-// ----------------------------------------------------------------------------
-
-class QNativeInput
-{
-    public:
-    QNativeInput(bool subscribe = true);
-    virtual ~QNativeInput();
-
-    // Callback methods. Should be implemented by interested sub-classes:
-    void notify(QNativeEvent *event);
-    virtual void nativeEvent(QNativeEvent *event);
-    virtual void nativeMousePressEvent(QNativeMouseButtonEvent *){};
-    virtual void nativeMouseReleaseEvent(QNativeMouseButtonEvent *){};
-    virtual void nativeMouseMoveEvent(QNativeMouseMoveEvent *){};
-    virtual void nativeMouseDragEvent(QNativeMouseDragEvent *){};
-    virtual void nativeMouseWheelEvent(QNativeMouseWheelEvent *){};
-    virtual void nativeKeyPressEvent(QNativeKeyEvent *){};
-    virtual void nativeKeyReleaseEvent(QNativeKeyEvent *){};
-    virtual void nativeModifierEvent(QNativeModifierEvent *){};
-
-    // The following methods will differ in implementation from OS to OS:
-    static Qt::Native::Status sendNativeMouseButtonEvent(const QNativeMouseButtonEvent &event);
-    static Qt::Native::Status sendNativeMouseMoveEvent(const QNativeMouseMoveEvent &event);
-    static Qt::Native::Status sendNativeMouseDragEvent(const QNativeMouseDragEvent &event);
-    static Qt::Native::Status sendNativeMouseWheelEvent(const QNativeMouseWheelEvent &event);
-    static Qt::Native::Status sendNativeKeyEvent(const QNativeKeyEvent &event, int pid = 0);
-    static Qt::Native::Status sendNativeModifierEvent(const QNativeModifierEvent &event);
-    // sendNativeEvent will NOT differ from OS to OS.
-    static Qt::Native::Status sendNativeEvent(const QNativeEvent &event, int pid = 0);
-
-    // The following methods will differ in implementation from OS to OS:
-    Qt::Native::Status subscribeForNativeEvents();
-    Qt::Native::Status unsubscribeForNativeEvents();
-};
-
-#endif // Q_NATIVE_INPUT
diff --git a/tests/auto/macnativeevents/qnativeinput_mac.cpp b/tests/auto/macnativeevents/qnativeinput_mac.cpp
deleted file mode 100644
index 143a633..0000000
--- a/tests/auto/macnativeevents/qnativeinput_mac.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnativeinput.h"
-#include <Carbon/Carbon.h>
-#include <QtCore>
-
-//  ************************************************************
-//  Quartz
-//  ************************************************************
-
-static Qt::KeyboardModifiers getModifiersFromQuartzEvent(CGEventRef inEvent)
-{
-    Qt::KeyboardModifiers m;
-    CGEventFlags flags = CGEventGetFlags(inEvent);
-    if (flags & kCGEventFlagMaskShift || flags & kCGEventFlagMaskAlphaShift)
-        m |= Qt::ShiftModifier;
-    if (flags & kCGEventFlagMaskControl)
-        m |= Qt::MetaModifier;
-    if (flags & kCGEventFlagMaskAlternate)
-        m |= Qt::AltModifier;
-    if (flags & kCGEventFlagMaskCommand)
-        m |= Qt::ControlModifier;
-    return m;
-}
-
-static void setModifiersFromQNativeEvent(CGEventRef inEvent, const QNativeEvent &event)
-{
-    CGEventFlags flags = 0;
-    if (event.modifiers.testFlag(Qt::ShiftModifier))
-        flags |= kCGEventFlagMaskShift;
-    if (event.modifiers.testFlag(Qt::MetaModifier))
-        flags |= kCGEventFlagMaskControl;
-    if (event.modifiers.testFlag(Qt::AltModifier))
-        flags |= kCGEventFlagMaskAlternate;
-    if (event.modifiers.testFlag(Qt::ControlModifier))
-        flags |= kCGEventFlagMaskCommand;
-    CGEventSetFlags(inEvent, flags);
-}
-
-static QPoint getMouseLocationFromQuartzEvent(CGEventRef inEvent)
-{
-    CGPoint pos = CGEventGetLocation(inEvent);
-    QPoint tmp;
-    tmp.setX(pos.x);
-    tmp.setY(pos.y);
-    return tmp;
-}
-
-static QChar getCharFromQuartzEvent(CGEventRef inEvent)
-{
-    UniCharCount count = 0;
-    UniChar c;
-    CGEventKeyboardGetUnicodeString(inEvent, 1, &count, &c);
-    return QChar(c);
-}
-
-static CGEventRef EventHandler_Quartz(CGEventTapProxy proxy, CGEventType type, CGEventRef inEvent, void *refCon)
-{
-    Q_UNUSED(proxy);
-    QNativeInput *nativeInput = static_cast<QNativeInput *>(refCon);
-    switch (type){
-        case kCGEventKeyDown:{
-            QNativeKeyEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
-            e.character = getCharFromQuartzEvent(inEvent);
-            e.press = true;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventKeyUp:{
-            QNativeKeyEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
-            e.character = getCharFromQuartzEvent(inEvent);
-            e.press = false;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventLeftMouseDown:{
-            QNativeMouseButtonEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
-            e.button = Qt::LeftButton;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventLeftMouseUp:{
-            QNativeMouseButtonEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            e.clickCount = 0;
-            e.button = Qt::LeftButton;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventRightMouseDown:{
-            QNativeMouseButtonEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
-            e.button = Qt::RightButton;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventRightMouseUp:{
-            QNativeMouseButtonEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            e.clickCount = 0;
-            e.button = Qt::RightButton;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventMouseMoved:{
-            QNativeMouseMoveEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventLeftMouseDragged:{
-            QNativeMouseDragEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            e.clickCount = CGEventGetIntegerValueField(inEvent, kCGMouseEventClickState);
-            e.button = Qt::LeftButton;
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventScrollWheel:{
-            QNativeMouseWheelEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.delta = CGEventGetIntegerValueField(inEvent, kCGScrollWheelEventDeltaAxis1);
-            e.globalPos = getMouseLocationFromQuartzEvent(inEvent);
-            nativeInput->notify(&e);
-            break;
-        }
-        case kCGEventFlagsChanged:{
-            QNativeModifierEvent e;
-            e.modifiers = getModifiersFromQuartzEvent(inEvent);
-            e.nativeKeyCode = CGEventGetIntegerValueField(inEvent, kCGKeyboardEventKeycode);
-            nativeInput->notify(&e);
-            break;
-        }
-
-    }
-
-    return inEvent;
-}
-
-Qt::Native::Status insertEventHandler_Quartz(QNativeInput *nativeInput, int pid = 0)
-{
-    uid_t uid = geteuid();
-    if (uid != 0)
-        qWarning("MacNativeEvents: You must be root to listen for key events!");
-
-    CFMachPortRef port;
-    if (!pid){
-        port = CGEventTapCreate(kCGHIDEventTap,
-            kCGHeadInsertEventTap, kCGEventTapOptionListenOnly,
-            kCGEventMaskForAllEvents, EventHandler_Quartz, nativeInput);
-    } else {
-        ProcessSerialNumber psn;
-        GetProcessForPID(pid, &psn);
-        port = CGEventTapCreateForPSN(&psn,
-            kCGHeadInsertEventTap, kCGEventTapOptionListenOnly,
-            kCGEventMaskForAllEvents, EventHandler_Quartz, nativeInput);
-    }
-
-    CFRunLoopSourceRef eventSrc = CFMachPortCreateRunLoopSource(NULL, port, 0);
-    CFRunLoopAddSource((CFRunLoopRef) GetCFRunLoopFromEventLoop(GetMainEventLoop()),
-        eventSrc, kCFRunLoopCommonModes);
-
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status removeEventHandler_Quartz()
-{
-    return Qt::Native::Success; // ToDo:
-}
-
-Qt::Native::Status sendNativeKeyEventToProcess_Quartz(const QNativeKeyEvent &event, int pid)
-{
-    ProcessSerialNumber psn;
-    GetProcessForPID(pid, &psn);
-
-    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, event.press);
-    setModifiersFromQNativeEvent(e, event);
-    SetFrontProcess(&psn);
-    CGEventPostToPSN(&psn, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeKeyEvent_Quartz(const QNativeKeyEvent &event)
-{
-    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, event.press);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeMouseMoveEvent_Quartz(const QNativeMouseMoveEvent &event)
-{
-    CGPoint pos;
-    pos.x = event.globalPos.x();
-    pos.y = event.globalPos.y();
-
-    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeMouseButtonEvent_Quartz(const QNativeMouseButtonEvent &event)
-{
-    CGPoint pos;
-    pos.x = event.globalPos.x();
-    pos.y = event.globalPos.y();
-
-    CGEventType type = 0;
-    if (event.button == Qt::LeftButton)
-        type = (event.clickCount > 0) ? kCGEventLeftMouseDown : kCGEventLeftMouseUp;
-    else if (event.button == Qt::RightButton)
-        type = (event.clickCount > 0) ? kCGEventRightMouseDown : kCGEventRightMouseUp;
-    else
-        type = (event.clickCount > 0) ? kCGEventOtherMouseDown : kCGEventOtherMouseUp;
-
-    CGEventRef e = CGEventCreateMouseEvent(0, type, pos, event.button);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventSetIntegerValueField(e, kCGMouseEventClickState, event.clickCount);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeMouseDragEvent_Quartz(const QNativeMouseDragEvent &event)
-{
-    CGPoint pos;
-    pos.x = event.globalPos.x();
-    pos.y = event.globalPos.y();
-
-    CGEventType type = 0;
-    if (event.button == Qt::LeftButton)
-        type = kCGEventLeftMouseDragged;
-    else if (event.button == Qt::RightButton)
-        type = kCGEventRightMouseDragged;
-    else
-        type = kCGEventOtherMouseDragged;
-
-    CGEventRef e = CGEventCreateMouseEvent(0, type, pos, event.button);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeMouseWheelEvent_Quartz(const QNativeMouseWheelEvent &event)
-{
-    CGPoint pos;
-    pos.x = event.globalPos.x();
-    pos.y = event.globalPos.y();
-
-    CGEventRef e = CGEventCreateScrollWheelEvent(0, kCGScrollEventUnitPixel, 1, 0);
-    CGEventSetIntegerValueField(e, kCGScrollWheelEventDeltaAxis1, event.delta);
-    CGEventSetLocation(e, pos);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-
-    return Qt::Native::Success;
-}
-
-Qt::Native::Status sendNativeModifierEvent_Quartz(const QNativeModifierEvent &event)
-{
-    CGEventRef e = CGEventCreateKeyboardEvent(0, (uint)event.nativeKeyCode, 0);
-    CGEventSetType(e, kCGEventFlagsChanged);
-    setModifiersFromQNativeEvent(e, event);
-    CGEventPost(kCGHIDEventTap, e);
-    CFRelease(e);
-    return Qt::Native::Success;
-}
-
-//  ************************************************************
-//  QNativeInput methods:
-//  ************************************************************
-
-Qt::Native::Status QNativeInput::sendNativeMouseButtonEvent(const QNativeMouseButtonEvent &event)
-{
-    return sendNativeMouseButtonEvent_Quartz(event);
-}
-
-Qt::Native::Status QNativeInput::sendNativeMouseMoveEvent(const QNativeMouseMoveEvent &event)
-{
-    return sendNativeMouseMoveEvent_Quartz(event);
-}
-
-Qt::Native::Status QNativeInput::sendNativeMouseDragEvent(const QNativeMouseDragEvent &event)
-{
-    return sendNativeMouseDragEvent_Quartz(event);
-}
-
-Qt::Native::Status QNativeInput::sendNativeMouseWheelEvent(const QNativeMouseWheelEvent &event)
-{
-    return sendNativeMouseWheelEvent_Quartz(event);
-}
-
-Qt::Native::Status QNativeInput::sendNativeKeyEvent(const QNativeKeyEvent &event, int pid)
-{
-    if (!pid)
-        return sendNativeKeyEvent_Quartz(event);
-    else
-        return sendNativeKeyEventToProcess_Quartz(event, pid);
-}
-
-Qt::Native::Status QNativeInput::sendNativeModifierEvent(const QNativeModifierEvent &event)
-{
-    return sendNativeModifierEvent_Quartz(event);
-}
-
-Qt::Native::Status QNativeInput::subscribeForNativeEvents()
-{
-    return insertEventHandler_Quartz(this);
-}
-
-Qt::Native::Status QNativeInput::unsubscribeForNativeEvents()
-{
-    return removeEventHandler_Quartz();
-}
-
-// Some Qt to Mac mappings:
-int QNativeKeyEvent::Key_A = 0;
-int QNativeKeyEvent::Key_B = 11;
-int QNativeKeyEvent::Key_C = 8;
-int QNativeKeyEvent::Key_1 = 18;
-int QNativeKeyEvent::Key_Backspace = 51;
-int QNativeKeyEvent::Key_Enter = 36;
-int QNativeKeyEvent::Key_Del = 117;
-
diff --git a/tests/auto/macnativeevents/qnativeplayer.cpp b/tests/auto/macnativeevents/qnativeplayer.cpp
deleted file mode 100644
index 92298ef..0000000
--- a/tests/auto/macnativeevents/qnativeplayer.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qnativeplayer.h"
-
-QNativePlayer::QNativePlayer()
-{
-    currIndex = -1;
-    playbackMultiplier = 1.0;
-    wait = false;
-}
-
-QNativePlayer::~QNativePlayer()
-{
-    for (int i=0; i<eventList.size(); i++)
-        delete eventList.takeAt(i).second;
-}
-
-void QNativePlayer::sendNextEvent()
-{
-    QNativeEvent *e = eventList.at(currIndex).second;
-    if (e)
-        QNativeInput::sendNativeEvent(*e);
-    waitNextEvent();
-}
-
-void QNativePlayer::waitNextEvent()
-{
-    if (++currIndex >= eventList.size()){
-        emit done();
-        stop();
-        return;
-    }
-
-    int interval = eventList.at(currIndex).first;
-    QTimer::singleShot(interval * playbackMultiplier, this, SLOT(sendNextEvent()));
-}
-
-void QNativePlayer::append(int waitMs, QNativeEvent *event)
-{
-    eventList.append(QPair<int, QNativeEvent *>(waitMs, event));
-}
-
-void QNativePlayer::play(Playback playback)
-{
-    waitNextEvent();
-
-    wait = (playback == WaitUntilFinished);
-    while (wait)
-        QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
-}
-
-void QNativePlayer::stop()
-{
-    wait = false;
-    QAbstractEventDispatcher::instance()->interrupt();
-}
-
-// ************************************************************************
-
-QEventOutputList::QEventOutputList()
-{
-    wait = true;
-}
-
-QEventOutputList::~QEventOutputList()
-{
-    qDeleteAll(*this);
-}
-
-bool QEventOutputList::waitUntilEmpty(int maxEventWaitTime)
-{
-    int currSize = size();
-    QTime time;
-    time.restart();
-    while (wait){
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
-
-        if (isEmpty()){
-            return true;
-        }
-        else if (currSize == size()){
-            if (time.elapsed() > maxEventWaitTime){
-                return false;
-            }
-        }
-        else{
-            currSize = size();
-            time.restart();
-        }
-    }
-    return false;
-}
-
-void QEventOutputList::sleep(int sleepTime)
-{
-    QTime time;
-    time.restart();
-    while (time.elapsed() < sleepTime)
-        QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
-}
diff --git a/tests/auto/macnativeevents/qnativeplayer.h b/tests/auto/macnativeevents/qnativeplayer.h
deleted file mode 100644
index 61ee162..0000000
--- a/tests/auto/macnativeevents/qnativeplayer.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q_NATIVE_PLAYBACK
-#define Q_NATIVE_PLAYBACK
-
-#include <QtCore>
-#include "qnativeinput.h"
-
-class QNativePlayer : public QObject
-{
-    Q_OBJECT;
-
-    public:
-    enum Playback {ReturnImmediately, WaitUntilFinished};
-
-    QNativePlayer();
-    ~QNativePlayer();
-
-    void append(int waitMs, QNativeEvent *event = 0);
-    void play(Playback playback = WaitUntilFinished);
-    void stop();
-    float playbackMultiplier;
-
-signals:
-    void done();
-
-private slots:
-    void sendNextEvent();
-
-    private:
-    void waitNextEvent();
-
-    QList<QPair<int, QNativeEvent *> > eventList;
-    int currIndex;
-    bool wait;
-};
-
-// ******************************************************************
-
-class QEventOutputList : public QList<QEvent *>
-{
-public:
-    QEventOutputList();
-    ~QEventOutputList();
-    bool waitUntilEmpty(int maxEventWaitTime = 1000);
-    bool wait;
-
-    // Useful method. Just sleep and process events:
-    static void sleep(int sleepTime);
-};
-
-
-#endif
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index ccadd54..c6da3ff 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -44,8 +44,9 @@
 #include <QPushButton>
 #include <QtTest/QtTest>
 
-#include "qnativeinput.h"
-#include "qnativeplayer.h"
+#include "qnativeevents.h"
+#include "nativeeventlist.h"
+#include "expectedeventlist.h"
 
 #ifdef Q_OS_MAC
 
@@ -55,19 +56,126 @@ class tst_MacNativeEvents : public QObject
 {
 Q_OBJECT
 private slots:
-    void testLeftMousePressRelease();
+    void testMouseMoveLocation();
+    void testPushButtonPressRelease();
+    void testMouseLeftDoubleClick();
+    void stressTestMouseLeftDoubleClick();
+    void testMouseDragInside();
 };
 
-void tst_MacNativeEvents::testLeftMousePressRelease()
+void tst_MacNativeEvents::testMouseMoveLocation()
 {
+    QWidget w;
+    w.setMouseTracking(true);
+    w.show();
+    QPoint p = w.geometry().center();
+
+    NativeEventList native;
+    native.append(new QNativeMouseMoveEvent(p, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(p), p, Qt::NoButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(500), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testPushButtonPressRelease()
+{
+    // Check that a native mouse press and release generates the
+    // same qevents on a pushbutton:
     QPushButton w("click me");
     w.show();
     QPoint p = w.geometry().center();
 
-    QNativePlayer player;
-    player.append(50, new QNativeMouseButtonEvent(p, Qt::LeftButton, 1, Qt::NoModifier));
-    player.append(50, new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
-    player.play();
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testMouseLeftDoubleClick()
+{
+    // Check that a native double click makes
+    // the test widget receive a press-release-click-release:
+    QWidget w;
+    w.show();
+    QPoint p = w.geometry().center();
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 2, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonDblClick, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::stressTestMouseLeftDoubleClick()
+{
+    // Check that multiple, fast, double clicks makes
+    // the test widget receive correct click events
+    QWidget w;
+    w.show();
+    QPoint p = w.geometry().center();
+
+    NativeEventList native;
+    ExpectedEventList expected(&w);
+
+    for (int i=0; i<10; ++i){
+        native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 1, Qt::NoModifier));
+        native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
+        native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 2, Qt::NoModifier));
+        native.append(new QNativeMouseButtonEvent(p, Qt::LeftButton, 0, Qt::NoModifier));
+
+        expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+        expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+        expected.append(new QMouseEvent(QEvent::MouseButtonDblClick, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+        expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p), p, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+    }
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testMouseDragInside()
+{
+    // Check that a mouse drag inside a widget
+    // will cause press-move-release events to be delivered
+    QWidget w;
+    w.show();
+    QPoint p1 = w.geometry().center();
+    QPoint p2 = p1 - QPoint(10, 0);
+    QPoint p3 = p1 - QPoint(20, 0);
+    QPoint p4 = p1 - QPoint(30, 0);
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(p1, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(p2, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(p3, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(p4, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(p1), p1, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(p2), p2, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(p3), p3, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(p4), p4, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
 }
 
 #include "tst_macnativeevents.moc"
-- 
cgit v0.12


From 61e26e2fcc086112e5e8897a6d1c20c4b9df5f49 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Fri, 26 Mar 2010 10:34:42 +0100
Subject: Cocoa: send mouse move event upon a mouse enter

On all platforms, we always send a mouse move event when the
mouse enters a widget (if mouse tracking is on, that is). Then
macnativeevents auto test revealed that we did not do this for
the cocoa port. This patch will fix this.

Reviewed-by: cduclos
Reviewed-by: prasanth
---
 src/gui/kernel/qcocoaview_mac.mm | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 06eb7ff..9c5380b 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -657,23 +657,33 @@ static int qCocoaViewCount = 0;
 {
     if (!qwidget)
         return;
-
     if (qwidgetprivate->data.in_destructor)
         return;
-    QEvent enterEvent(QEvent::Enter);
-    NSPoint windowPoint = [event locationInWindow];
-    NSPoint globalPoint = [[event window] convertBaseToScreen:windowPoint];
-    NSPoint viewPoint = [self convertPoint:windowPoint fromView:nil];
+
     if (!qAppInstance()->activeModalWidget() || QApplicationPrivate::tryModalHelper(qwidget, 0)) {
+        QEvent enterEvent(QEvent::Enter);
+        NSPoint windowPoint = [event locationInWindow];
+        NSPoint globalPoint = [[event window] convertBaseToScreen:windowPoint];
+        NSPoint viewPoint = [self convertPoint:windowPoint fromView:nil];
         QApplication::sendEvent(qwidget, &enterEvent);
         qt_mouseover = qwidget;
 
-        // Update cursor and dispatch hover events.
+        // Update cursor icon:
         qt_mac_update_cursor_at_global_pos(flipPoint(globalPoint).toPoint());
-        if (qwidget->testAttribute(Qt::WA_Hover) &&
-            (!qAppInstance()->activePopupWidget() || qAppInstance()->activePopupWidget() == qwidget->window())) {
-            QHoverEvent he(QEvent::HoverEnter, QPoint(viewPoint.x, viewPoint.y), QPoint(-1, -1));
-            QApplicationPrivate::instance()->notify_helper(qwidget, &he);
+
+        // Send mouse move and hover events as well:
+        if (!qAppInstance()->activePopupWidget() || qAppInstance()->activePopupWidget() == qwidget->window()) {
+            if (qwidget->testAttribute(Qt::WA_MouseTracking)) {
+                NSEvent *mouseEvent = [NSEvent mouseEventWithType:NSMouseMoved
+                    location:windowPoint modifierFlags:[event modifierFlags] timestamp:[event timestamp]
+                    windowNumber:[event windowNumber] context:[event context] eventNumber:[event eventNumber]
+                    clickCount:0 pressure:0];
+                qt_mac_handleMouseEvent(self, mouseEvent, QEvent::MouseMove, Qt::NoButton);
+            }
+            if (qwidget->testAttribute(Qt::WA_Hover)) {
+                QHoverEvent he(QEvent::HoverEnter, QPoint(viewPoint.x, viewPoint.y), QPoint(-1, -1));
+                QApplicationPrivate::instance()->notify_helper(qwidget, &he);
+            }
         }
     }
 }
-- 
cgit v0.12


From d3ae1a9386a85475ba685cfc9a3009f119cad895 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Fri, 26 Mar 2010 10:57:17 +0100
Subject: Autotest: added more tests to macnativeevents (2)

---
 tests/auto/macnativeevents/expectedeventlist.cpp   |  31 +++---
 tests/auto/macnativeevents/expectedeventlist.h     |   1 +
 tests/auto/macnativeevents/nativeeventlist.cpp     |   8 ++
 tests/auto/macnativeevents/nativeeventlist.h       |   3 +-
 tests/auto/macnativeevents/tst_macnativeevents.cpp | 107 ++++++++++++++++++++-
 5 files changed, 136 insertions(+), 14 deletions(-)

diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/macnativeevents/expectedeventlist.cpp
index 48cfe1f..b1fb9a6 100644
--- a/tests/auto/macnativeevents/expectedeventlist.cpp
+++ b/tests/auto/macnativeevents/expectedeventlist.cpp
@@ -49,6 +49,7 @@ ExpectedEventList::ExpectedEventList(QObject *target)
     : QObject(target), eventCount(0)
 {
     target->installEventFilter(this);
+    debug = !qgetenv("NATIVEDEBUG").isEmpty();
 }
 
 ExpectedEventList::~ExpectedEventList()
@@ -92,10 +93,10 @@ bool ExpectedEventList::waitForAllEvents(int maxEventWaitTime)
     return false;
 }
 
-void ExpectedEventList::compareMouseEvents(QEvent *expected, QEvent *received)
+void ExpectedEventList::compareMouseEvents(QEvent *received, QEvent *expected)
 {
-    QMouseEvent *e1 = static_cast<QMouseEvent *>(expected);
-    QMouseEvent *e2 = static_cast<QMouseEvent *>(received);
+    QMouseEvent *e1 = static_cast<QMouseEvent *>(received);
+    QMouseEvent *e2 = static_cast<QMouseEvent *>(expected);
     if (e1->pos() == e2->pos()
             && (e1->globalPos() == e2->globalPos())
             && (e1->button() == e2->button())
@@ -104,14 +105,18 @@ void ExpectedEventList::compareMouseEvents(QEvent *expected, QEvent *received)
         return; // equal
 
     int eventListNr = eventCount - eventList.size();
-    qWarning() << "Expected event" << eventListNr << "about to fail:";
-    qWarning() << "Expected:" << e1;
-    qWarning() << "Received:" << e2;
-    QCOMPARE(e1->pos(), e2->pos());
-    QCOMPARE(e1->globalPos(), e2->globalPos());
-    QCOMPARE(e1->button(), e2->button());
-    QCOMPARE(e1->buttons(), e2->buttons());
-    QCOMPARE(e1->modifiers(), e2->modifiers());
+    if (!debug) {
+        qWarning() << "Expected event" << eventListNr << "differs from received event:";
+        QCOMPARE(e1->pos(), e2->pos());
+        QCOMPARE(e1->globalPos(), e2->globalPos());
+        QCOMPARE(e1->button(), e2->button());
+        QCOMPARE(e1->buttons(), e2->buttons());
+        QCOMPARE(e1->modifiers(), e2->modifiers());
+    } else {
+        qWarning() << "*** FAIL *** : Expected event" << eventListNr << "differs from received event:";
+        qWarning() << "Received:" << e1 << e1->globalPos();
+        qWarning() << "Expected:" << e2 << e2->globalPos();
+    }
 }
 
 void ExpectedEventList::compareKeyEvents(QEvent *event1, QEvent *event2)
@@ -124,6 +129,8 @@ void ExpectedEventList::compareKeyEvents(QEvent *event1, QEvent *event2)
 
 bool ExpectedEventList::eventFilter(QObject *, QEvent *received)
 {
+    if (debug)
+        qDebug() << received;
     if (eventList.isEmpty())
         return false;
 
@@ -139,7 +146,7 @@ bool ExpectedEventList::eventFilter(QObject *, QEvent *received)
             case QEvent::NonClientAreaMouseButtonRelease:
             case QEvent::NonClientAreaMouseButtonDblClick:
             case QEvent::NonClientAreaMouseMove: {
-                compareMouseEvents(expected, received);
+                compareMouseEvents(received, expected);
                 break;
             }
             case QEvent::KeyPress: {
diff --git a/tests/auto/macnativeevents/expectedeventlist.h b/tests/auto/macnativeevents/expectedeventlist.h
index 3bdbb67..bd9f358 100644
--- a/tests/auto/macnativeevents/expectedeventlist.h
+++ b/tests/auto/macnativeevents/expectedeventlist.h
@@ -51,6 +51,7 @@ class ExpectedEventList : public QObject
 {
     QList<QEvent *> eventList;
     QBasicTimer timer;
+    bool debug;
     int eventCount;
     void timerEvent(QTimerEvent *);
 
diff --git a/tests/auto/macnativeevents/nativeeventlist.cpp b/tests/auto/macnativeevents/nativeeventlist.cpp
index 614e9d0..d5d7b95 100644
--- a/tests/auto/macnativeevents/nativeeventlist.cpp
+++ b/tests/auto/macnativeevents/nativeeventlist.cpp
@@ -47,6 +47,9 @@ NativeEventList::NativeEventList(int defaultWaitMs)
     , wait(false)
     , defaultWaitMs(defaultWaitMs)
 {
+    QString multiplier = qgetenv("NATIVEDEBUG");
+    if (!multiplier.isEmpty())
+        setTimeMultiplier(multiplier.toFloat());
 }
 
 NativeEventList::~NativeEventList()
@@ -105,3 +108,8 @@ void NativeEventList::stop()
     QAbstractEventDispatcher::instance()->interrupt();
 }
 
+void NativeEventList::setTimeMultiplier(float multiplier)
+{
+    playbackMultiplier = multiplier;
+}
+
diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/macnativeevents/nativeeventlist.h
index 886ab78..688665d 100644
--- a/tests/auto/macnativeevents/nativeeventlist.h
+++ b/tests/auto/macnativeevents/nativeeventlist.h
@@ -61,7 +61,7 @@ class NativeEventList : public QObject
 
     void play(Playback playback = WaitUntilFinished);
     void stop();
-    float playbackMultiplier;
+    void setTimeMultiplier(float multiplier);
 
 signals:
     void done();
@@ -73,6 +73,7 @@ private:
     void waitNextEvent();
 
     QList<QPair<int, QNativeEvent *> > eventList;
+    float playbackMultiplier;
     int currIndex;
     bool wait;
     int defaultWaitMs;
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/macnativeevents/tst_macnativeevents.cpp
index c6da3ff..08ab9e6 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/macnativeevents/tst_macnativeevents.cpp
@@ -61,6 +61,10 @@ private slots:
     void testMouseLeftDoubleClick();
     void stressTestMouseLeftDoubleClick();
     void testMouseDragInside();
+    void testMouseDragOutside();
+    void testMouseDragToNonClientArea();
+    void testDragWindow();
+    void testMouseEnter();
 };
 
 void tst_MacNativeEvents::testMouseMoveLocation()
@@ -77,7 +81,7 @@ void tst_MacNativeEvents::testMouseMoveLocation()
     expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(p), p, Qt::NoButton, Qt::NoButton, Qt::NoModifier));
 
     native.play();
-    QVERIFY2(expected.waitForAllEvents(500), "the test did not receive all expected events!");
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
 }
 
 void tst_MacNativeEvents::testPushButtonPressRelease()
@@ -178,6 +182,107 @@ void tst_MacNativeEvents::testMouseDragInside()
     QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
 }
 
+void tst_MacNativeEvents::testMouseDragOutside()
+{
+    // Check that if we drag the mouse from inside the
+    // widget, and release it outside, we still get mouse move
+    // and release events when the mouse is outside the widget.
+    QWidget w;
+    w.show();
+    QPoint inside1 = w.geometry().center();
+    QPoint inside2 = inside1 - QPoint(10, 0);
+    QPoint outside1 = w.geometry().topLeft() - QPoint(50, 0);
+    QPoint outside2 = outside1 - QPoint(10, 0);
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(inside1, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(inside2, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(outside1, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(outside2, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(inside1), inside1, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(inside2), inside2, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(outside1), outside1, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(outside2), outside2, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testMouseDragToNonClientArea()
+{
+    // Check that if we drag the mouse from inside the
+    // widget, and release it on the title bar, we still get mouse move
+    // and release events when the mouse is on the title bar
+    QWidget w;
+    w.show();
+    QPoint inside1 = w.geometry().center();
+    QPoint inside2 = inside1 - QPoint(10, 0);
+    QPoint titlebar1 = w.geometry().topLeft() - QPoint(-100, 10);
+    QPoint titlebar2 = titlebar1 - QPoint(10, 0);
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(inside1, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(inside2, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(titlebar1, Qt::LeftButton, Qt::NoModifier));
+    native.append(new QNativeMouseButtonEvent(titlebar2, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::MouseButtonPress, w.mapFromGlobal(inside1), inside1, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(inside2), inside2, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(titlebar1), titlebar1, Qt::NoButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::MouseButtonRelease, w.mapFromGlobal(titlebar2), titlebar2, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testDragWindow()
+{
+    // Check that if we drag the mouse from inside the
+    // widgets title bar, we get a move event on the window
+    QWidget w;
+    w.show();
+    QPoint titlebar = w.geometry().topLeft() - QPoint(-100, 10);
+    QPoint moveTo = titlebar + QPoint(100, 0);
+
+    NativeEventList native;
+    native.append(new QNativeMouseButtonEvent(titlebar, Qt::LeftButton, 1, Qt::NoModifier));
+    native.append(new QNativeMouseDragEvent(moveTo, Qt::LeftButton, Qt::NoModifier));
+    native.append(500, new QNativeMouseButtonEvent(moveTo, Qt::LeftButton, 0, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QMouseEvent(QEvent::NonClientAreaMouseButtonPress, w.mapFromGlobal(titlebar), titlebar, Qt::LeftButton, Qt::LeftButton, Qt::NoModifier));
+    expected.append(new QMouseEvent(QEvent::NonClientAreaMouseButtonRelease, w.mapFromGlobal(titlebar), moveTo, Qt::LeftButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+void tst_MacNativeEvents::testMouseEnter()
+{
+    // When a mouse enters a widget, both a mouse enter events and a
+    // mouse move event should be sendt. Lets test this:
+    QWidget w;
+    w.setMouseTracking(true);
+    w.show();
+    QPoint outside = w.geometry().topLeft() - QPoint(50, 0);
+    QPoint inside = w.geometry().center();
+
+    NativeEventList native;
+    native.append(new QNativeMouseMoveEvent(outside, Qt::NoModifier));
+    native.append(new QNativeMouseMoveEvent(inside, Qt::NoModifier));
+
+    ExpectedEventList expected(&w);
+    expected.append(new QEvent(QEvent::Enter));
+    expected.append(new QMouseEvent(QEvent::MouseMove, w.mapFromGlobal(inside), inside, Qt::NoButton, Qt::NoButton, Qt::NoModifier));
+
+    native.play();
+    QVERIFY2(expected.waitForAllEvents(), "the test did not receive all expected events!");
+}
+
+
 #include "tst_macnativeevents.moc"
 
 QTEST_MAIN(tst_MacNativeEvents)
-- 
cgit v0.12


From bb718c6a6e626b5b353884525223de5d7a178c2d Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 7 Apr 2010 09:43:36 +0200
Subject: Cocoa: mouse release event reports wrong button state

If you release the mouse over a non-client area, the following
mouse up event contains the mouse button that was released in the
'buttons' state. This is wrong, according to the documentation
(and the native events auto test!)

Reviewed-by: msorvig
---
 src/gui/kernel/qt_cocoa_helpers_mac.mm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index b1e4c94..a05c7d5 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -882,7 +882,15 @@ void qt_mac_dispatchNCMouseMessage(void * /* NSWindow* */eventWindow, void * /*
         }
     }
 
-    QMouseEvent qme(eventType, qlocalPoint, qglobalPoint, button, button, keyMods);
+    Qt::MouseButtons buttons = 0;
+    {
+        UInt32 mac_buttons;
+        if (GetEventParameter((EventRef)[event eventRef], kEventParamMouseChord, typeUInt32, 0,
+                              sizeof(mac_buttons), 0, &mac_buttons) == noErr)
+            buttons = qt_mac_get_buttons(mac_buttons);
+    }
+
+    QMouseEvent qme(eventType, qlocalPoint, qglobalPoint, button, buttons, keyMods);
     qt_sendSpontaneousEvent(widgetToGetEvent, &qme);
 
     // We don't need to set the implicit grab widget here because we won't
-- 
cgit v0.12


From 723fc322438fedc07f774d833195e030e8789d9d Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Date: Wed, 7 Apr 2010 12:31:43 +0200
Subject: Cocoa: remove hackish code that is no longer needed

After Carlos' patch (0c442405a9f85), the code in the event dispatcher
that tried to restore correct window level (or actually block cocoa
from setting the wrong level) can now be removed. Tested on 10.5
and 10.6.

Reviewed-by: cduclos
---
 src/gui/kernel/qcocoasharedwindowmethods_mac_p.h | 25 -----------------
 src/gui/kernel/qeventdispatcher_mac.mm           | 34 +++---------------------
 src/gui/kernel/qeventdispatcher_mac_p.h          |  1 -
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 129e0a5..ec00915 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
 extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm
 extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
 extern const QStringList& qEnabledDraggedTypes(); // qmime_mac.cpp
-extern bool qt_blockCocoaSettingModalWindowLevel; // qeventdispatcher_mac_p.h
 
 Q_GLOBAL_STATIC(QPointer<QWidget>, currentDragTarget);
 
@@ -102,30 +101,6 @@ QT_END_NAMESPACE
     return !(isPopup || isToolTip || isTool);
 }
 
-- (void)orderWindow:(NSWindowOrderingMode)orderingMode relativeTo:(NSInteger)otherWindowNumber
-{
-    if (qt_blockCocoaSettingModalWindowLevel) {
-        // To avoid windows popping in front while restoring modal sessions
-        // in the event dispatcher, we block cocoa from ordering this window
-        // to front. The result of not doing this can be seen if executing
-        // a native color dialog on top of another executing dialog.
-        return;
-    }
-    [super orderWindow:orderingMode relativeTo:otherWindowNumber];
-}
-
-- (void)setLevel:(NSInteger)windowLevel
-{
-    if (qt_blockCocoaSettingModalWindowLevel) {
-        // To avoid windows popping in front while restoring modal sessions
-        // in the event dispatcher, we block cocoa from ordering this window
-        // to front. The result of not doing this can be seen if executing
-        // a native color dialog on top of another executing dialog.
-        return;
-    }
-    [super setLevel:windowLevel];
-}
-
 - (void)toggleToolbarShown:(id)sender
 {
     macSendToolbarChangeEvent([self QT_MANGLE_NAMESPACE(qt_qwidget)]);
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index a7f1224..0d93b9f 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -97,11 +97,6 @@ QT_BEGIN_NAMESPACE
 QT_USE_NAMESPACE
 
 /*****************************************************************************
-  Internal variables and functions
- *****************************************************************************/
-bool qt_blockCocoaSettingModalWindowLevel = false;
-
-/*****************************************************************************
   Externals
  *****************************************************************************/
 extern void qt_event_request_timer(MacTimerInfo *); //qapplication_mac.cpp
@@ -752,7 +747,6 @@ bool QEventDispatcherMacPrivate::interrupt = false;
 #ifdef QT_MAC_USE_COCOA
 QStack<QCocoaModalSessionInfo> QEventDispatcherMacPrivate::cocoaModalSessionStack;
 bool QEventDispatcherMacPrivate::currentExecIsNSAppRun = false;
-bool QEventDispatcherMacPrivate::modalSessionsTemporarilyStopped = false;
 bool QEventDispatcherMacPrivate::nsAppRunCalledByQt = false;
 bool QEventDispatcherMacPrivate::cleanupModalSessionsNeeded = false;
 NSModalSession QEventDispatcherMacPrivate::currentModalSessionCached = 0;
@@ -788,19 +782,14 @@ void QEventDispatcherMacPrivate::temporarilyStopAllModalSessions()
     // we need to stop all the modal session first. To avoid changing
     // the stacking order of the windows while doing so, we put
     // up a block that is used in QCocoaWindow and QCocoaPanel:
-    QBoolBlocker block1(blockSendPostedEvents, true);
-    QBoolBlocker block2(qt_blockCocoaSettingModalWindowLevel, true);
-
     int stackSize = cocoaModalSessionStack.size();
     for (int i=stackSize-1; i>=0; --i) {
         QCocoaModalSessionInfo &info = cocoaModalSessionStack[i];
         if (info.session) {
-            [NSApp runModalSession:info.session];
             [NSApp endModalSession:info.session];
             info.session = 0;
         }
     }
-    modalSessionsTemporarilyStopped = true;
     currentModalSessionCached = 0;
 }
 
@@ -834,29 +823,12 @@ NSModalSession QEventDispatcherMacPrivate::currentModalSession()
             // When creating a modal session cocoa will rearrange the windows.
             // In order to avoid windows to be put behind another we need to
             // keep the window level.
-            {
-                int level = [window level];
-                info.session = [NSApp beginModalSessionForWindow:window];
-                [window setLevel:level];
-            }
+            int level = [window level];
+            info.session = [NSApp beginModalSessionForWindow:window];
+            [window setLevel:level];
         }
         currentModalSessionCached = info.session;
     }
-
-    if (modalSessionsTemporarilyStopped && currentModalSessionCached) {
-        // After a call to temporarilyStopAllModalSessions, cocoa have
-        // now posted events to restore ended modal session windows to
-        // the correct window level. Those events will be processed
-        // _after_ our new calls to beginModalSessionForWindow have
-        // taken effect, which will end up stacking the windows wrong on
-        // screen. To work around this, we block cocoa from changing the
-        // stacking order of the windows, and flush out the pending events
-        // (the block is used in QCocoaWindow and QCocoaPanel):
-        QBoolBlocker block1(blockSendPostedEvents, true);
-        QBoolBlocker block2(qt_blockCocoaSettingModalWindowLevel, true);
-        [NSApp runModalSession:currentModalSessionCached];
-    }
-    modalSessionsTemporarilyStopped = false;
     return currentModalSessionCached;
 }
 
diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/kernel/qeventdispatcher_mac_p.h
index 8ac7c65..a0afb84 100644
--- a/src/gui/kernel/qeventdispatcher_mac_p.h
+++ b/src/gui/kernel/qeventdispatcher_mac_p.h
@@ -176,7 +176,6 @@ public:
     static bool currentExecIsNSAppRun;
     static bool nsAppRunCalledByQt;
     static bool cleanupModalSessionsNeeded;
-    static bool modalSessionsTemporarilyStopped;
     static NSModalSession currentModalSessionCached;
     static NSModalSession currentModalSession();
     static void updateChildrenWorksWhenModal();
-- 
cgit v0.12


From 00b648107e97e4f6bb23342b44e087db46cd742b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 7 Apr 2010 11:43:07 +0200
Subject: comment out variable which is used only by commented out debug code

---
 qmake/option.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/option.cpp b/qmake/option.cpp
index d7c5397..49030c3 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -613,7 +613,7 @@ bool Option::postProcessProject(QMakeProject *project)
 QString
 Option::fixString(QString string, uchar flags)
 {
-    const QString orig_string = string;
+    //const QString orig_string = string;
     static QHash<FixStringCacheKey, QString> *cache = 0;
     if(!cache) {
         cache = new QHash<FixStringCacheKey, QString>;
-- 
cgit v0.12


From b73f1b11bdf953cd1452989b57b24ccc442de111 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 7 Apr 2010 10:58:51 +0200
Subject: fix non-bootstrapped qmake build

---
 qmake/qmake.pri | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qmake/qmake.pri b/qmake/qmake.pri
index 0821f00..281417c 100644
--- a/qmake/qmake.pri
+++ b/qmake/qmake.pri
@@ -14,6 +14,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
            generators/win32/msvc_nmake.cpp generators/projectgenerator.cpp \
            generators/win32/msvc_vcproj.cpp \
            generators/win32/msvc_objectmodel.cpp \
+           generators/symbian/symbiancommon.cpp \
            generators/symbian/symmake.cpp \
            generators/symbian/symmake_abld.cpp \
            generators/symbian/symmake_sbsv2.cpp \
@@ -28,6 +29,7 @@ HEADERS += project.h property.h generators/makefile.h \
            generators/xmloutput.h generators/win32/borland_bmake.h generators/win32/msvc_nmake.h \
            generators/win32/msvc_vcproj.h \
            generators/win32/mingw_make.h generators/win32/msvc_objectmodel.h \
+           generators/symbian/symbiancommon.h \
            generators/symbian/symmake.h \
            generators/symbian/symmake_abld.h \
            generators/symbian/symmake_sbsv2.h \
-- 
cgit v0.12