feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
74,059 Commits 108 Branches 368 Tags
644b51a699c98fbcd47d89c59404e3b4f12d8a92
Commit Graph

6686 Commits

Author SHA1 Message Date
Erik Verbruggen
f840d9835d Removed invalid testcase. 
Reviewed-by: Christian Kamm
 2010-05-31 11:48:53 +02:00
Kai Koehne
f7ed1eb879 QuickDesigner: Make metainfo system robust for different version numbers 
With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.

This commit includes several changes by Marco Bubke.

Reviewed-by: Marco Bubke
 2010-05-28 16:38:34 +02:00
Marco Bubke
27688270fd Load plugins at the beginning of the meta info initializing 
Reviewed-by: kkoehne
 2010-05-28 16:38:29 +02:00
hjk
1b3e9db046 debugger: implement "old" QSize and QSizeF dumpers, re-enable QImage/QPixmap 2010-05-28 15:48:20 +02:00
hjk
a2bb9893a5 debugger: add another version string to the auto test 2010-05-28 15:48:20 +02:00
hjk
25a30c402b debugger: add some wcout related tests 2010-05-28 13:16:13 +02:00
Oswald Buddenhagen
123937fb2a Merge remote branch 'origin/2.0' 2010-05-28 12:45:41 +02:00
hjk
5afeaa720d debugger: more robust version string parsing 
Fix for QTCREATORBUG-1490

Reviewed-By: Friedemann Kleint
 2010-05-27 15:55:01 +02:00
Thomas Hartmann
a49bbb4d15 QmlDesigner.test: adding qml files 2010-05-27 12:00:12 +02:00
Thomas Hartmann
251c259b60 QmlDesigner.autoTest: adds testComponentLoadingTabWidget 2010-05-27 11:48:04 +02:00
Thomas Hartmann
6e388a3941 QmlDesigner.autoTests: compilefix 
Reviewed-by: Kai Koehne
 2010-05-27 11:48:03 +02:00
hjk
ed018f691a qml auto test: add DEFINES+=QT_CREATOR 2010-05-27 11:12:31 +02:00
hjk
5805788290 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp
 2010-05-27 11:11:53 +02:00
hjk
69c84c9cc3 debugger: fix QList dumper for large movable objects 
Doh!
(cherry picked from commit df0e1e5625)
 2010-05-26 17:22:59 +02:00
hjk
34f24e092f debugger: add manual test for arguments passed by reference 2010-05-26 14:43:50 +02:00
Erik Verbruggen
77bd9e2996 Fixed compression bugs in text refactoring. 
Task-number: BAUHAUS-729, BAUHAUS-731
 2010-05-26 12:42:53 +02:00
Erik Verbruggen
79cbc07b29 Fixed superfluous (and erroneous) semi-colon insertion. 
Bug: BAUHAUS-674
 2010-05-26 12:42:53 +02:00
Erik Verbruggen
e997f6de13 Fixed rewriter bug for subsequent reparent-in-out actions. 2010-05-26 12:42:53 +02:00
Friedemann Kleint
26b51e1638 Debugger: Fix compilation & test results of C++-library dumpers. 
Fix  breakage resulting from 3d852917187e29892529ab51d24c1a1177068a88
(Qt 4.7), remove obsolete 'saddr'-element.
 2010-05-26 09:32:10 +02:00
Thomas Hartmann
a952b9ba4e QmlDesigner.autoTests 
Integration tests

TestCore::testAnchorsAndRewriting
TestCore::testAnchorsAndRewritingCenter

Task-number: Bauhaus-109
 2010-05-25 17:51:19 +02:00
Erik Verbruggen
cedaebc315 Fixed superfluous (and erroneous) semi-colon insertion. 
Bug: BAUHAUS-674
 2010-05-25 17:32:39 +02:00
Erik Verbruggen
bfba256455 Fixed rewriter bug for subsequent reparent-in-out actions. 2010-05-25 17:00:53 +02:00
con
e327467a03 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
 2010-05-21 16:04:27 +02:00
Thomas Hartmann
a484bb240d QmlDesigner.tests: an integration test for the metaInfo 2010-05-21 11:28:28 +02:00
Thomas Hartmann
9ed5dac72e QmlDesigner: new files for auto tests 2010-05-21 11:28:28 +02:00
con
48db93a92f Merge remote branch 'origin/2.0' 2010-05-20 15:39:04 +02:00
Roberto Raggi
3b113a2d74 Deprecate the old template instantiation. 2010-05-20 15:22:09 +02:00
Leandro Melo
55b26868e6 Generic highlighter is now part of the text editor plugin. 2010-05-20 14:10:34 +02:00
hjk
dd714e9ccb debugger: improve QVariant(QString) dumper 2010-05-20 13:14:44 +02:00
hjk
df0e1e5625 debugger: fix QList dumper for large movable objects 
Doh!
 2010-05-20 13:14:44 +02:00
Erik Verbruggen
8d5dde66c0 Fixed qualified name creation for ObjC classes and protocols. 
Also fixed the tests for it.
 2010-05-20 12:13:44 +02:00
Thomas Hartmann
392123e755 QmlDesigner: skip test 2010-05-20 11:21:25 +02:00
con
7f4cbe2383 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/moduleshandler.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
 2010-05-20 09:28:00 +02:00
Kai Koehne
cdb69f7f6f QuickDesigner: Move metainfo tests in front of model tests 
The model depends on valid metainfo information.
 2010-05-19 20:36:25 +02:00
hjk
58cbf845fa debugger: add address of pointees of generic pointers 2010-05-19 14:19:33 +02:00
Thomas Hartmann
7f59988ec1 QmlDesigner: new autotest testRewriterForGradientMagic 2010-05-19 13:54:18 +02:00
Leandro Melo
ef84027b0e Unit tests for specific rules of the generic highlighter. 2010-05-19 12:49:37 +02:00
hjk
c50dd85088 debugger: show return value of last function call in Locals and Watchers view 
Works only with gdb/Python so far.
 2010-05-19 12:00:56 +02:00
Roberto Raggi
41882862a2 Compile. 2010-05-18 10:33:35 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Kai Koehne
924da63d7d QuickDesigner: Fully implement versioning support in metatype system 
Store qml versions in the metatype system. Instead of just assuming
e.g. "4, 6" or "4, 7" as default, support passing "-1, -1" as versioning
wildcard.

When inspecting the qml meta type system, versions are now stored also
for types that have no qml name / version. The version of the referenting
type is then taken, e.g. there are now entries for "Qt/Object", 4, 7 and
"Qt/Object", 1, 0 (from QmlProject, 1, 0).

Furthermore, some unused methods were removed, and the logic changed insofar
as that a type can have only one direct super type.

Reviewed-by: Thomas Hartmann
Reviewed-by: Marco Bubke
 2010-05-12 21:26:20 +02:00
con
3922be1b2e Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
 2010-05-11 13:39:21 +02:00
Thomas Hartmann
e92b49910b QmlDesigner.test compile fix for tests 2010-05-10 13:20:29 +02:00
hjk
aae6810722 debugger: fix display of QStringList after a takeFirst(); 
(cherry picked from commit f9e6a96395)
 2010-05-06 16:59:41 +02:00
hjk
f9e6a96395 debugger: fix display of QStringList after a takeFirst(); 2010-05-06 16:24:12 +02:00
hjk
58c82e0366 Revert "Get rid of tcf/json in the autotests, too." 
This reverts commit 3aa358dea8.
 2010-05-05 11:47:30 +02:00
hjk
19ece94246 debugger: add example for non-alphabetically sorted struct members 2010-05-05 11:46:29 +02:00
hjk
24d1fbd15b debugger: support for per-thread breakpoints 2010-04-30 13:41:19 +02:00
hjk
bfdca8869f fakevim: fix autotest after recent changes to input handling 2010-04-29 16:11:46 +02:00
hjk
0d67d78ace fakevim: adjust tests to use 'iskeyword' 2010-04-29 16:11:46 +02:00