feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,300 Commits 108 Branches 368 Tags
b51e17c5cc0100358f646a7fc4326b7e98ddd083
Commit Graph

1401 Commits

Author SHA1 Message Date
hjk
31f18491ce debugger: fix thread switching in ThreadNamesCommand 2010-12-20 16:57:17 +01:00
hjk
bbba0f58a9 debugger: cache results of finding out the current Qt namespace 2010-12-20 14:47:52 +01:00
hjk
a23a45da88 debugger: fix previous commit 2010-12-17 18:02:02 +01:00
hjk
d55499f58a debugger: use to_string attribute to gdb.execute if available 2010-12-17 17:42:16 +01:00
con
23c22b7c66 License headers, part 2 2010-12-17 17:14:20 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
77f45caee0 Show Qt Creator resources in Locator on Mac 2010-12-17 16:05:47 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Robert Loehning
cb571a9f5a L10n: Improved German translations 
%1 contains the error message, not the hostname.
Other typos fixed as well.

Reviewed-by: ossi
 2010-12-17 15:56:28 +01:00
Sergey Belyashov
f16d45abd6 Russian translation update 
Merge-request: 228
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-12-17 12:27:19 +01:00
hjk
8062222e0f debugger: fix display of C style 'typedef struct X { ... } X;' types. 2010-12-16 13:35:41 +01:00
hjk
0277bab017 debugger: make connection list count formally correct 
Task-number: QTCREATORBUG-2785
 2010-12-16 12:32:55 +01:00
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Thomas Hartmann
61493f3e8b QmlDesigner.properyEditor: fix hovering for reset button 2010-12-16 11:03:37 +01:00
Robert Loehning
fbc005706c debugger: Checking size of array in qDumpQByteArray 2010-12-14 15:51:23 +01:00
hjk
e3886aaf4e debugger: display array base address as default value 2010-12-14 15:12:14 +01:00
Kai Koehne
17d11b7be3 Update qmlobserver with latest qmlviewer patches 
Update qmlobserver with changes in qmlviewer until 376e636eccedb8d8bb.
 2010-12-10 13:25:26 +01:00
con
edeb415908 Merge remote branch 'origin/2.1' 2010-12-10 11:09:55 +01:00
Leandro Melo
898bc97cce Snippets: Make it flexible for adding builtin snippets 
Instead of in one XML embedded as a resource, now builtin
snippets can be specified on any XML distributed under share.
 2010-12-08 17:22:14 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
Alessandro Portale
274af0f2f9 Fixing several issues in folder deployment 
- Also copying paths when doing in-source build,
   and not copying paths if source and target differ
 - Quote paths in order to support white spaces
 - Tolerate forward slashes as input paths

Task-Number: QTCREATORBUG-3203
Reviewed-By: ck
Merge-request: 226
 2010-12-08 16:13:41 +01:00
Kai Koehne
c4e4913870 QmlProject: Add mainFile property 
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
 2010-12-08 15:08:49 +01:00
Jarek Kobus
0ce4d0689d Update Polish translations 
Task-number: QTCREATORBUG-3313
 2010-12-08 14:23:19 +01:00
Sergey Belyashov
5d4bd1822a Fixed Russian translation of word "Comment" 
Merge-request: 2184
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-12-08 11:02:39 +01:00
con
519b544f62 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp
 2010-12-08 10:57:21 +01:00
Friedemann Kleint
bff0dd4a16 L10n: Update more German translations. 
Task-number: QTCREATORBUG-3312
 2010-12-08 09:51:45 +01:00
Thomas Hartmann
4de82ca9c9 QmlDesigner.propertyEditor: fix opacity slider bug 
The granularity of the slider was to fine.
So 1 could be a rounded 0.99.

Task-number: QTCREATORBUG-3035
Reviewed-by: Marco Bubke
 2010-12-07 12:38:56 +01:00
con
ed18065e9b compatVersion has nothing to do with Qt Creator version. 2010-12-07 12:36:06 +01:00
Nicolas Arnaud-Cormos
5bab50a934 Update the template for Qt Creator plugin. 
Make it more consistant with the current plugins:
 * plugin class use the Plugin template instead of Impl
 * add a pluginconstants.h file
 * use the new pluginspec.in file

Merge-request: 216
Reviewed-by: con <qtc-committer@nokia.com>
 2010-12-07 12:36:06 +01:00
Friedemann Kleint
5d0420b12c L10n: Update German translations. 
Task-number: QTCREATORBUG-3305
 2010-12-07 12:20:16 +01:00
Kai Koehne
33d66233b5 QmlWizards: Use 'QtQuick 1.0' namespace 
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).

Task-number: QTCREATORBUG-3243
 2010-12-07 11:27:30 +01:00
Thomas Hartmann
ebb8d82519 QmlDesigner.propertyEditor: support for smooth 
Support for smooth in all items
 2010-12-06 17:46:30 +01:00
hjk
6222ba81a0 debugger: make QObject dumper more robust for symbian 2010-12-06 13:24:34 +01:00
Christian Kamm
69a5e6ca13 QmlJS: Update qml-builtin-types.xml to include QtM plugins. 2010-12-02 11:12:59 +01:00
Christian Kamm
a5c4903ab2 Add dump of QtMobility plugins to default type descriptions. 
This will enable comlpetion and validation for projects using the Qt
Mobility plugins even when the qmldump machinery fails.
 2010-12-02 10:39:14 +01:00
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
Kai Koehne
801c8bb6d4 QmlJSDebugger: Code cleanup 
Fix indentation + line length.
 2010-12-01 16:54:32 +01:00
Christian Kandeler
7a5c004763 Maemo: Change installation prefix for non-Fremantle systems. 
- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
 2010-12-01 16:56:51 +01:00
hjk
fa2ae04ba3 debugger: fix QMultiMap dumper 
Task-number: QTCREATORBUG-3122
 2010-12-01 14:54:27 +01:00
hjk
bb654838cf debugger: fix gdb 7.2's template argument hickup also for more then one arg 2010-12-01 10:12:18 +01:00
hjk
5f5dbc62fd debugger: remove unneeded argument from templateArgument() 2010-11-30 17:30:06 +01:00
hjk
d3290c3231 debugger: replace a few 'template_argument(0)' by the templateArgument wrapper 
Makes QSharedPointer & Co. work with gdb 7.2
 2010-11-30 17:14:44 +01:00
hjk
f03138aa53 debugger: work around gdb 7.2 bug 
python print gdb.parse_and_eval("ob.d_ptr.d.children\").type.template_argument(0)
creates consistent "RuntimeError: No type named myns::QObject." with stock 7.2
 2010-11-30 16:52:46 +01:00
con
7c0b1b63d5 Merge remote branch 'origin/2.1' into master 2010-11-30 16:45:15 +01:00
hjk
6a6840c404 debugger: fix QVariant dumper corner case 2010-11-30 13:50:50 +01:00
Christian Kamm
3fbc0bd31d QmlDump: Fix use with namespaced types. 
Reviewed-by: Roberto Raggi
 2010-11-30 13:42:00 +01:00
Rhys Weatherley
a22fad9308 Update GLSL system library definitions 2010-11-29 09:40:00 +10:00
Roberto Raggi
8758bec682 Added declarations for the GLSL builtins. 2010-11-26 14:26:07 +01:00
Christian Kamm
e732b3c102 QmlDump: Allow building and using with Simulator Qt >= 4.7.1. 
Reviewed-by: owolff
Reviewed-by: Kai Koehne
 2010-11-26 11:18:26 +01:00
con
61ebb308e6 Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1) 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
 2010-11-25 17:36:50 +01:00