From 827a616c3a357ddd79b4e59848c57fcc6f82fa18 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Mon, 3 Sep 2012 15:38:39 +0300
Subject: Fix dumpcpp tool to work with revision 7 metaobject format.

Dumpcpp tool still generated revision 1 moc format, so generated code
would no longer compile. Ported relevant revision 7 generation code
from moc tool to dumpcpp tool. Also squashed multiple generated string
tables into a single string table.

QVariant::nameToType(typeName) no longer returns UserType for QVariant,
so fixed few comparisons to take this into account.

Removed warning print from MetaObjectGenerator::addProperty(), as
this just spams warnings unnecessarily when generating properties.
Normally the required metatypes are not registered at time of
generation (e.g. when running dumpcpp tool). Note that the check for
this warning was buggy in Qt4, so it already never printed there.

Added a simple autotest to verify dumpcpp generates working code.

Task-number: QTBUG-26587
Change-Id: If12d2301890c209e7fbcb3bc054791a1c9d492c3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
---
 tests/auto/auto.pro                |  3 +-
 tests/auto/dumpcpp/dumpcpp.pro     | 11 +++++++
 tests/auto/dumpcpp/tst_dumpcpp.cpp | 67 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/dumpcpp/dumpcpp.pro
 create mode 100644 tests/auto/dumpcpp/tst_dumpcpp.cpp

(limited to 'tests')

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 8e3a63f..82cce69 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    qaxobject
+    qaxobject \
+    dumpcpp
diff --git a/tests/auto/dumpcpp/dumpcpp.pro b/tests/auto/dumpcpp/dumpcpp.pro
new file mode 100644
index 0000000..776aa32
--- /dev/null
+++ b/tests/auto/dumpcpp/dumpcpp.pro
@@ -0,0 +1,11 @@
+CONFIG += testcase qaxcontainer
+QT += widgets testlib
+SOURCES += tst_dumpcpp.cpp
+TARGET = tst_dumpcpp
+
+# Assume Web Browser type library is available in all windows installations
+TYPELIBS = $$(SystemRoot)\\system32\\ieframe.dll
+
+!exists($$TYPELIBS) {
+    message("Web Browser type library for test not found!")
+}
\ No newline at end of file
diff --git a/tests/auto/dumpcpp/tst_dumpcpp.cpp b/tests/auto/dumpcpp/tst_dumpcpp.cpp
new file mode 100644
index 0000000..191f079
--- /dev/null
+++ b/tests/auto/dumpcpp/tst_dumpcpp.cpp
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include "ieframe.h" // generated header
+#include <QApplication>
+
+class tst_dumpcpp : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void toggleAddressBar();
+};
+
+// A simple test to verify that an object can be instantiated and interacted with
+void tst_dumpcpp::toggleAddressBar()
+{
+    SHDocVw::WebBrowser* webBrowser = new SHDocVw::WebBrowser;
+    QVERIFY(webBrowser);
+    bool addressBar = webBrowser->AddressBar();
+    addressBar = !addressBar;
+    webBrowser->SetAddressBar(addressBar);
+    QVERIFY(webBrowser->AddressBar() == addressBar);
+    delete webBrowser;
+}
+
+QTEST_MAIN(tst_dumpcpp)
+#include "tst_dumpcpp.moc"
-- 
cgit v1.2.1