feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

72811 Commits

Author SHA1 Message Date
Tobias Hunger
693781f254 Store editor ids as utf8. 
* This is more compatible with what we did so far.

Reviewed-by: Erik Verbruggen
 2010-01-07 19:19:25 +01:00
Erik Verbruggen
ee95ffcdb8 Caught up with interface changes. 2010-01-07 18:58:43 +01:00
Erik Verbruggen
b87462f714 Fix id removal propagation to the qml editor. 2010-01-07 18:24:30 +01:00
Erik Verbruggen
1d3c58cca1 Added warning for duplicate IDs. 2010-01-07 18:24:29 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
con
2e495e7075 Version bump. 2010-01-07 18:17:10 +01:00
Friedemann Kleint
8bb87fcda4 VCS[Mercurial]: Single file log annotation. 
Task-number: QTCREATORBUG-503
 2010-01-07 17:29:58 +01:00
Friedemann Kleint
bcba9ea604 VCS [git]: Annotate previous version/single filelog annotation. 
Task-number: QTCREATORBUG-503
 2010-01-07 17:29:14 +01:00
ck
322ef6b83a Maemo: Missing initialization bugfix + string capitalization. 2010-01-07 17:24:54 +01:00
Christiaan Janssen
41e093cdbd patch was badly applied 2010-01-07 16:54:56 +01:00
ck
60f97e5cff Maemo: Add key deployment feature to options page. 2010-01-07 16:42:01 +01:00
Roberto Raggi
f209b06574 Initial work on the new indenter for Qt Script. 2010-01-07 16:35:19 +01:00
Thomas Hartmann
53db20f409 Qml Designer: states editor - circumvent a crash 2010-01-07 16:28:00 +01:00
Thomas Hartmann
418fda6189 Qml Designer - property editor: This patch avoids bindings of undefined objects 
This fixes random crashes
 2010-01-07 16:27:59 +01:00
hjk
c283c05d31 debugger: -break-list should be discardable if we do in in each step 2010-01-07 16:25:18 +01:00
hjk
67027dddb6 fakevim: comment out warning about unhandled commands 2010-01-07 16:25:18 +01:00
Marco Bubke
8377eb3b74 Fix cosmetic problems with the frame boxes. 2010-01-07 16:25:00 +01:00
Marco Bubke
efa2482da9 Fix drawing of the outer frame of Qml item 2010-01-07 16:25:00 +01:00
Thorbjørn Lindeijer
aeaaa39225 Use the completion case sensitivity settings also for relevance 
Avoids some annoyance for people using case-sensitive completion, when
unrelated completions items would get higher relevance because they
start with the typed string when matched case-insensitively.

In case-insensitive mode, a case-sensitive prefix match now does get a
higher relevance than a case-insensitive match.

Reviewed-by: con
 2010-01-07 15:42:08 +01:00
ck
af64744706 Maemo: Add option to create directory on device in deployment API. 2010-01-07 15:23:33 +01:00
Erik Verbruggen
6b1a98cdb3 Fixed too eager asserts: thrown exceptions are expected and handled in the TextToModelMerger. 2010-01-07 15:13:01 +01:00
hjk
976b7b9e30 debugger: second attempt to write out pointer names 2010-01-07 14:41:37 +01:00
Tobias Hunger
f5a893bc5a Add copyright headers. 
* Make sure all non-empty source files found below ./src have
   a copyright header.

Reviewed-by: con
 2010-01-07 14:33:28 +01:00
ck
39815bdd32 Maemo: Remove QFlags workaround. 
Thanks to commit dedea5ea19,
QFlags' operator| works out of the box again.
 2010-01-07 13:55:46 +01:00
ck
dedea5ea19 Move Q_DECLARE_OPERATORS_FOR_FLAGS out of namespaces. 
If this macro is used inside a namespace, it hides global operators.

Reviewed-by: hjk
 2010-01-07 13:53:48 +01:00
Thomas Hartmann
9a0baca9a5 QmlDesigner property editor: we have to hide the non active widget 2010-01-07 13:42:39 +01:00
Kai Koehne
d797eb435c Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline into mainline_master 2010-01-07 12:28:28 +01:00
Kai Koehne
818a7b226b New QmlDesigner plugin & Design mode 
This adds a new "Design" mode that can be used to manipulate qml files
in a visual way. It will only get build if you have the declarativeui
module in Qt.

This is a squashed import from the Bauhaus project. Share & enjoy :)
 2010-01-07 12:14:35 +01:00
Friedemann Kleint
b4969672d3 VCS[Perforce/SVN/CVS]: Add "Annotate" to single file logs. 
...over change numbers. Add missing "Log project/repository"
actions and log count limits.
Task-number: QTCREATORBUG-503
 2010-01-07 11:33:30 +01:00
ck
aadc0b9bd6 Compile fix for 695349b6f4. 2010-01-07 11:27:32 +01:00
ck
695349b6f4 Maemo: Move MaemoRunConfigurationWidget into separate set of files. 
File maemorunconfiguration.cpp now contains what the name indicates.
 2010-01-07 11:21:11 +01:00
Thorbjørn Lindeijer
ae535daa20 Merge branch '1.3' 
Conflicts:
	src/plugins/git/gitplugin.cpp
 2010-01-07 09:09:45 +01:00
Thorbjørn Lindeijer
fdbdf50ce4 Fixed warnings about absolutePath on empty filename in git plugin 
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2010-01-07 08:58:01 +01:00
Friedemann Kleint
cce26703ae Fix warnings about QFileInfo being instantiated on empty string. 
Do not insert currentDocument variable for empty files.
Polish VariableManager, QLatin1String(), const-correctness.

Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
 2010-01-07 08:35:32 +01:00
ck
138b12b5dc Maemo: Move MaemoRunControl classes to their own files. 
The maemorunconfiguration.cpp file contained (and still contains)
too many different classes.
 2010-01-06 18:20:43 +01:00
hjk
cf010f764a debugger: fix the last two commits 2010-01-06 18:01:19 +01:00
Erik Verbruggen
cc79467d00 Added CString->NSString quick-fix. 2010-01-06 17:39:36 +01:00
Erik Verbruggen
59a4b03b17 ifdeffed out a debug-utility method. 2010-01-06 17:39:36 +01:00
Erik Verbruggen
99bc0bc672 Added a dump method to the ASTPath. 2010-01-06 17:39:35 +01:00
Erik Verbruggen
8d8312a427 Fix to include the last character of a node into the position calculation. 2010-01-06 17:39:35 +01:00
Erik Verbruggen
c50172e201 Changed string-wrapping quickfix to handle @"strings". 2010-01-06 17:39:35 +01:00
Erik Verbruggen
eb1baa9e2e Fix to selector parameter position. 2010-01-06 17:39:35 +01:00
Erik Verbruggen
5723682b21 Fixes for highlighting locals in Objective-C methods. 2010-01-06 17:39:35 +01:00
Friedemann Kleint
7c0f4e8f50 VCS[SVN, CVS, Perforce]: Implement "Annotate Previous" context menu. 
in annotation editor, including base infrastructure in
VCSBaseEditor. Pass signals of VCSBaseEditor to opaque
VCSBaseEditable (IEditor) for convenience.

Task-number: QTCREATORBUG-503
 2010-01-06 17:24:40 +01:00
hjk
3dde364a38 compile fix with namespaces 2010-01-06 17:13:38 +01:00
hjk
270defaf59 debugger: go back to explicitly named pointers 2010-01-06 16:38:10 +01:00
Roberto Raggi
83d5659454 Fixed parsing of friend class declarations. 2010-01-06 16:15:28 +01:00
con
ea2101950f debugger: move watchdog timeout initialization to a place where it actually can access the stored settings. 
(cherry picked from commit de23834fc9)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
 2010-01-06 15:57:11 +01:00
hjk
e80e5e5580 debugger: fix thinko in time out computation 
(cherry picked from commit 33bdf42953)
 2010-01-06 15:57:11 +01:00
con
db68ca5b8d debugger: gracefully handle commands that might not produce output 
(cherry picked from commit 1324a1c600)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/gdbengine.h
 2010-01-06 15:57:10 +01:00