GIT_REPOSITORIES/LPP/PythonQt Commit - r11:27e624e0d6f1

createSolution.bat created 644 +1 0

	@@ -0,0 +1,1
				1	qmake -tp vc -r PythonQt.pro

PythonQt.pro +1 -1

             TEMPLATE = subdirs
             CONFIG += ordered
-            SUBDIRS = src extensions tests examples
+            SUBDIRS = generator src extensions tests examples

README +1 -1

             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

extensions/PythonQt_QtAll/PythonQt_QtAll.cpp +2 -2

             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
             {
                 PythonQt_init_QtSql();
                 PythonQt_init_QtWebKit();
                 PythonQt_init_QtOpenGL();
-                PythonQt_init_QtPhonon();
+            //    PythonQt_init_QtPhonon();
               };
             };

extensions/PythonQt_QtAll/PythonQt_QtAll.pro +4 -2

             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_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)

generator/classgenerator.cpp +1 -1

               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();

generator/generator.pro +6 -3

+            TARGET = pythonqt_generator
+            CONFIG -= debug
+            CONFIG += release
+            DESTDIR = .
             include(generator.pri)
             # Input
             HEADERS += \
                     generatorsetqtscript.h \
                     shellheadergenerator.cpp \
                     setupgenerator.cpp \
                     docgenerator.cpp
-            CONFIG -= debug
-            CONFIG += release

generator/prigenerator.cpp +4 -1

                     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;

generator/qtscript_masterinclude.h +1 -1

             #  include <phonon/phonon>
             #endif
-            #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
+            //#include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
             #ifndef QT_NO_OPENGL
             #define GL_ACCUM                          0x0100

generator/setupgenerator.cpp +3 -1

                     if (list.isEmpty())
                         continue;
+                    QString packKey = pack.key();
                     QString packName = pack.key();
                     QStringList components = packName.split(".");
                     if ((components.size() > 2) && (components.at(0) == "com")
                         components.removeAt(0);
                     }
                     packName.replace(".", "_");
+                    packKey.replace(".", "_");
                     QString shortPackName;
                     foreach (QString comp, components) {
                     {
-                        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)

generator/generator removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages