Thorbjørn Lindeijer
1716d9bbb2
QmlJSDebugger: Define QMLJSDEBUGGER in qmljsdebugger-src.pri
...
This pri file is meant for including the qmljsdebugger sources into an
Qt Quick application to make the qmljsdebugger easier to develop. It
makes sense to define QMLJSDEBUGGER since without that the QmlJS
debugger part isn't used.
See also 304b3c881c .
Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
eab2518796
QmlJSDebugger: Fixed the enum toString methods
...
Should use valueToKey since the key method works by index.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
42b4e6c8f1
Observer: Fixed synchronization of animation speed and paused state
...
The menus of the Observer were not being updated correctly when
animation speed was changed or when the animations were paused.
Now the whole thing looks a bit cleaner and the Observer menu
uses the QDeclarativeViewObserver to change these settings and stays in
sync when they change from other places.
Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
dt
4f278cbfed
Merge remote branch 'origin/2.2'
...
Conflicts:
src/plugins/debugger/disassembleragent.cpp
2011-03-21 17:48:19 +01:00
Alessandro Portale
dece4dccc7
Added (optional) touch optimized navigation of HTML5 apps
...
Code provided by the Bostoner Browser team.
The HTML5 wizard shows a checkbox "Enable touch optimized navigation"
which enables flicking and enlarged click areas. By default, the
option is turned off.
Task-Number: QTCREATORBUG-3284
2011-03-18 17:34:09 +01:00
Thorbjørn Lindeijer
ba92d4c922
QmlJSDebugger: Removed the double-click feature from the color box
...
It was supposed to show a color dialog, but in practice it never worked
due to using show() rather than exec(). Removed it completely since it
was judged confusing and not very useful, since it is already possible
to copy the color by using the context menu.
Task-number: QTCREATORBUG-3878
Reviewed-by: Kai Koehne
2011-03-17 15:43:10 +01:00
Thorbjørn Lindeijer
8defa8a7ac
QmlJSDebugger: Use QWidget::window to get to the top-level
...
Simplifies the code a bit.
2011-03-17 15:43:10 +01:00
hjk
0a9ef41b81
debugger: add some manual test code for MPI related data stuctures
2011-03-17 13:40:02 +01:00
Thorbjørn Lindeijer
f5761c9212
Fixed crash when QML app shuts down itself in debugging mode
...
The QDeclarativeViewObserverPrivate could end up referencing the tool bar
when it was already destroyed.
Reviewed-by: Kai Koehne
2011-03-15 16:45:28 +01:00
Friedemann Kleint
8dc563cdd8
L10n: Update German translation for 2.2 beta.
2011-03-15 14:19:22 +01:00
Thorbjørn Lindeijer
ed23c77cba
Don't show the QML debugging tool bar in the simulator
2011-03-15 13:31:28 +01:00
Thorbjørn Lindeijer
29777da964
Avoid use of dynamic_cast in qmljsdebugger library
...
Remove usages of 'dynamic_cast' in qmljsdebugger library. Otherwise
compilation will fail for a Qt compiled with -no-rtti.
Task-number: QTCREATORBUG-4043
Reviewed-by: Kai Koehne
2011-03-14 15:40:40 +01:00
Christian Kamm
b980a9b964
QmlJS: Fix implicit "." import when . has a QML module.
...
Reviewed-by: Erik Verbruggen
2011-03-10 15:03:36 +01:00
Oswald Buddenhagen
7007326837
clean up DEPENDPATH insanity
...
simply add
CONFIG += depend_includepath
to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them
were missing anyway, and i wouldn't expect it to ever change. not
touching src/shared/ for syncing reasons.
2011-03-09 22:24:13 +01:00
Christiaan Janssen
ca3eedb8e5
QmlDebugger: hiding "this" from debugger when empty
...
Reviewed-by: Kai Koehne
2011-03-09 16:10:06 +01:00
Thomas Hartmann
8830098384
QmlDesigner.propertyEditor: adding more tooltips
...
Adding missing tooltips
Task-number: QTCREATORBUG-3525
2011-03-09 15:41:41 +01:00
Kai Koehne
315e18d79a
QmlJsDebug: Fix regression in list of breakpoints
...
Allow more than one breakpoint per compilation unit.
2011-03-08 13:11:32 +01:00
Kai Koehne
304b3c881c
QtQuickApp: Remove QMLJSDEBUGGER define from custom .pro file
...
The qmljsdebugger-lib.pri is only included in 2.2 if the user explicitly
selected it in the Project Settings.
Reviewed-by: Christiaan Janssen
2011-03-07 16:35:27 +01:00
Friedemann Kleint
18eab3fdcc
L10n: Fix placeholder error in German translation.
2011-03-07 09:24:25 +01:00
Tilman Vogel
df3aad00f4
L10n: Update German translations.
...
Signed-off-by: Tilman Vogel <tilman.vogel@web.de >
Merge-request: 264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com >
2011-03-04 20:50:58 +01:00
hjk
42a7fd55fe
debugger: add dumper for boost::shared_ptr
2011-03-04 17:24:59 +01:00
Milian Wolff
00df3b718e
Add valgrind suppression syntax highlighting file.
...
Merge-request: 260
Reviewed-by: hjk <qtc-committer@nokia.com >
2011-03-04 12:33:37 +01:00
Friedemann Kleint
a3c526f362
L10n: Fix QML-Observer translation/German.
...
Task-number: QTCREATORBUG-3710
2011-03-03 11:26:39 +01:00
Kai Koehne
1cb3cdc744
QmlJSDebug: List QtScript as explicit dependency
...
mingw/4.7.1 does not add QtScript otherwise to the list of files to link against.
2011-03-02 14:45:21 +01:00
Kai Koehne
20189574f6
QmlJsDebugger: Handle breakpoints in qrc:// resources more gracefully
...
Reviewed-by: Christiaan Janssen
2011-03-02 14:45:20 +01:00
Kai Koehne
844c34513d
QmlJSDebugger: Compare only file names for .js breakpoints
...
The file names on device might be completely different, therefore
we cannot compare the absolute path.
Reviewed-by: Christiaan Janssen
2011-03-02 14:45:20 +01:00
Friedemann Kleint
20f89b2df1
L10n: Update German translations.
2011-03-02 12:02:40 +01:00
con
ce3ab6f766
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
2011-03-02 11:50:08 +01:00
con
2ca77dfe1e
Merge remote branch 'origin/2.1'
...
Conflicts:
src/plugins/debugger/qml/qmlengine.cpp
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
2011-03-02 11:49:52 +01:00
Kai Koehne
f1ca025076
QmlExtensionPlugin: Require objectname, URI
...
Make sure 'next' button is disabled if fields are empty.
Task-number: QTCREATORGBUG-3921
2011-03-02 11:40:00 +01:00
Christian Kamm
d80521aac1
qmldump: Add warning about code being shared with Qt.
2011-03-02 10:51:46 +01:00
hjk
b0b8a452c1
debugger: dump integers and floats based on the typedef stripped type
2011-03-01 19:17:03 +01:00
hjk
3d7a145803
debugger: add address display for floats and bools
2011-03-01 16:50:02 +01:00
hjk
55de258156
debugger: output bitfield sizes
2011-03-01 16:30:51 +01:00
hjk
fe03946df9
debugger: Switch off address printing for generated items
2011-03-01 15:44:22 +01:00
hjk
fa919345fc
debugger: remove unused dumper code
2011-03-01 14:23:35 +01:00
hjk
6963dc9b32
debugger: make members of QObjectPrivate derived data visible
2011-03-01 14:15:26 +01:00
Robert Loehning
866beee34b
Using the same sort command on Unix and Windows
2011-02-28 17:53:03 +01:00
hjk
5977545423
debugger: write more object addresses in dumpers
2011-02-28 17:35:52 +01:00
hjk
786cfdc9a1
debugger: fix QRegion dumper
...
Item count is an integer, not a string.
2011-02-28 17:35:48 +01:00
Thorbjørn Lindeijer
d16e7a305e
QmlJSDebugger: Only show the tool box when a debugging client connected
...
Reviewed-by: Christiaan Janssen
2011-02-28 17:20:31 +01:00
Thorbjørn Lindeijer
64c32469c8
QmlJSDebugger: Avoid warning in window flag logic
2011-02-28 17:20:31 +01:00
con
e8facd063b
Add sort tool for windows.
...
Task-number: QTCREATORBUG-3851
2011-02-28 15:15:33 +01:00
Thorbjørn Lindeijer
6355ed4734
QmlJSDebugger: Animation speed can always be changed
...
The play button, that also allows changing animation speed, should never
be disabled since it works both in and outside of "observer" mode.
Reviewed-by: Kai Koehne
2011-02-25 11:06:04 +01:00
Thorbjørn Lindeijer
ec92b3b2c0
QmlJSDebugger: Code cosmetics
2011-02-25 11:06:03 +01:00
Thorbjørn Lindeijer
603e7ade3f
QmlJSDebugger: Switched message identifiers from string to enum
...
Avoids spelling problems, makes it easier to know all possible messages
and enables autocompletion.
The enum is part of a QObject derived class so that the meta object can
be used to print out the enumerators as readable strings.
Reviewed-by: Kai Koehne
2011-02-25 11:05:48 +01:00
Thorbjørn Lindeijer
6d6510139b
QmlJSDebugger: Corrected some labels
...
Reviewed-by: Kai Koehne
2011-02-24 14:39:59 +01:00
Thorbjørn Lindeijer
eda6e85530
QmlJSDebugger: Fixed availability of resources of static library
...
On some systems, apparently including Linux and Windows, it is necessary
to manually initialize resources when they are included in a static
library, with Q_INIT_RESOURCE.
2011-02-24 13:40:56 +01:00
Kai Koehne
b7decc1356
QmlJSDebug: Fix compilation for debug builds on Windows
...
Make sure we pick up the debugger version of qmljsdebugger library.
2011-02-22 17:10:43 +01:00
Thorbjørn Lindeijer
e81e732452
QmlJSDebugger: Save and restore tool box geometry
...
Convenient since you'll usually move the tool box next to the
application window.
Reviewed-by: Kai Koehne
2011-02-22 16:38:20 +01:00