feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
hjk
2010-06-02 09:57:23 +02:00
parent 89687ddd4b 13e042737f
commit 5806009d29
94 changed files with 5086 additions and 3391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qml/qmldump/main.cpp
View File

@@ -257,9 +257,9 @@ int main(int argc, char *argv[])
{
QByteArray code;
code += "import Qt 4.7;\n";
code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\n";
code += "import Qt.labs.particles 4.7;\n";
code += "import Qt.labs.gestures 4.7;\n";
code += "import Qt.labs.folderlistmodel 4.7;\n";
code += "import org.webkit 1.0;\n";
code += "Item {}";
QDeclarativeComponent c(engine);
@@ -313,9 +313,9 @@ int main(int argc, char *argv[])
QByteArray code;
code += "import Qt 4.7;\n";
code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\n";
code += "import Qt.labs.particles 4.7;\n";
code += "import Qt.labs.gestures 4.7;\n";
code += "import Qt.labs.folderlistmodel 4.7;\n";
code += "import org.webkit 1.0;\n";
code += tyName;
code += " {}\n";