Merge branch 'new_metaobject'

* new_metaobject:
  fixing the shiboken tests (renaming effects)
  remove metaObject method (done when parsing sources with Q_DOC macro)

12 files changed, 10 insertions, 11 deletions

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 4616739..bcef5a7 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -5,11 +5,11 @@ find_package(Qt5XmlPatterns)
 
 set(shiboken2_SRC
 generator.cpp
-shiboken/cppgenerator.cpp
-shiboken/headergenerator.cpp
-shiboken/overloaddata.cpp
-shiboken/shibokengenerator.cpp
-shiboken/shibokennormalize.cpp
+shiboken2/cppgenerator.cpp
+shiboken2/headergenerator.cpp
+shiboken2/overloaddata.cpp
+shiboken2/shibokengenerator.cpp
+shiboken2/shibokennormalize.cpp
 main.cpp
 )
 
@@ -18,7 +18,7 @@ if (NOT DISABLE_DOCSTRINGS)
     add_definitions(-DDOCSTRINGS_ENABLED)
 endif()
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken2
                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
                     ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/generator/shiboken/CMakeLists.txt b/generator/shiboken2/CMakeLists.txt
index aa3405b..b734387 100644
--- a/generator/shiboken/CMakeLists.txt
+++ b/generator/shiboken2/CMakeLists.txt
@@ -18,9 +18,9 @@ include_directories(${generators_SOURCE_DIR}
                     ${Qt5Xml_INCLUDE_DIRS}
                     )
 
-add_executable(shiboken ${shiboken_SRC})
-set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
-target_link_libraries(shiboken
+add_executable(shiboken2 ${shiboken_SRC})
+set_target_properties(shiboken2 PROPERTIES OUTPUT_NAME shiboken2${shiboken_SUFFIX})
+target_link_libraries(shiboken2
                       ${APIEXTRACTOR_LIBRARY}
                       ${Qt5Core_LIBRARIES}
                       ${Qt5Xml_LIBRARIES}
@@ -28,4 +28,4 @@ target_link_libraries(shiboken
 
 configure_file(shibokenconfig.h.in "${CMAKE_CURRENT_BINARY_DIR}/shibokenconfig.h" @ONLY)
 
-install(TARGETS shiboken DESTINATION bin)
+install(TARGETS shiboken2 DESTINATION bin)
diff --git a/generator/shiboken/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp
index 7138b56..7138b56 100644
--- a/generator/shiboken/cppgenerator.cpp
+++ b/generator/shiboken2/cppgenerator.cpp
diff --git a/generator/shiboken/cppgenerator.h b/generator/shiboken2/cppgenerator.h
index ba3b310..ba3b310 100644
--- a/generator/shiboken/cppgenerator.h
+++ b/generator/shiboken2/cppgenerator.h
diff --git a/generator/shiboken/headergenerator.cpp b/generator/shiboken2/headergenerator.cpp
index 51f03af..b5fa606 100644
--- a/generator/shiboken/headergenerator.cpp
+++ b/generator/shiboken2/headergenerator.cpp
@@ -133,7 +133,6 @@ void HeaderGenerator::generateClass(QTextStream& s, const AbstractMetaClass* met
         if ((!avoidProtectedHack() || !metaClass->hasPrivateDestructor())
             && usePySideExtensions() && metaClass->isQObject()) {
             s << "public:\n";
-            s << INDENT << "const QMetaObject* metaObject() const;" << endl;
             s << INDENT << "virtual int qt_metacall(QMetaObject::Call call, int id, void** args);" << endl;
             s << INDENT << "virtual void* qt_metacast(const char* _clname);" << endl;
         }
diff --git a/generator/shiboken/headergenerator.h b/generator/shiboken2/headergenerator.h
index a64c0d5..a64c0d5 100644
--- a/generator/shiboken/headergenerator.h
+++ b/generator/shiboken2/headergenerator.h
diff --git a/generator/shiboken/overloaddata.cpp b/generator/shiboken2/overloaddata.cpp
index 7335044..7335044 100644
--- a/generator/shiboken/overloaddata.cpp
+++ b/generator/shiboken2/overloaddata.cpp
diff --git a/generator/shiboken/overloaddata.h b/generator/shiboken2/overloaddata.h
index 8196812..8196812 100644
--- a/generator/shiboken/overloaddata.h
+++ b/generator/shiboken2/overloaddata.h
diff --git a/generator/shiboken/shibokengenerator.cpp b/generator/shiboken2/shibokengenerator.cpp
index abf5d07..abf5d07 100644
--- a/generator/shiboken/shibokengenerator.cpp
+++ b/generator/shiboken2/shibokengenerator.cpp
diff --git a/generator/shiboken/shibokengenerator.h b/generator/shiboken2/shibokengenerator.h
index adeb734..adeb734 100644
--- a/generator/shiboken/shibokengenerator.h
+++ b/generator/shiboken2/shibokengenerator.h
diff --git a/generator/shiboken/shibokennormalize.cpp b/generator/shiboken2/shibokennormalize.cpp
index aafb451..aafb451 100644
--- a/generator/shiboken/shibokennormalize.cpp
+++ b/generator/shiboken2/shibokennormalize.cpp
diff --git a/generator/shiboken/shibokennormalize_p.h b/generator/shiboken2/shibokennormalize_p.h
index 5ecdb6a..5ecdb6a 100644
--- a/generator/shiboken/shibokennormalize_p.h
+++ b/generator/shiboken2/shibokennormalize_p.h