Commit Graph

1401 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dd45277a19 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/plugins.pro
	src/plugins/qt4projectmanager/qt4project.h
	src/plugins/qt4projectmanager/qt4projectmanager_dependencies.pri
2010-11-04 19:18:45 +01:00
Thomas Hartmann
d89604bb54 QmlDesigner.propertyEditor: fix anchoring
There was a bug in the sibling margin for
the bottom anchor.

Also, disabling width/height in the property editor
only makes sense, if both anchors (top/left or op/bottom)
are set.

Reviewed-by: Kai Koehne
2010-11-04 11:15:48 +01:00
hjk
3388e88ae4 debugger: catch python exception
Iterating through gdb.Frame.blocks() also yields function-local struct
definitions that cause later errors when attempting to use them as
local variable. This is arguably a gdb issue as it is inconsistent with
the result of plain old "info locals" output.

Reviewed-by: Friedemann Kleint
2010-11-04 10:50:13 +01:00
Kai Koehne
d0baf43b6a Qml Wizard: Turn error about qml debugging getting disabled into a warning
Qml Debugging requires 4.7.1, and the path of qmljsdebugger being
specified on the command line. Just disable debugging if this
isn't the case instead of bailing out an error.

Reviewed-by: dt
2010-11-03 14:07:31 +01:00
Kai Koehne
26f79571e6 QmlObserver: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

Reviewed-by: Alessandro Portale
2010-11-03 14:07:16 +01:00
Kai Koehne
2ac91abd30 QmlApp template: Use new 4.7.1 API to enable qml debugging
Qml debugging is now disabled by default, and has to be enabled
explicitly (b2016bbfc9). This has to be done before the
QDView/QDEngine is instantiated ...

The patch introduces a static create method to QmlApplicationViewer,
so that the setup can be hidden from the users main file.

Reviewed-by: Alessandro Portale
2010-11-03 14:06:44 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
con
dbb1c5ef77 Merge remote branch 'origin/2.1' 2010-11-02 11:14:03 +01:00
con
5abfdbc160 Merge remote branch 'origin/2.1.0' into 2.1 2010-11-02 11:10:09 +01:00
hjk
afef6dd071 debugger: work around gdb 7.2 quirk in QFlag dumper
Reviewed-By: Friedemann Kleint
2010-11-02 11:07:45 +01:00
hjk
7b6022bea2 debugger: make QFile and QFileInfo visible without top-level inferior call
Reviewed-by: Oswald Buddenhagen
2010-11-02 11:00:31 +01:00
hjk
8df0f12eca debugger: fix dumping of reference targets
Reviewed-by: Alessandro Portale
2010-11-02 11:00:31 +01:00
Alessandro Portale
48d726b37e Remove compile warning on Symbian.
Reviewed-By: TrustMe
2010-11-01 19:25:19 +01:00
Alessandro Portale
2a7336b4d6 Move hide implementation of conditional show()
...and do not call it show(), because that is the signature of
a non-virtual base class function. showExpanded() sucks as name,
and hjk, who reviewed this is not convinced.
But showExpanded() is still better than show().

Task-Number: QTCREATORBUG-2979
Reviewed-By: hjk
2010-11-01 19:19:32 +01:00
Alessandro Portale
7d622f1145 Changing template/qmljsdbg-lib as suggested in QTCREATORBUG-2885
- Renaming the screen orientation enum and keys
- Explicit constructors
- Virtual destructors
- Renamed some occurences of 'Qml' in comments to 'QML'
- Adding descriptive comments to all generated files which should
  not be touched by the user.
- Adding missing license headers to the qmljsdebugger sources

Task-Number: QTCREATORBUG-2885
Reviewed-by: Friedemann Kleint
Reviewed-by: dt
2010-11-01 17:03:46 +01:00
Oswald Buddenhagen
9248240ea0 update chinese translation for 2.1
this is a team work by the following people:
  Beaver Xu <xtfllbl@hotmail.com>
  cch123 <cao1988228@163.com>
  shiroki <shiroki@cuteqt.com>
  Rei <chloerei@gmail.com>

Merge-request: 210
2010-11-01 12:27:37 +01:00
Oswald Buddenhagen
649c52bef3 include region-qualified languages into the list 2010-11-01 12:27:37 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
2010-11-01 12:11:03 +01:00
hjk
bc09afb5cf debugger: avoid one inferior call in QDir dumper
Reviewed-by: Friedemann Kleint
2010-11-01 11:54:15 +01:00
Thomas Hartmann
36c00b4344 QmlDesigner.propertyEditor: show that anchors are disabled in states
I also added a tooltip.

Reviewed-by: Lasse Holmstedt
2010-11-01 10:33:46 +01:00
Sergey Belyashov
abe9797d37 Retranslated word "plugin"
Merge-request: 211
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-11-01 10:12:08 +01:00
Alessandro Portale
87a335674c Removing ToolBar and StatusBar from mobile app ui template
These are useseless place eaters. If needed, they can easily
be added by the user in Qt Designer.

Reviewed-By: ck
2010-10-29 16:25:07 +02:00
Alessandro Portale
62dd490b57 Removing ToolBar and StatusBar from mobile app ui template
These are useseless place eaters. If needed, they can easily
be added by the user in Qt Designer.

Reviewed-By: ck
2010-10-29 16:22:09 +02:00
hjk
0afb34d5eb debugger: refactor breakpoint type, add function name to resolved jsbreakpoints 2010-10-29 14:31:16 +02:00
Pierre Rossi
c0efe042e7 French translation: minor fixes 2010-10-28 18:44:54 +02:00
Oswald Buddenhagen
a8fba49ac6 add polish translation to release list
ok, i'm cheating ... it's only 97% complete :D
2010-10-28 14:57:48 +02:00
Pawel Polanski
728ce219c7 update polish translations
(cherry picked from commit 37fd61896c)
plus manual fix for "CDB debug engine does not support ...".
2010-10-28 14:35:46 +02:00
Oswald Buddenhagen
354c4d868d fix error message and source in the TS files 2010-10-28 14:28:25 +02:00
Daniel Molkentin
4ac72ef05f Modify RSS to show new (and only) featured example
Also center images, don't scale, and be less jumpy on startup

Reviewed-By: con
2010-10-27 18:53:46 +02:00
hjk
a3b24d233c debugger: pimpl JSDebuggerAgent 2010-10-27 18:44:25 +02:00
hjk
0593aa5bba jsdebugger: add a dummy entry to arrays that have no real children 2010-10-27 18:03:11 +02:00
hjk
f51301585e jsdebugger: use a real structure for a stack frame in the debuggeragent 2010-10-27 17:38:00 +02:00
hjk
f93fe86be7 jsdebugger: don't output function code. it's useless. 2010-10-27 17:38:00 +02:00
hjk
63ca71c2c7 jsdebugger: use QByteArray for data transfer
Easier to debug, less data to transfer.
2010-10-27 17:38:00 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +02:00
hjk
c5f8623b41 debugger: rename Dumper.putItem -> putSubItem, putItemHelper -> putItem 2010-10-26 15:14:06 +02:00
axasia
0a679b61d4 Update Japanese 2.1 translations.
Merge-request: 207
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-26 11:25:22 +02:00
Sergey Belyashov
6536630b3f Updated Russian translation
Merge-request: 208
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-26 11:23:49 +02:00
hjk
26339061e3 debugger: add python dumpers for __m128 2010-10-26 10:41:11 +02:00
Oswald Buddenhagen
149a59f016 remove execute bit ... again 2010-10-25 19:23:43 +02:00
Oswald Buddenhagen
110917da4d update list of up-to-date translations 2010-10-25 19:20:53 +02:00
Oswald Buddenhagen
51da137c9b update german translation 2010-10-25 19:05:53 +02:00
Oswald Buddenhagen
b5b6901c9b exclude dead/irrelevant sources from string collection 2010-10-25 18:27:29 +02:00
Sergey Belyashov
b10c8db6da Fixed double word in message
Adjusting the source in all affected translations as well.

Merge-request: 192
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-25 16:46:14 +02:00
Sergey Belyashov
1d4258a93a Updated Russian translation
Merge-request: 184
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-25 15:49:15 +02:00
axasia
387180b053 L10N: Update Japanese 2.1 translation.
Merge-request: 194
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-25 15:14:29 +02:00
Victor Ostashevsky
0ca605a506 Ukrainian translation updated
Merge-request: 205
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-10-25 14:32:00 +02:00
Pierre Rossi
f6402f16c7 French translation updated for Creator 2.1
Contributed by the team at developpez.com.

This is the squashed result of a team effort. Authors are:

Guillaume Belz <guillaume.belz@free.fr>
Cédric Bonnier <myzu69@gmail.com>
Jonathan Courtois <jonathan.courtois@gmail.com>
Thibaut Cuvelier <dourouc05@gmail.com>
Pierre-Nicolas Rigal <qt-contrib@p-n-r.com>

For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr

See also: http://qt.developpez.com/

Merge-request: 206
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
Reviewed-by: ossi
2010-10-25 14:05:35 +02:00
Thomas Hartmann
742d9008b6 QmlDesigner: delete Row/Column and Grid specifics
The default panes  are good enough and work fine

Reviewed-by: Kai Koehne
2010-10-25 13:31:37 +02:00
Oswald Buddenhagen
35bb61590d Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
2010-10-25 11:27:30 +02:00