feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
11,116 Commits 108 Branches 368 Tags
2bb121df6f0d6af31a96845fa2bba335028a03f2
Commit Graph

796 Commits

Author SHA1 Message Date
hjk
2bb121df6f debugger: enhance QObject dumper by showing user defined properties 2010-06-08 17:09:50 +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
Christian Kamm
3b8b6e89cc QmlJS: Autocomplete dot and colon for properties. 
Reviewed-by: Roberto Raggi
 2010-06-07 17:37:45 +02:00
Oswald Buddenhagen
53bdae3f93 disable outdated and known bad translations 2010-06-04 19:15:36 +02:00
Pierre Rossi
98b6f8a169 Fix an issue with 'make ts' when CUSTOMWIZARDS_FILES is empty. 
Reviewed-by : Daniel Molkentin
(cherry picked from commit 514b30ecbf,
this was accidentially committed into 2.0.0 first)
 2010-06-03 17:11:18 +02:00
Robert Loehning
c9062b5e9f Updated German translation after string fix 2010-06-02 22:03:20 +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
Daniel Molkentin
322436069d Disable QML runtime wizard for now. 
This is unconditional, since we seem to have no way of doing it
conditionally in a clean way.

Reviewed-by: Oswald Buddenhagen
 2010-06-01 16:31:56 +02:00
Robert Loehning
069171fc4c Fixes in German translation 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 16:15:45 +02:00
Robert Loehning
536ab07f61 Decided on different use of hyphens in German translation. 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 15:09:00 +02:00
Daniel Molkentin
9d609c88c8 Revert "Mark QML support in Qt Creator 2.0 as preview" 
Not needed anymore after the general QML support got deactivated.

This reverts commit 74bd95d323.
 2010-06-01 14:40:06 +02:00
hjk
896907f78c debugger: be nicer in the presence of missing debug information 2010-06-01 14:33:26 +02:00
Robert Loehning
52fce25de3 Fixed German translations related to Design mode and Qt Quick. 
Reviewed-by: Oswald Buddenhagen
 2010-06-01 13:55:09 +02:00
Daniel Molkentin
74bd95d323 Mark QML support in Qt Creator 2.0 as preview 
Reviewed-by: Kai Koehne
 2010-05-31 16:37:17 +02:00
Sergey Belyashov
effe3e6e23 Updated Russian translation 
Merge-request: 143
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-05-31 15:04:47 +02:00
Daniel Molkentin
61c06ed339 Remove accidentially committed symlinks 2010-05-31 13:57:34 +02:00
Daniel Molkentin
a41876cd41 Do not add a menu if the examples cannot be found. 
This is not only a waste of ressources, but breaks a check later on
which tries to load the QML examples from Creators ressource path
if no QML capable Qt version is found (included with Creator packages)

Reviewed-by: dt
 2010-05-31 11:11:23 +02:00
Robert Loehning
a72604391f Added missing colons in German translation 
Reviewed-by: Alessandro Portale
 2010-05-28 20:49:02 +02:00
hjk
1b3e9db046 debugger: implement "old" QSize and QSizeF dumpers, re-enable QImage/QPixmap 2010-05-28 15:48:20 +02:00
Christian Kamm
a36d4b9b57 QmlJS: Update builtin type definitions. 
Qt.labs.gestures and Qt.labs.filelistmodel weren't dumped before,
Qt.multimedia and Qt.widgets are gone.

Task-number: QTCREATORBUG-1507
Reviewed-by: Roberto Raggi
 2010-05-28 15:22:50 +02:00
Oswald Buddenhagen
123937fb2a Merge remote branch 'origin/2.0' 2010-05-28 12:45:41 +02:00
hjk
6ac8bd0c1b debugger: std::basic_string's refcount can be -1. 
Reviewed-By: Oswald Buddenhagen
 2010-05-27 17:28:13 +02:00
Jarek Kobus
aa93d6f422 Update Polish translations 2010-05-27 15:29:34 +02:00
Thomas Hartmann
238dfa5185 QmlDesigner.propertyEditor: anchor fill button is now checkable 2010-05-27 11:48:06 +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
Oswald Buddenhagen
27cb7ac26a remove outdated qt version check 
all of creator requires qt 4.7 now
 2010-05-26 19:35:21 +02:00
hjk
a45bfdc4e6 debugger: improve QVariant(QString) dumper 
(partially cherry picked from commit dd714e9ccb)
 2010-05-26 17:41:09 +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
b61e32371f debugger: fix display of children of objects passed by reference. 
The value was adjusted to the referenced value but it was not used
when dumping the members, basically leading to an empty child list
in such cases.
 2010-05-26 13:34:54 +02:00
Oswald Buddenhagen
4ff06e3cd8 don't put the temporary header files into the qm dir 
this makes a difference only on macx, where it happens to fix the ts
target (because of missing quoting). but it is More Correct anyway.
 2010-05-26 10:27:20 +02:00
Robert Loehning
43c892d399 Translation fix 
Reviewed-by: Oswald Buddenhagen
 2010-05-25 17:57:02 +02:00
Friedemann Kleint
68151eff33 i18n: Fix warning when showing 'About' dialog. 
Caused by adding an argument in
acea722d75.
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2010-05-25 12:42:30 +02:00
Jarek Kobus
6ab2dddc0e Update Polish translations 2010-05-24 10:07:32 +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
0c982a3025 QmlDesigner.propertyEditor: I "fixed" the resize behaivour 
With this change the leading label will be resized first if the user
increases the size of the property editor.
So if property names are too long (elided), due to translation or
because the pane was generated automatically, the user is able to resize
the label.
 2010-05-21 11:28:31 +02:00
Thomas Hartmann
b1dac076b3 QmlDesigner.propertyEditor: cleanup of qml 
There were invalid qml files.

ListViewSpecifics.qml
FlipableSpecifics.qml
FlickableSpecifics.qml

Since we do not support this components properly I just cleaned up
the files.

Task-number: BAUHAUS-676
 2010-05-21 11:28:31 +02:00
Thomas Hartmann
f4b8f1f812 QmlDesigner.propertyEditor: FontComboBox is not editable anymore 
Task-number: BAUHAUS-678
 2010-05-21 11:28:30 +02:00
Thomas Hartmann
49aa35f13f QmlDesigner.propertyEditor: cleanup of unused files 2010-05-21 11:28:30 +02:00
con
48db93a92f Merge remote branch 'origin/2.0' 2010-05-20 15:39:04 +02:00
Friedemann Kleint
4ed4535a52 I18n: Final German translation for 2.0 2010-05-20 14:38:53 +02:00
hjk
d770488185 debugger: add dumper for QHostAddress 2010-05-20 13:41:39 +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
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
Robert Loehning
b9793f4e59 Translation fix 2010-05-19 18:03:21 +02:00
hjk
58cbf845fa debugger: add address of pointees of generic pointers 2010-05-19 14:19:33 +02:00
Christian Kamm
fadfe9c64e QmlJS: Generalize EasingCurve name check to all enums. 
Reviewed-by: Erik Verbruggen
 2010-05-19 12:24:32 +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
Thomas Hartmann
e5264b1c39 QmlDesigner.propertyEditor: fix font size for labels: 
Task-number: BAUHAUS-667
 2010-05-18 14:48:20 +02:00
Thomas Hartmann
fb2fabd5f0 QmlDesigner.propertyEditor: fix alignment of isVisible 
Task-number: BAUHAUS-669
 2010-05-18 14:48:19 +02:00