- removed phonon temporarily

florianlink · florianlink · commit 5e44d34585ca · 2009-04-09T09:32:52.000Z
- changed init.cpp to "key"_init.cpp
- added solution setup bat file for windows
diff --git a/PythonQt.pro b/PythonQt.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
 CONFIG += ordered
-SUBDIRS = src extensions tests examples
+SUBDIRS = generator src extensions tests examples
diff --git a/README b/README
@@ -18,7 +18,7 @@ See http://labs.trolltech.com/page/Projects/QtScript/Generator for details of th
 
 The PythonQt wrappers generated by the generator are distributed under the LGPL, they are not restriced by the GPL.
 
-The generated wrappers are pre-generated and checked-in for Qt 4.5, so you only need to build and run the
+The generated wrappers are pre-generated and checked-in for Qt 4.4.3, so you only need to build and run the
 generator when you want to build additional wrappers or you want to upgrade/downgrade to an newer Qt version.
 
 Documentation
diff --git a/createSolution.bat b/createSolution.bat
@@ -0,0 +1 @@
+qmake -tp vc -r PythonQt.pro
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp
@@ -39,9 +39,9 @@ void PythonQt_init_QtNetwork();
 void PythonQt_init_QtCore();
 void PythonQt_init_QtWebKit();
 void PythonQt_init_QtOpenGL();
-void PythonQt_init_QtPhonon();
 void PythonQt_init_QtXml();
 void PythonQt_init_QtXmlPatterns();
+//void PythonQt_init_QtPhonon();
 
 namespace PythonQt_QtAll
 {
@@ -55,7 +55,7 @@ namespace PythonQt_QtAll
     PythonQt_init_QtSql();
     PythonQt_init_QtWebKit();
     PythonQt_init_QtOpenGL();
-    PythonQt_init_QtPhonon();
+//    PythonQt_init_QtPhonon();
   };
 };
 
diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro
@@ -18,15 +18,17 @@ HEADERS +=                \
 SOURCES +=                \
   PythonQt_QtAll.cpp
 
-QT += webkit gui svg sql network xml xmlpatterns phonon opengl
+QT += webkit gui svg sql network xml xmlpatterns opengl
+#QT += phonon 
 
 include (../../generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core.pri)
 include (../../generated_cpp/com_trolltech_qt_gui/com_trolltech_qt_gui.pri)
 include (../../generated_cpp/com_trolltech_qt_svg/com_trolltech_qt_svg.pri)
 include (../../generated_cpp/com_trolltech_qt_sql/com_trolltech_qt_sql.pri)
 include (../../generated_cpp/com_trolltech_qt_network/com_trolltech_qt_network.pri)
 include (../../generated_cpp/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri)
-include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri)
 include (../../generated_cpp/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri)
 include (../../generated_cpp/com_trolltech_qt_xml/com_trolltech_qt_xml.pri)
 include (../../generated_cpp/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri)
+
+#include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri)
diff --git a/generator/classgenerator.cpp b/generator/classgenerator.cpp
@@ -568,7 +568,7 @@ bool ClassGenerator::isSpecialStreamingOperator(const AbstractMetaFunction *fun)
   operator<<() to read/write an instance of meta_class.
 */
 static void writeStreamingOperatorCall(QTextStream &stream, const AbstractMetaFunction *fun,
-                                       const AbstractMetaClass */*meta_class*/, int indent)
+                                       const AbstractMetaClass * /*meta_class*/, int indent)
 {
     QString indentStr(indent, QLatin1Char(' '));
     QString streamClassName = fun->arguments().at(0)->type()->name();
diff --git a/generator/generator b/generator/generator
diff --git a/generator/generator.pro b/generator/generator.pro
@@ -1,5 +1,11 @@
+TARGET = pythonqt_generator
+CONFIG -= debug
+CONFIG += release
+DESTDIR = .
+
 include(generator.pri)
 
+
 # Input
 HEADERS += \
         generatorsetqtscript.h \
@@ -22,6 +28,3 @@ SOURCES += \
         shellheadergenerator.cpp \
         setupgenerator.cpp \
         docgenerator.cpp
-
-CONFIG -= debug
-CONFIG += release
diff --git a/generator/prigenerator.cpp b/generator/prigenerator.cpp
@@ -58,7 +58,10 @@ void PriGenerator::generate()
         foreach (const QString &entry, list) {
             file.stream << "           $$PWD/" << entry << " \\\n";
         }
-        file.stream << "           $$PWD/init.cpp\n";
+        QString initName = pri.key();
+        initName = initName.mid(initName.indexOf('/')+1);
+        initName = initName.left(initName.length()-4);
+        file.stream << "           $$PWD/" + initName + "_init.cpp\n";
 
         if (file.done())
             ++m_num_generated_written;
diff --git a/generator/qtscript_masterinclude.h b/generator/qtscript_masterinclude.h
@@ -43,7 +43,7 @@
 #  include <phonon/phonon>
 #endif
 
-#include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
+//#include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
 
 #ifndef QT_NO_OPENGL
 #define GL_ACCUM                          0x0100
diff --git a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
@@ -48,6 +48,7 @@ void SetupGenerator::generate()
         if (list.isEmpty())
             continue;
 
+        QString packKey = pack.key();
         QString packName = pack.key();
         QStringList components = packName.split(".");
         if ((components.size() > 2) && (components.at(0) == "com")
@@ -57,6 +58,7 @@ void SetupGenerator::generate()
             components.removeAt(0);
         }
         packName.replace(".", "_");
+        packKey.replace(".", "_");
       
         QString shortPackName;
         foreach (QString comp, components) {
@@ -74,7 +76,7 @@ void SetupGenerator::generate()
         
       
         {
-            FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/init.cpp");
+            FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp");
             QTextStream &s = initFile.stream;
 
             if (FileOut::license)

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,7 @@ bool ClassGenerator::isSpecialStreamingOperator(const AbstractMetaFunction *fun)`
`568`	`568`	`operator<<() to read/write an instance of meta_class.`
`569`	`569`	`*/`
`570`	`570`	`static void writeStreamingOperatorCall(QTextStream &stream, const AbstractMetaFunction *fun,`
`571`		`- const AbstractMetaClass /meta_class*/, int indent)`
	`571`	`+ const AbstractMetaClass * /meta_class/, int indent)`
`572`	`572`	`{`
`573`	`573`	`QString indentStr(indent, QLatin1Char(' '));`
`574`	`574`	`QString streamClassName = fun->arguments().at(0)->type()->name();`