@@ -0,0 +1,1 | |||
|
1 | qmake -tp vc -r PythonQt.pro |
@@ -1,4 +1,4 | |||
|
1 | 1 | TEMPLATE = subdirs |
|
2 | 2 | |
|
3 | 3 | CONFIG += ordered |
|
4 | SUBDIRS = src extensions tests examples | |
|
4 | SUBDIRS = generator src extensions tests examples |
@@ -18,7 +18,7 See http://labs.trolltech.com/page/Projects/QtScript/Generator for details of th | |||
|
18 | 18 | |
|
19 | 19 | The PythonQt wrappers generated by the generator are distributed under the LGPL, they are not restriced by the GPL. |
|
20 | 20 | |
|
21 |
The generated wrappers are pre-generated and checked-in for Qt 4. |
|
|
21 | The generated wrappers are pre-generated and checked-in for Qt 4.4.3, so you only need to build and run the | |
|
22 | 22 | generator when you want to build additional wrappers or you want to upgrade/downgrade to an newer Qt version. |
|
23 | 23 | |
|
24 | 24 | Documentation |
@@ -39,9 +39,9 void PythonQt_init_QtNetwork(); | |||
|
39 | 39 | void PythonQt_init_QtCore(); |
|
40 | 40 | void PythonQt_init_QtWebKit(); |
|
41 | 41 | void PythonQt_init_QtOpenGL(); |
|
42 | void PythonQt_init_QtPhonon(); | |
|
43 | 42 | void PythonQt_init_QtXml(); |
|
44 | 43 | void PythonQt_init_QtXmlPatterns(); |
|
44 | //void PythonQt_init_QtPhonon(); | |
|
45 | 45 | |
|
46 | 46 | namespace PythonQt_QtAll |
|
47 | 47 | { |
@@ -55,7 +55,7 namespace PythonQt_QtAll | |||
|
55 | 55 | PythonQt_init_QtSql(); |
|
56 | 56 | PythonQt_init_QtWebKit(); |
|
57 | 57 | PythonQt_init_QtOpenGL(); |
|
58 | PythonQt_init_QtPhonon(); | |
|
58 | // PythonQt_init_QtPhonon(); | |
|
59 | 59 | }; |
|
60 | 60 | }; |
|
61 | 61 |
@@ -18,7 +18,8 HEADERS += \ | |||
|
18 | 18 | SOURCES += \ |
|
19 | 19 | PythonQt_QtAll.cpp |
|
20 | 20 | |
|
21 |
QT += webkit gui svg sql network xml xmlpatterns |
|
|
21 | QT += webkit gui svg sql network xml xmlpatterns opengl | |
|
22 | #QT += phonon | |
|
22 | 23 | |
|
23 | 24 | include (../../generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core.pri) |
|
24 | 25 | include (../../generated_cpp/com_trolltech_qt_gui/com_trolltech_qt_gui.pri) |
@@ -26,7 +27,8 include (../../generated_cpp/com_trolltech_qt_svg/com_trolltech_qt_svg.pri) | |||
|
26 | 27 | include (../../generated_cpp/com_trolltech_qt_sql/com_trolltech_qt_sql.pri) |
|
27 | 28 | include (../../generated_cpp/com_trolltech_qt_network/com_trolltech_qt_network.pri) |
|
28 | 29 | include (../../generated_cpp/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri) |
|
29 | include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri) | |
|
30 | 30 | include (../../generated_cpp/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri) |
|
31 | 31 | include (../../generated_cpp/com_trolltech_qt_xml/com_trolltech_qt_xml.pri) |
|
32 | 32 | include (../../generated_cpp/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri) |
|
33 | ||
|
34 | #include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri) |
|
1 | NO CONTENT: modified file |
@@ -1,5 +1,11 | |||
|
1 | TARGET = pythonqt_generator | |
|
2 | CONFIG -= debug | |
|
3 | CONFIG += release | |
|
4 | DESTDIR = . | |
|
5 | ||
|
1 | 6 | include(generator.pri) |
|
2 | 7 | |
|
8 | ||
|
3 | 9 | # Input |
|
4 | 10 | HEADERS += \ |
|
5 | 11 | generatorsetqtscript.h \ |
@@ -22,6 +28,3 SOURCES += \ | |||
|
22 | 28 | shellheadergenerator.cpp \ |
|
23 | 29 | setupgenerator.cpp \ |
|
24 | 30 | docgenerator.cpp |
|
25 | ||
|
26 | CONFIG -= debug | |
|
27 | CONFIG += release |
@@ -58,7 +58,10 void PriGenerator::generate() | |||
|
58 | 58 | foreach (const QString &entry, list) { |
|
59 | 59 | file.stream << " $$PWD/" << entry << " \\\n"; |
|
60 | 60 | } |
|
61 | file.stream << " $$PWD/init.cpp\n"; | |
|
61 | QString initName = pri.key(); | |
|
62 | initName = initName.mid(initName.indexOf('/')+1); | |
|
63 | initName = initName.left(initName.length()-4); | |
|
64 | file.stream << " $$PWD/" + initName + "_init.cpp\n"; | |
|
62 | 65 | |
|
63 | 66 | if (file.done()) |
|
64 | 67 | ++m_num_generated_written; |
@@ -43,7 +43,7 | |||
|
43 | 43 | # include <phonon/phonon> |
|
44 | 44 | #endif |
|
45 | 45 | |
|
46 | #include "../qtbindings/qtscript_core/qtscriptconcurrent.h" | |
|
46 | //#include "../qtbindings/qtscript_core/qtscriptconcurrent.h" | |
|
47 | 47 | |
|
48 | 48 | #ifndef QT_NO_OPENGL |
|
49 | 49 | #define GL_ACCUM 0x0100 |
@@ -48,6 +48,7 void SetupGenerator::generate() | |||
|
48 | 48 | if (list.isEmpty()) |
|
49 | 49 | continue; |
|
50 | 50 | |
|
51 | QString packKey = pack.key(); | |
|
51 | 52 | QString packName = pack.key(); |
|
52 | 53 | QStringList components = packName.split("."); |
|
53 | 54 | if ((components.size() > 2) && (components.at(0) == "com") |
@@ -57,6 +58,7 void SetupGenerator::generate() | |||
|
57 | 58 | components.removeAt(0); |
|
58 | 59 | } |
|
59 | 60 | packName.replace(".", "_"); |
|
61 | packKey.replace(".", "_"); | |
|
60 | 62 | |
|
61 | 63 | QString shortPackName; |
|
62 | 64 | foreach (QString comp, components) { |
@@ -74,7 +76,7 void SetupGenerator::generate() | |||
|
74 | 76 | |
|
75 | 77 | |
|
76 | 78 | { |
|
77 | FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/init.cpp"); | |
|
79 | FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packKey + "_init.cpp"); | |
|
78 | 80 | QTextStream &s = initFile.stream; |
|
79 | 81 | |
|
80 | 82 | if (FileOut::license) |
|
1 | NO CONTENT: file was removed, binary diff hidden |
General Comments 0
You need to be logged in to leave comments.
Login now