feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

311 Commits

Author SHA1 Message Date
Kai Koehne
644f98483a QmlDesigner: Fix import handling in rewriter 
Task-number: BAUHAUS-602
Reviewed-by: Erik Verbruggen
 2010-06-10 15:15:31 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
 2010-06-10 15:00:16 +02:00
Erik Verbruggen
2de4a98ce0 Fixed id syncing when and id gets removed from the QML source. 
Task-number: BAUHAUS-780
Reviewed-by: kkoehne
 2010-06-10 11:18:50 +02:00
Kai Koehne
190fdf360c QmlDesigner: Add test case for Rewriter not removing Ids form model 
Task-number: BAUHAUS-780
 2010-06-10 10:26:32 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
Kai Koehne
b17cd1fd85 QuickDesigner: Fix core test 
Since fa640f66db we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.
 2010-06-04 09:53:33 +02:00
Kai Koehne
e5efa55a20 QuickDesigner: Fix compilation of QuickDesigner/core tests 
Commit 112df597db removed the definition, but not declaration of
test method.

Reviewed-by: erikv
 2010-06-04 09:53:33 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-06-02 09:57:23 +02:00
Erik Verbruggen
112df597db Fixed default property discovery for custom QML components. 
Reviewed-by: Christian Kamm
 2010-05-31 12:21:12 +02:00
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
Oswald Buddenhagen
123937fb2a Merge remote branch 'origin/2.0' 2010-05-28 12:45:41 +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
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
Thomas Hartmann
a952b9ba4e QmlDesigner.autoTests 
Integration tests

TestCore::testAnchorsAndRewriting
TestCore::testAnchorsAndRewritingCenter

Task-number: Bauhaus-109
 2010-05-25 17:51:19 +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
Thomas Hartmann
392123e755 QmlDesigner: skip test 2010-05-20 11:21:25 +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
Thomas Hartmann
7f59988ec1 QmlDesigner: new autotest testRewriterForGradientMagic 2010-05-19 13:54:18 +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
Thomas Hartmann
e92b49910b QmlDesigner.test compile fix for tests 2010-05-10 13:20:29 +02:00
Kai Koehne
34d3b5d8ac QuickDesigner: Remove dependency of autotests to tests/manual/qml 
Copy over used files to tests/auto/qml/qmldesigner/data directory.
 2010-04-28 09:59:31 +02:00
Erik Verbruggen
b149ee8dbb Fixed invalid order when inserting new objects. 
Done-with: ckamm
Task-number: BAUHAUS-631
 2010-04-26 16:21:40 +02:00
Kai Koehne
797bc649ea Quick Designer: Fix core tests 
'property var' isn't supported any more, it's now 'property variant'
 2010-04-26 13:29:40 +02:00
Kai Koehne
ddc7641638 Qml: Bump library version from 4.6 to 4.7 
All types in the Qt namespace now have 4.7 as minimum version.
 2010-04-23 13:46:13 +02:00
Thomas Hartmann
6b09a506ac QmlDesigner: auto test for BAUHAUS-631 2010-04-23 13:10:10 +02:00
Thomas Hartmann
87a09deb83 QmlDesigner: extending auto tests 2010-04-23 11:25:54 +02:00
Erik Verbruggen
6237bbb453 Fixed rewriting for grouped properties. 2010-04-22 18:50:29 +02:00
Erik Verbruggen
b03ef971b0 Fixed reading of grouped properties. 
Task-number: BAUHAUS-620
 2010-04-22 17:16:54 +02:00
Kai Koehne
e7a9619c2f QmlDesigner: Bump version number from 4.6 to 4.7 in qml files 
Reviewed-by: Thomas Hartmann
 2010-04-13 15:15:15 +02:00
Kai Koehne
5650dbc55d Replace 'var' by 'variant' in all Qml files 
45ca7aff2c04c in qt.git replaces 'var' with 'variant'

Reviewed-by: Thomas Hartmann
 2010-04-13 15:15:15 +02:00
Kai Koehne
99cbb2f868 QmlDesigner: Cleaning up coretests 
Removing tests that have been Skipped forever, and enabling others
again.
 2010-04-13 15:15:15 +02:00
Kai Koehne
7796db0f08 QmlDesigner: Unify names of auto tests 2010-04-13 15:15:15 +02:00
Erik Verbruggen
e615cf82a5 Fixed regression when assigning an object binding to an array property. 2010-04-06 12:57:02 +02:00
Kai Koehne
746d73c328 QmlDesigner: Fix coretests for Mac OS X 2010-04-06 12:04:28 +02:00
Kai Koehne
639ae491c1 QmlDesigner: Store result of bauhaustests in $CREATORDIR/../bauhaustests 2010-04-06 10:51:19 +02:00
Kai Koehne
2cb9e2fff7 QmlDesigner: Add help script to run tst_bauhaus & store results in file 2010-04-05 22:18:58 +02:00
Kai Koehne
9095f77d71 Place tst_qmldesigner_core in local directory (again) 
Also unify path handling somewhat
 2010-04-01 12:11:25 +02:00
Thomas Hartmann
d445fcabdd QmlDesigner: fix plugin loading for auto tests 2010-03-31 18:49:06 +02:00
Marco Bubke
8faae5813d Fix test for parent to parentItem 2010-03-31 14:41:23 +02:00
Marco Bubke
65c2dfb7bc Fix rewriter test 2010-03-31 14:41:23 +02:00
Marco Bubke
b40bdf8a3d Change test from parent to parentItem 2010-03-31 12:59:05 +02:00
Thomas Hartmann
e37b101d22 QmlDesigner: new auto test TestCore::loadTestFiles 2010-03-31 11:05:27 +02:00