Merge GeneratorRunner inside Shiboken.

Conflicts:
	CMakeLists.txt
	data/CMakeLists.txt
	doc/CMakeLists.txt
	doc/_templates/index.html
	doc/_templates/layout.html
	doc/_themes/pysidedocs/static/pysidedocs.css
	doc/commandlineoptions.rst
	doc/conf.py.in
	doc/contents.rst
	doc/images/bindinggen-development.png
	doc/images/boostqtarch.png
	tests/CMakeLists.txt

17 files changed, 850 insertions, 7 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index df240cc6c..ecea43c64 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -63,3 +63,32 @@ else()
         endif()
     endforeach()
 endif()
+
+# FIXME Skipped until add an option to choose the generator
+# add_subdirectory(test_generator)
+
+if (NOT APIEXTRACTOR_DOCSTRINGS_DISABLED)
+#     project(sphinxtabletest)
+# 
+#     # TODO
+#     set(sphinxtabletest_SRC sphinxtabletest.cpp)
+#     qt4_automoc(${sphinxtabletest_SRC})
+# 
+#     include_directories(${QT_INCLUDE_DIR}
+#                         ${QT_QTCORE_INCLUDE_DIR}
+#                         ${CMAKE_CURRENT_BINARY_DIR}
+#                         ${qtdoc_generator_SOURCE_DIR})
+# 
+#     add_executable(sphinxtabletest ${sphinxtabletest_SRC})
+# 
+#     target_link_libraries(sphinxtabletest
+#                         ${QT_QTTEST_LIBRARY}
+#                         ${APIEXTRACTOR_LIBRARY}
+#                         qtdoc_generator
+#                         genrunner)
+# 
+#     add_test("sphinxtable" sphinxtabletest)
+#     if (INSTALL_TESTS)
+#         install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/sphinxtabletest DESTINATION ${TEST_INSTALL_DIR})
+#     endif()
+endif()
diff --git a/tests/minimalbinding/CMakeLists.txt b/tests/minimalbinding/CMakeLists.txt
index 6229dd7cb..5522e6ad6 100644
--- a/tests/minimalbinding/CMakeLists.txt
+++ b/tests/minimalbinding/CMakeLists.txt
@@ -16,7 +16,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/minimal-binding.txt.in"
                "${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt" @ONLY)
 
 add_custom_command(OUTPUT ${minimal_SRC}
-COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS}
+COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/minimal-binding.txt ${GENERATOR_EXTRA_FLAGS}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'minimal' test binding..."
 )
@@ -36,5 +36,5 @@ target_link_libraries(minimal
                       ${SBK_PYTHON_LIBRARIES}
                       libshiboken)
 
-add_dependencies(minimal shiboken_generator)
+add_dependencies(minimal shiboken)
 
diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt
index 366bdbd55..632391209 100644
--- a/tests/otherbinding/CMakeLists.txt
+++ b/tests/otherbinding/CMakeLists.txt
@@ -18,7 +18,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/other-binding.txt.in"
                "${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt" @ONLY)
 
 add_custom_command(OUTPUT ${other_SRC}
-COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt ${GENERATOR_EXTRA_FLAGS}
+COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt ${GENERATOR_EXTRA_FLAGS}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'other' test binding..."
 )
@@ -43,5 +43,5 @@ target_link_libraries(other
                       ${SBK_PYTHON_LIBRARIES}
                       libshiboken)
 
-add_dependencies(other sample shiboken_generator)
+add_dependencies(other sample shiboken)
 
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index d7734592c..601b12692 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -116,7 +116,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sample-binding.txt.in"
                "${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt" @ONLY)
 
 add_custom_command(OUTPUT ${sample_SRC}
-COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt ${GENERATOR_EXTRA_FLAGS}
+COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt ${GENERATOR_EXTRA_FLAGS}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'sample' test binding..."
 )
@@ -136,5 +136,4 @@ target_link_libraries(sample
                       ${SBK_PYTHON_LIBRARIES}
                       libshiboken)
 
-add_dependencies(sample shiboken_generator)
-
+add_dependencies(sample shiboken)
diff --git a/tests/sphinxtabletest.cpp b/tests/sphinxtabletest.cpp
new file mode 100644
index 000000000..c1ba59e60
--- /dev/null
+++ b/tests/sphinxtabletest.cpp
@@ -0,0 +1,327 @@
+/*
+* This file is part of the Boost Python Generator project.
+*
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* version 2 as published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA
+*
+*/
+
+#include "sphinxtabletest.h"
+#include "qtdocgenerator.h"
+#include <QtTest/QTest>
+#include <QDebug>
+
+QString SphinxTableTest::transformXml(const char* xml)
+{
+    return QtXmlToSphinx(m_generator, xml).result();
+}
+
+void SphinxTableTest::setUp()
+{
+    m_generator = new QtDocGenerator;
+}
+
+void SphinxTableTest::tearDown()
+{
+    delete m_generator;
+}
+
+void SphinxTableTest::testEmptyString()
+{
+    const char* xml = "";
+    QCOMPARE(transformXml(xml), QString());
+}
+
+void SphinxTableTest::testSimpleTable()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item>\
+            <para>Header 1</para>\
+        </item>\
+        <item>\
+            <para>Header 2</para>\
+        </item>\
+    </header>\
+    <row>\
+        <item>\
+            <para>1 1</para>\
+        </item>\
+        <item>\
+            <para>1 2</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item>\
+            <para>2 1</para>\
+        </item>\
+        <item>\
+            <para>2 2</para>\
+        </item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +--------+--------+\n\
+    |Header 1|Header 2|\n\
+    +--------+--------+\n\
+    |1 1     |1 2     |\n\
+    +--------+--------+\n\
+    |2 1     |2 2     |\n\
+    +--------+--------+\n\
+\n"));
+}
+
+void SphinxTableTest::testColSpan()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item>\
+            <para>Header 1</para>\
+        </item>\
+        <item>\
+            <para>Header 2</para>\
+        </item>\
+    </header>\
+    <row>\
+        <item colspan=\"2\">\
+            <para>I'm a big text!</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item>\
+            <para>2 1</para>\
+        </item>\
+        <item>\
+            <para>2 2</para>\
+        </item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +---------------+--------+\n\
+    |Header 1       |Header 2|\n\
+    +---------------+--------+\n\
+    |I'm a big text!         |\n\
+    +---------------+--------+\n\
+    |2 1            |2 2     |\n\
+    +---------------+--------+\n\
+\n"));
+}
+
+
+void SphinxTableTest::testRowSpan()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item>\
+            <para>Header 1</para>\
+        </item>\
+        <item>\
+            <para>Header 2</para>\
+        </item>\
+    </header>\
+    <row>\
+        <item rowspan=\"2\">\
+            <para>1.1</para>\
+        </item>\
+        <item>\
+            <para>1.2</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item>\
+            <para>2 2</para>\
+        </item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +--------+--------+\n\
+    |Header 1|Header 2|\n\
+    +--------+--------+\n\
+    |1.1     |1.2     |\n\
+    +        +--------+\n\
+    |        |2 2     |\n\
+    +--------+--------+\n\
+\n"));
+}
+
+
+void SphinxTableTest::testComplexTable()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item>\
+            <para>Header 1</para>\
+        </item>\
+        <item>\
+            <para>Header 2</para>\
+        </item>\
+        <item>\
+            <para>Header 3</para>\
+        </item>\
+    </header>\
+    <row>\
+        <item rowspan=\"2\">\
+            <para>1.1</para>\
+        </item>\
+        <item colspan=\"2\">\
+            <para>1.2</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item>\
+            <para>2 2</para>\
+        </item>\
+        <item>\
+            <para>2 3</para>\
+        </item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +--------+--------+--------+\n\
+    |Header 1|Header 2|Header 3|\n\
+    +--------+--------+--------+\n\
+    |1.1     |1.2              |\n\
+    +        +--------+--------+\n\
+    |        |2 2     |2 3     |\n\
+    +--------+--------+--------+\n\
+\n"));
+}
+
+void SphinxTableTest::testRowSpan2()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item><para>h1</para></item>\
+        <item><para>h2</para></item>\
+        <item><para>h3</para></item>\
+        <item><para>h4</para></item>\
+    </header>\
+    <row>\
+        <item rowspan=\"6\"><para>A</para></item>\
+        <item rowspan=\"6\"><para>B</para></item>\
+        <item><para>C</para></item>\
+        <item><para>D</para></item>\
+    </row>\
+    <row>\
+        <item><para>E</para></item>\
+        <item><para>F</para></item>\
+    </row>\
+    <row>\
+        <item><para>E</para></item>\
+        <item><para>F</para></item>\
+    </row>\
+    <row>\
+        <item><para>E</para></item>\
+        <item><para>F</para></item>\
+    </row>\
+    <row>\
+        <item><para>E</para></item>\
+        <item><para>F</para></item>\
+    </row>\
+    <row>\
+        <item><para>E</para></item>\
+        <item><para>F</para></item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +--+--+--+--+\n\
+    |h1|h2|h3|h4|\n\
+    +--+--+--+--+\n\
+    |A |B |C |D |\n\
+    +  +  +--+--+\n\
+    |  |  |E |F |\n\
+    +  +  +--+--+\n\
+    |  |  |E |F |\n\
+    +  +  +--+--+\n\
+    |  |  |E |F |\n\
+    +  +  +--+--+\n\
+    |  |  |E |F |\n\
+    +  +  +--+--+\n\
+    |  |  |E |F |\n\
+    +--+--+--+--+\n\
+\n"));
+}
+
+void SphinxTableTest::testBrokenTable()
+{
+    const char* xml = "\
+<table>\
+    <header>\
+        <item>\
+            <para>Header 1</para>\
+        </item>\
+        <item>\
+            <para>Header 2</para>\
+        </item>\
+    </header>\
+    <row>\
+        <item>\
+            <para>1.1</para>\
+        </item>\
+        <item>\
+            <para>1.2</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item colspan=\"2\">\
+            <para>2 2</para>\
+        </item>\
+        <item>\
+            <para>2 3</para>\
+        </item>\
+        <item>\
+            <para>2 4</para>\
+        </item>\
+        <item>\
+            <para>2 5</para>\
+        </item>\
+    </row>\
+    <row>\
+        <item>\
+            <para>3 1</para>\
+        </item>\
+        <item>\
+            <para>3 2</para>\
+        </item>\
+        <item>\
+            <para>3 3</para>\
+        </item>\
+    </row>\
+</table>";
+    QCOMPARE(transformXml(xml), QString("\
+    +--------+------------+\n\
+    |Header 1|Header 2    |\n\
+    +--------+------------+\n\
+    |1.1     |1.2         |\n\
+    +--------+------------+\n\
+    |2 2       2 3 2 4 2 5|\n\
+    +--------+------------+\n\
+    |3 1     |3 2 3 3     |\n\
+    +--------+------------+\n\
+\n"));
+}
+
+
+QTEST_APPLESS_MAIN( SphinxTableTest )
+
+#include "sphinxtabletest.moc"
diff --git a/tests/sphinxtabletest.h b/tests/sphinxtabletest.h
new file mode 100644
index 000000000..e056021b5
--- /dev/null
+++ b/tests/sphinxtabletest.h
@@ -0,0 +1,49 @@
+/*
+* This file is part of the Boost Python Generator project.
+*
+* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+*
+* Contact: PySide team <contact@pyside.org>
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* version 2 as published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but
+* WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA
+*
+*/
+
+#ifndef SPHINXTABLETEST_H
+#define SPHINXTABLETEST_H
+
+#include <QObject>
+
+class QtDocGenerator;
+class SphinxTableTest : public QObject {
+    Q_OBJECT
+
+private slots:
+    void setUp();
+    void tearDown();
+    void testEmptyString();
+    void testSimpleTable();
+    void testRowSpan();
+    void testColSpan();
+    void testComplexTable();
+    void testRowSpan2();
+    void testBrokenTable();
+private:
+    QtDocGenerator* m_generator;
+
+    QString transformXml(const char* xml);
+};
+
+#endif
diff --git a/tests/test_generator/CMakeLists.txt b/tests/test_generator/CMakeLists.txt
new file mode 100644
index 000000000..498d6624c
--- /dev/null
+++ b/tests/test_generator/CMakeLists.txt
@@ -0,0 +1,63 @@
+project(test_generator)
+
+set(dummy_generator_SRC dummygenerator.cpp)
+add_library(dummy_generator SHARED ${dummy_generator_SRC})
+target_link_libraries(dummy_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner)
+set_property(TARGET dummy_generator PROPERTY PREFIX "")
+
+add_executable(dummygenerator main.cpp)
+set(DUMMYGENERATOR_EXECUTABLE dummygenerator${generator_SUFFIX})
+set_target_properties(dummygenerator PROPERTIES OUTPUT_NAME ${DUMMYGENERATOR_EXECUTABLE})
+target_link_libraries(dummygenerator ${QT_QTCORE_LIBRARY})
+
+configure_file(dummygentestconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/dummygentestconfig.h" @ONLY)
+
+get_filename_component(APIEXTRACTOR_LIBRARY_DIRS ${APIEXTRACTOR_LIBRARY} PATH)
+if(WIN32)
+    set(PATH_SEP ";")
+    find_program(APIEXTRACTOR_BINARY apiextractor.dll HINTS ${APIEXTRACTOR_LIBRARY_DIRS})
+    get_filename_component(APIEXTRACTOR_BINARY_DIR ${APIEXTRACTOR_BINARY} PATH)
+    set(APIEXTRACTOR_LIBRARY_DIRS "${APIEXTRACTOR_LIBRARY_DIRS}${PATH_SEP}${APIEXTRACTOR_BINARY_DIR}")
+else()
+    set(PATH_SEP ":")
+endif()
+
+set(ENV_PATH "${generatorrunner_BINARY_DIR}${PATH_SEP}${CMAKE_CURRENT_BINARY_DIR}${PATH_SEP}$ENV{PATH}${PATH_SEP}${APIEXTRACTOR_LIBRARY_DIRS}")
+set(ENV_QT_PLUGIN_PATH "${CMAKE_CURRENT_BINARY_DIR}${PATH_SEP}$ENV{QT_PLUGIN_PATH}")
+if(WIN32)
+    string(REPLACE "\\;" ";" ENV_PATH "${ENV_PATH}")
+    string(REPLACE ";" "\\;" ENV_PATH "${ENV_PATH}")
+    string(REPLACE "\\;" ";" ENV_QT_PLUGIN_PATH "${ENV_QT_PLUGIN_PATH}")
+    string(REPLACE ";" "\\;" ENV_QT_PLUGIN_PATH "${ENV_QT_PLUGIN_PATH}")
+endif()
+
+macro(m_add_test testname)
+    if(CMAKE_VERSION VERSION_LESS 2.8)
+        add_test(${testname} ${CMAKE_COMMAND} -DTEST=${testname}
+                 -DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}
+                 -DENV_PATH=${ENV_PATH} -DENV_QT_PLUGIN_PATH=${ENV_QT_PLUGIN_PATH}
+                 -P ${CMAKE_CURRENT_SOURCE_DIR}/run_test.cmake)
+    else()
+        add_test(${testname} ${testname})
+        set_property(TEST ${testname} PROPERTY ENVIRONMENT "PATH=${ENV_PATH}" "QT_PLUGIN_PATH=${ENV_QT_PLUGIN_PATH}")
+    endif()
+endmacro()
+
+macro(declare_test testname)
+    qt4_automoc("${testname}.cpp")
+    add_executable(${testname} "${testname}.cpp")
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+    target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY})
+    m_add_test(${testname})
+endmacro(declare_test testname)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test_global.h"
+               "${CMAKE_CURRENT_BINARY_DIR}/test_global.h" COPYONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test_typesystem.xml"
+               "${CMAKE_CURRENT_BINARY_DIR}/test_typesystem.xml" COPYONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dummygentest-project.txt.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/dummygentest-project.txt" @ONLY)
+declare_test(dummygentest)
+
+add_dependencies(dummygenerator generatorrunner)
+
diff --git a/tests/test_generator/dummygenerator.cpp b/tests/test_generator/dummygenerator.cpp
new file mode 100644
index 000000000..795d7afd3
--- /dev/null
+++ b/tests/test_generator/dummygenerator.cpp
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <iostream>
+#include "dummygenerator.h"
+
+EXPORT_GENERATOR_PLUGIN(new DummyGenerator)
+
+using namespace std;
+
+QString
+DummyGenerator::fileNameForClass(const AbstractMetaClass* metaClass) const
+{
+    return QString("%1_generated.txt").arg(metaClass->name().toLower());
+}
+
+void
+DummyGenerator::generateClass(QTextStream& s, const AbstractMetaClass* metaClass)
+{
+    s << "// Generated code for class: " << qPrintable(metaClass->name()) << endl;
+}
+
+bool
+DummyGenerator::doSetup(const QMap<QString, QString>& args)
+{
+    if (args.contains("dump-arguments") && !args["dump-arguments"].isEmpty()) {
+        QFile logFile(args["dump-arguments"]);
+        logFile.open(QIODevice::WriteOnly | QIODevice::Text);
+        QTextStream out(&logFile);
+        foreach (const QString& key, args.keys()) {
+            if (key == "arg-1")
+                out << "header-file";
+            else if (key == "arg-2")
+                out << "typesystem-file";
+            else
+                out << key;
+            if (!args[key].isEmpty())
+                out << " = " << args[key];
+            out << endl;
+        }
+    }
+    return true;
+}
+
diff --git a/tests/test_generator/dummygenerator.h b/tests/test_generator/dummygenerator.h
new file mode 100644
index 000000000..079c1d5b6
--- /dev/null
+++ b/tests/test_generator/dummygenerator.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+#ifndef DUMMYGENERATOR_H
+#define DUMMYGENERATOR_H
+
+#include "generator.h"
+
+class GENRUNNER_API DummyGenerator : public Generator
+{
+public:
+    DummyGenerator() {}
+    ~DummyGenerator() {}
+    bool doSetup(const QMap<QString, QString>& args);
+    const char* name() const { return "DummyGenerator"; }
+
+protected:
+    void writeFunctionArguments(QTextStream&, const AbstractMetaFunction*, Options) const {}
+    void writeArgumentNames(QTextStream&, const AbstractMetaFunction*, Options) const {}
+    QString fileNameForClass(const AbstractMetaClass* metaClass) const;
+    void generateClass(QTextStream& s, const AbstractMetaClass* metaClass);
+    void finishGeneration() {}
+};
+
+#endif // DUMMYGENERATOR_H
diff --git a/tests/test_generator/dummygentest-project.txt.in b/tests/test_generator/dummygentest-project.txt.in
new file mode 100644
index 000000000..0a076d8bd
--- /dev/null
+++ b/tests/test_generator/dummygentest-project.txt.in
@@ -0,0 +1,20 @@
+[generator-project]
+
+generator-set = dummy
+header-file = @CMAKE_CURRENT_BINARY_DIR@/test_global.h
+typesystem-file = @CMAKE_CURRENT_BINARY_DIR@/test_typesystem.xml
+output-directory = /tmp/output
+
+dump-arguments = @CMAKE_CURRENT_BINARY_DIR@/dummygen-args.log
+
+include-path = /include/path/location1
+include-path = /include/path/location2
+
+typesystem-path = /typesystem/path/location1
+typesystem-path = /typesystem/path/location2
+
+api-version = 1.2.3
+debug = sparse
+
+no-suppress-warnings
+
diff --git a/tests/test_generator/dummygentest.cpp b/tests/test_generator/dummygentest.cpp
new file mode 100644
index 000000000..a71abfccd
--- /dev/null
+++ b/tests/test_generator/dummygentest.cpp
@@ -0,0 +1,133 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "dummygentest.h"
+#include "dummygenerator.h"
+#include "dummygentestconfig.h"
+#include <QTemporaryFile>
+#include <QtTest/QTest>
+#include <QProcess>
+
+#define GENERATED_CONTENTS  "// Generated code for class: Dummy"
+
+void DummyGenTest::initTestCase()
+{
+    int argc = 0;
+    char* argv[] = {NULL};
+    QCoreApplication app(argc, argv);
+    workDir = QDir::currentPath();
+
+    headerFilePath = workDir + "/test_global.h";
+    typesystemFilePath = workDir + "/test_typesystem.xml";
+    projectFilePath = workDir + "/dummygentest-project.txt";
+    generatedFilePath = QString("%1/dummy/dummy_generated.txt").arg(QDir::tempPath());
+}
+
+void DummyGenTest::testCallGenRunnerWithFullPathToDummyGenModule()
+{
+    QStringList args;
+    args.append("--generator-set=" DUMMYGENERATOR_BINARY_DIR "/dummy_generator" MODULE_EXTENSION);
+    args.append(QString("--output-directory=%1").arg(QDir::tempPath()));
+    args.append(headerFilePath);
+    args.append(typesystemFilePath);
+    int result = QProcess::execute("generatorrunner", args);
+    QCOMPARE(result, 0);
+
+    QFile generatedFile(generatedFilePath);
+    generatedFile.open(QIODevice::ReadOnly);
+    QCOMPARE(generatedFile.readAll().trimmed(), QByteArray(GENERATED_CONTENTS).trimmed());
+    generatedFile.close();
+
+    QVERIFY(generatedFile.remove());
+}
+
+void DummyGenTest::testCallGenRunnerWithNameOfDummyGenModule()
+{
+    QStringList args;
+    args.append("--generator-set=dummy");
+    args.append(QString("--output-directory=%1").arg(QDir::tempPath()));
+    args.append(headerFilePath);
+    args.append(typesystemFilePath);
+    int result = QProcess::execute("generatorrunner", args);
+    QCOMPARE(result, 0);
+
+    QFile generatedFile(generatedFilePath);
+    generatedFile.open(QIODevice::ReadOnly);
+    QCOMPARE(generatedFile.readAll().trimmed(), QByteArray(GENERATED_CONTENTS).trimmed());
+    generatedFile.close();
+
+    QVERIFY(generatedFile.remove());
+}
+
+void DummyGenTest::testCallDummyGeneratorExecutable()
+{
+    QStringList args;
+    args.append(QString("--output-directory=%1").arg(QDir::tempPath()));
+    args.append(headerFilePath);
+    args.append(typesystemFilePath);
+    int result = QProcess::execute(DUMMYGENERATOR_BINARY, args);
+    QCOMPARE(result, 0);
+
+    QFile generatedFile(generatedFilePath);
+    generatedFile.open(QIODevice::ReadOnly);
+    QCOMPARE(generatedFile.readAll().trimmed(), QByteArray(GENERATED_CONTENTS).trimmed());
+    generatedFile.close();
+
+    QVERIFY(generatedFile.remove());
+}
+
+void DummyGenTest::testProjectFileArgumentsReading()
+{
+    QStringList args(QString("--project-file=%1/dummygentest-project.txt").arg(workDir));
+    int result = QProcess::execute("generatorrunner", args);
+    QCOMPARE(result, 0);
+
+    QFile logFile(workDir + "/dummygen-args.log");
+    logFile.open(QIODevice::ReadOnly);
+    QStringList logContents;
+    while (!logFile.atEnd())
+        logContents << logFile.readLine().trimmed();
+    logContents.sort();
+    QCOMPARE(logContents[0], QString("api-version = 1.2.3"));
+    QCOMPARE(logContents[1], QString("debug = sparse"));
+    QVERIFY(logContents[2].startsWith("dump-arguments = "));
+    QVERIFY(logContents[2].endsWith("dummygen-args.log"));
+    QCOMPARE(logContents[3], QString("generator-set = dummy"));
+    QVERIFY(logContents[4].startsWith("header-file = "));
+    QVERIFY(logContents[4].endsWith("test_global.h"));
+    QCOMPARE(logContents[5],
+             QDir::toNativeSeparators(QString("include-paths = /include/path/location1%1/include/path/location2").arg(PATH_SPLITTER)));
+    QCOMPARE(logContents[6], QString("no-suppress-warnings"));
+    QCOMPARE(logContents[7], QString("output-directory = /tmp/output"));
+    QVERIFY(logContents[8].startsWith("project-file = "));
+    QVERIFY(logContents[8].endsWith("dummygentest-project.txt"));
+    QVERIFY(logContents[9].startsWith("typesystem-file = "));
+    QVERIFY(logContents[9].endsWith("test_typesystem.xml"));
+    QCOMPARE(logContents[10],
+             QDir::toNativeSeparators(QString("typesystem-paths = /typesystem/path/location1%1/typesystem/path/location2").arg(PATH_SPLITTER)));
+}
+
+QTEST_APPLESS_MAIN(DummyGenTest)
+
+#include "dummygentest.moc"
+
diff --git a/tests/test_generator/dummygentest.h b/tests/test_generator/dummygentest.h
new file mode 100644
index 000000000..0f485ae81
--- /dev/null
+++ b/tests/test_generator/dummygentest.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef DUMMYGENTABLETEST_H
+#define DUMMYGENTABLETEST_H
+
+#include <QObject>
+
+class DummyGenerator;
+
+class DummyGenTest : public QObject
+{
+    Q_OBJECT
+
+private:
+    QString workDir;
+    QString headerFilePath;
+    QString typesystemFilePath;
+    QString generatedFilePath;
+    QString projectFilePath;
+
+private slots:
+    void initTestCase();
+    void testCallGenRunnerWithFullPathToDummyGenModule();
+    void testCallGenRunnerWithNameOfDummyGenModule();
+    void testCallDummyGeneratorExecutable();
+    void testProjectFileArgumentsReading();
+};
+
+#endif
+
diff --git a/tests/test_generator/dummygentestconfig.h.in b/tests/test_generator/dummygentestconfig.h.in
new file mode 100644
index 000000000..9da17dcd3
--- /dev/null
+++ b/tests/test_generator/dummygentestconfig.h.in
@@ -0,0 +1,15 @@
+#ifndef DUMMYGENTESTCONFIG_H
+#define DUMMYGENTESTCONFIG_H
+
+#define MODULE_EXTENSION "@CMAKE_SHARED_LIBRARY_SUFFIX@"
+#define DUMMYGENERATOR_BINARY "@DUMMYGENERATOR_EXECUTABLE@"
+#define DUMMYGENERATOR_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@"
+
+#ifdef _WINDOWS
+    #define PATH_SPLITTER ";"
+#else
+    #define PATH_SPLITTER ":"
+#endif
+
+#endif // DUMMYGENTESTCONFIG_H
+
diff --git a/tests/test_generator/main.cpp b/tests/test_generator/main.cpp
new file mode 100644
index 000000000..47ad4d0a5
--- /dev/null
+++ b/tests/test_generator/main.cpp
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <QtCore>
+
+int main(int argc, char *argv[])
+{
+    QStringList args;
+    args.append("--generator-set=dummy");
+    for (int i = 1; i < argc; i++)
+        args.append(argv[i]);
+    return QProcess::execute("generatorrunner", args);
+}
+
diff --git a/tests/test_generator/run_test.cmake b/tests/test_generator/run_test.cmake
new file mode 100644
index 000000000..34a821d80
--- /dev/null
+++ b/tests/test_generator/run_test.cmake
@@ -0,0 +1,11 @@
+# The tests are run through this script due to a limitation
+# on versions of CMake lesser than 2.8, that prevent setting
+# environment variables for tests from working.
+
+set(ENV{PATH} "${ENV_PATH}")
+set(ENV{QT_PLUGIN_PATH} "${ENV_QT_PLUGIN_PATH}")
+execute_process(COMMAND ${TEST} WORKING_DIRECTORY "${WORKDIR}" RESULT_VARIABLE OK)
+
+if(NOT OK EQUAL 0)
+    message(SEND_ERROR "${TEST} failed!")
+endif()
diff --git a/tests/test_generator/test_global.h b/tests/test_generator/test_global.h
new file mode 100644
index 000000000..6a95200cf
--- /dev/null
+++ b/tests/test_generator/test_global.h
@@ -0,0 +1 @@
+struct Dummy {};
diff --git a/tests/test_generator/test_typesystem.xml b/tests/test_generator/test_typesystem.xml
new file mode 100644
index 000000000..c19a4e95e
--- /dev/null
+++ b/tests/test_generator/test_typesystem.xml
@@ -0,0 +1,3 @@
+<typesystem package='dummy'>
+    <value-type name='Dummy'/>
+</typesystem>