Commit Graph

8660 Commits

Author SHA1 Message Date
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
Kai Koehne
ccab280b21 QmlProject: Support arbitrary file suffixes
Add new "Files {}" element that supports showing files with arbitrary
endings in the project tree.

This new element is only available in new "QmlProject 1.1" namespace.

Task-number: QTCREATORBUG-3197
Reviewed-by: Thomas Hartmann
2010-11-25 13:19:24 +01:00
Sergey Belyashov
746b1fa879 Fixed few messages in Russian translation
Merge-request: 222
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-11-25 11:33:39 +01:00
Kai Koehne
d2ed221b1b QmlObserver: Add 'show app on top' switch to creator + qmlobserver
This is convenient especially in the observer mode.

Reviewed-by: Christiaan Janssen
2010-11-23 16:24:23 +01:00
Kai Koehne
e0811beef3 QmlJsDebugger: Code cleanup 2010-11-23 16:24:23 +01:00
Kai Koehne
302a07b05b QmlJSDebugger: Fix indentation in .pri file 2010-11-23 16:24:22 +01:00
Kai Koehne
ff7abee83b QmlJsDebugger: Remove QWEAKPOINTER_ENABLE_ARROW define
Any DEFINE used in qmljsdebugger-lib.pri is also passed to the users
code.
2010-11-23 16:24:22 +01:00
Kai Koehne
28adb0a178 QmlJSDebugger: Remove editor.pri
Incorporate into qmljsdebugger-lib.pri

Task-number: QTCREATORBUG-2951
2010-11-23 16:24:22 +01:00
Oswald Buddenhagen
f3b5c98bf5 Merge remote branch 'origin/2.1' 2010-11-23 15:44:58 +01:00
Daniel Molkentin
7e48a3a314 Add some more examples if available (SDK case)
Reviewed-by: Alessandro Portale
2010-11-22 20:49:05 +01:00
Alessandro Portale
fabaffde4f Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.

The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.

This patch removes the -leiksrv and bumps the version for
the template.

Cherrypicking into qtcreator/2.1 is highly recommended.

Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
2010-11-22 11:06:45 +01:00
Alessandro Portale
f1a403c778 Do not link against (the possibly absent) eiksrv.dso
The template .pri file of the "Qt Quick Application" and
"Qt Mobile Application" wizards linked against eiksrv
when locking the screen orientation. That is however not
necessary.

The real problem is that eiksrv does not get shipped with
the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the
innecessary link attempt even fails.

This patch removes the -leiksrv and bumps the version for
the template.

Cherrypicking into qtcreator/2.1 is highly recommended.

Task-Number: QTCREATORBUG-3142
Task-Number: QTSDK-194
2010-11-19 21:11:33 +01:00
Kai Koehne
8b59a52bc1 Revert "make compile against 4.7 mainline"
This reverts commit 110c58d09e,
and enables qmljs debugging again.
2010-11-19 15:52:11 +01:00
hjk
365f81eb03 debugger: even more hacks to display QVariant with custom type and template 2010-11-19 15:11:19 +01:00
hjk
e13794d0dc debugger: make gdbmacros.py more generic
Mostly move parts of the gdb related quoting to dumper.py, also split
function calls in strings into separate arguments.
2010-11-19 15:02:47 +01:00
hjk
0d54cab7b0 debugger: improve python dumper profiling support 2010-11-19 15:02:47 +01:00
hjk
4a08c9a302 debugger: adjust format of item count after f9eea7e1 2010-11-19 11:50:22 +01:00
hjk
718c08a009 debugger: make more python dumpers more robust when debug info is missing 2010-11-19 11:50:22 +01:00
hjk
c2f5300798 debugger: fix QRegion dumper for builds without debug info 2010-11-19 08:37:43 +01:00
Oswald Buddenhagen
8959874793 fix ts targets under windows 2010-11-18 20:47:24 +01:00
hjk
bffeae9b42 debugger: better handling of dynamic arrays 2010-11-18 20:45:00 +01:00
dt
c9c5fe1542 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/qmljseditor/qmljshoverhandler.cpp
	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
2010-11-18 19:28:23 +01:00
hjk
de3bf34e85 debugger: show len/ptr pair encoded strings for sources ending in .d 2010-11-18 19:17:55 +01:00
Leandro Melo
0e27bad04c Generic highlighter: Add some Kate LGPL files
Reviewed-by: con
2010-11-18 19:00:50 +01:00
Friedemann Kleint
f9eea7e1ec Debugger: Fix broken display of containers with truncated item count.
Introduce convention '<>10 items>' meaning <more than 10 items>.

Task-number: QTCREATORBUG-3132
2010-11-18 15:42:01 +01:00
Sergey Belyashov
eb63db5c4e Updated Russian translation
Merge-request: 220
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2010-11-17 16:53:06 +01:00
hjk
f9c585281e debugger: fix display of '"' chars
Task-number: QTCREATORBUG-3084
2010-11-16 17:09:56 +01:00
Kai Koehne
2b8e5b5333 QmlObserver: Fix navigation on Mac OS X
The QmlObserver relies on installing an event handler on the graphicsview
viewport, to get e.g. Mouse events.

QmlObserver on Mac OS X switches the viewport later on to a QGLViewPort, when
QmlObserver has already been set up ... Make QmlObserver aware of this by
listening to the ChildRemoved event that will be signalled in this case.

Task-number: QTCREATORBUG-2892
Reviewed-by: Lasse Holmstedt
2010-11-16 11:01:01 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1'
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
hjk
a66c8d35d6 debugger: fix display of shadowed variables again 2010-11-15 12:12:24 +01:00
Thorbjørn Lindeijer
07e7351bf1 Tweaks to the Inkpot style
Added missing categories with customized colors for Field, Occurences,
Static and VisualWhitespace.

Removed highlighting for the 'Local' category, since at least I consider
the white names a little messy. In general we've considered the
highlighting of locals less useful than highlighting the members.

Task-number: QTCREATORBUG-2490
2010-11-12 15:36:39 +01:00
Kai Koehne
d16c75fe00 QmlJSDebugger: Simplify selection handling code
Avoids multiple calls singleSelectionManipulator.select().
2010-11-12 15:08:09 +01:00
Kai Koehne
3bec12a4bf QmlJsDebugger: Avoid CURRENT_OBJECTS_CHANGED message flooding 2010-11-12 15:08:09 +01:00
Thorbjørn Lindeijer
d9b9b4ad0f Added the Inkpot color scheme
This color scheme is based on the vim Inkpot color scheme, originally
created by Ciaran McCreesh:

 http://www.vim.org/scripts/script.php?script_id=1143

It was adapted for use by Qt Creator by Jan Kundrát and subsequently
updated by Campbell Barton.

Task-number: QTCREATORBUG-2490
2010-11-12 14:24:00 +01:00
Kai Koehne
e35c53e7f8 QmlWizards: Unify templates
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).

Reviewed-by: Alessandro Portale
2010-11-12 13:54:54 +01:00
Leandro Melo
54143f2611 Remove empty dir from static.pro
This was added in the case we start shipping some of the Kate XMLs (still
a pending decision), which should be placed in this dir. However, this
causes a warning when loading qtcreator.pro with master branch version.
So I'll removed it. If we really ship the files it should be re-added
and also the installer notified.

Reviewed-by: con
2010-11-12 11:27:43 +01:00
Kai Koehne
4201046b9b QmlObserver: Remove breadcrumb widget in observer mode
I wasn't able to get it working on Mac OS X: Putting it on top
of the QGraphicsView doesn't work because Cocoa doesn't allow a
widget to be on top of OpenGL viewport. Embedding it as a
QGraphicsProxyWidget produces lots of Cocoa warnings (raster engine related).

Anyhow, the same widget shows up in the Debugger/Observer tab of
Qt Creator.

Reviewed-by: Lasse Holmstedt
2010-11-11 12:51:15 +01:00
Thomas Hartmann
fda2124fbf QmlJSEditor: update of qml-builtin-types.xml 2010-11-11 11:49:11 +01:00
Thomas Hartmann
f7e7de44cb QmlJS: Dump isWritable and isPointer for types.
Reviewed-by: Christian Kamm
2010-11-11 11:49:11 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
2010-11-10 17:02:40 +01:00
dt
f987eccd28 Revert "QmlApp template: Use new 4.7.1 API to enable qml debugging"
This reverts commit 424fcf8c04.
2010-11-10 16:56:39 +01:00
Leandro Melo
a534c271ec Generic highlighter: Add Creator's share folder in the fallback definitions search.
This leaves the code prepared if we decide to ship some of the Kate XMLs (still
a pending decision). In this case the installer needs to be "notified" and the
Kate files put in the repo.

An addition check for actual XML files in the searched directories is also added.

Reviewed-by: con
Reviewed-by: Thorbjorn Lindeijer
2010-11-09 16:15:36 +01:00