feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
8,184 Commits 108 Branches 368 Tags
fbd7b3c2020111d76c3cec9f2d39f89424ddabb0
Commit Graph

6979 Commits

Author SHA1 Message Date
hjk
071c99b4a5 debugger: more Book Case, some new tooltips. 2010-02-17 17:08:02 +01:00
dt
2e870d3753 Fix stylesheet hack to only be used with 4.6 
Note: If you are compiling with 4.6 but running against 4.7 then this
will result in a slightly buggy line edit.
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
 2010-02-17 16:54:50 +01:00
dt
3c99f02bcb Rename QMake to qmake since that's the official spelling. 2010-02-17 16:54:50 +01:00
dt
8e04e42320 Split updateToolBarActions again. 
And rename it to updateRunActions() again, since that function is
only called if the run actions actually change.
 2010-02-17 16:51:02 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file 
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
 2010-02-17 16:51:02 +01:00
dt
508173b872 Make it possible to add spaces to makestep arguments :) 2010-02-17 16:51:02 +01:00
Christiaan Janssen
7fbbe74e20 QmlDesigner.PropertyEditor: color widget improvements 2010-02-17 16:35:20 +01:00
Kai Koehne
fb8357136e Remove support for old .qmlproject file format 
We used to fail back to the old format if the .qmlproject file
was invalid. Anyhow, this lead to weird effects ... better disable
it explicitly.

That no warning is shown right now when loading an invalid qmlproject
file is a bug in coreplugin.
 2010-02-17 16:32:41 +01:00
mae
20ec30223c Block highlight works incorrectly with methods having parameters split in several lines 
task-number: QTCREATORBUG-611
 2010-02-17 16:02:47 +01:00
Erik Verbruggen
727d71a48d Temporary fix, waiting for qt-qml staging to trickle in. 2010-02-17 16:01:41 +01:00
Christiaan Janssen
04d15f09a2 QmlDesigner.PropertyEditor: Added missing functionality for color chooser widget 2010-02-17 15:22:56 +01:00
Christiaan Janssen
20064a8313 QmlDesigner.PropertyEditor: Hue control fixed 2010-02-17 15:22:56 +01:00
Thorbjørn Lindeijer
99af2f9cca Fixed the border of the completion widget 
Broke in f14c50dabc
 2010-02-17 15:19:10 +01:00
Tobias Hunger
2e0a71f0b9 Fix build. 
* Accidentally included a header not ready to commit yet.
 2010-02-17 15:00:32 +01:00
Marco Bubke
fb3fe32c27 Replace : with - in path name because : path names are invalid for some 
OS
 2010-02-17 14:54:20 +01:00
Marco Bubke
8584dfc591 Fix crash for a real only object property which is a null object 2010-02-17 14:54:20 +01:00
Tobias Hunger
1b64f6a18e Remove unnecessary #includes 2010-02-17 14:36:45 +01:00
Marco Bubke
f2e3ffc776 Fix crash for a activated state which has no StateGroup 2010-02-17 13:35:39 +01:00
Lasse Holmstedt
b031b206c0 Cleaned up qmlinspector and qmlproject and removed 
metatype redefinition
 2010-02-17 13:08:29 +01:00
Lasse Holmstedt
f38ff9648e Moved Qml Inspector Output pane to a dock widget within the debugger. 2010-02-17 12:58:25 +01:00
Christiaan Janssen
a2f1889c0b QmlDesigner.ItemLibrary: trailing whitespace 2010-02-17 11:58:45 +01:00
Christiaan Janssen
9ee467a846 QmlDesigner.ItemLibrary: Adjusted grid line colors 2010-02-17 11:58:45 +01:00
Christiaan Janssen
a3bc972a46 QmlDesigner.ItemLibrary: Adjusted icon size to avoid scaling 2010-02-17 11:58:44 +01:00
Christiaan Janssen
154125ecca QmlDesigner.ItemLibrary: Changed highlight colors 2010-02-17 11:58:44 +01:00
ck
96690963d3 Fix compilation with namespaced Qt. 2010-02-17 11:57:02 +01:00
Kai Koehne
b5646d35da Don't show error message if file added to qmlproject is picked up 
Check for the case that a new file to be added to a .qmlproject
is also automatically covered e.g. by a wildcard filter. In this
case we don't have to do anything.
 2010-02-17 11:22:37 +01:00
Thorbjørn Lindeijer
24a225de40 Avoid a bunch of function calls 2010-02-17 10:48:05 +01:00
Thorbjørn Lindeijer
f14c50dabc Simplified the structure of the CompletionWidget 
Done-with: Roberto Raggi <roberto.raggi@nokia.com>
 2010-02-17 10:48:05 +01:00
Kai Koehne
ba9a197e5e Disable adding of files to a .qmlproject 
The old code still assumed the old, plain text format, and just added
the file path to the end of the file. This broke the new .qmlproject
file format.

Ideally QmlProject should be clever enough to check whether the file
will be automatically picked up in the monitored directories, and if
not added explicitly e.g. to QmlFiles { paths: ... }. Anyhow, this
quick fix just shows every time an error message instead of destroying
the .qmlproject file.
 2010-02-17 10:22:15 +01:00
Friedemann Kleint
be6fd06e95 CDB: Set symbol options at initalization phase. 2010-02-17 10:21:25 +01:00
Christian Kamm
3035733415 Workaround for not erroring on anchors { ... } in Qml for now. 2010-02-17 09:29:13 +01:00
Christian Kamm
265118eb5e Add the onNameChanged signals that Qml properties generate implicitly. 2010-02-17 09:17:29 +01:00
Kai Koehne
1f411118bf Fix compilation error with gcc 4.4.3 
call of overloaded ‘QString(int)’ is ambiguous
 2010-02-17 09:17:54 +01:00
Christian Kamm
a0431f0563 Don't error for unknown property names inside ListElement for now. 2010-02-17 09:01:39 +01:00
Christian Kamm
4ab2272a89 Remove unused parameter. 2010-02-17 08:58:33 +01:00
Christian Kamm
669b9c4552 Add signals defined in Qml and their generated slots to the code model. 2010-02-17 08:45:39 +01:00
Marco Bubke
b6460f9251 Remove OpenGL dependency 2010-02-16 20:11:22 +01:00
Marco Bubke
780899b1db Refactor state changes in Bauhaus 2010-02-16 19:52:33 +01:00
con
5864d9d751 Make it possible to disable modes. 2010-02-16 18:27:17 +01:00
Robert Loehning
0ac0d532a6 Compile fix. 2010-02-16 18:15:40 +01:00
Marco Bubke
9360ea04ae Remove obsolet function 2010-02-16 17:20:41 +01:00
Marco Bubke
5b68328886 States updating works again in Bauhaus 2010-02-16 17:20:41 +01:00
Lasse Holmstedt
8605750b5f Added a missing slot implementation for server address change 2010-02-16 17:15:38 +01:00
Erik Verbruggen
c79f25d5a6 Fixed Q_PROPERTY parsing to handle all possible cases. 2010-02-16 17:04:26 +01:00
Lasse Holmstedt
8c2928e12e Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 
Conflicts:
	src/plugins/qmlinspector/qmlinspectorplugin.h
 2010-02-16 16:55:47 +01:00
Jörg Schummer
2791cfbdd1 QmlDesigner.ItemLibrary: integrated the new Qml-based item library 
Task-number: BAUHAUS-204
Task-number: BAUHAUS-207
Task-number: BAUHAUS-339
Task-number: BAUHAUS-365
Task-number: BAUHAUS-374
Reviewed-by: kkoehne
 2010-02-16 16:39:32 +01:00
Lasse Holmstedt
4e5089d90d Merge branch 'debugintegration' 
Conflicts:
	src/plugins/qmlprojectmanager/qmlproject.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
 2010-02-16 16:30:41 +01:00
Marco Bubke
6585742fc7 Allways use a NodeInstanceMetaObject in ObjectNodeInstance 2010-02-16 16:17:53 +01:00
Marco Bubke
d43a4710d5 change setNodeInstance in setNodeInstanceView 2010-02-16 16:17:53 +01:00
Jens Bache-Wiig
9e079d3a36 Dont draw tab with no index 2010-02-16 16:10:01 +01:00