Commit Graph

1454 Commits

Author SHA1 Message Date
Alessandro Portale
a6213ba901 Double escaping backslashes for regular expression
The first parameter of qmake's replace function is a regular
expression. So it needs to be escaped once for the qmake parser,
and then for the regular expression.
2011-03-30 19:23:27 +02:00
Alessandro Portale
3b9438f7d5 Fix deployment with MinGW and sh.exe in path
When building with MinGW and sh.exe is in the path, we should/can
not use xcopy in our deployment code. This patch detects the
presence of sh.exe and adjusts the behavior accordingly.

'cp -r' is used directly instead of $(COPY_DIR), because the fix
for QTBUG-17315 is not yet in a released Qt version.

'mkdir -p' is used directly instead of $(MKDIR), because the
QMAKE_MKDIR for win32-g++ (in case of QMAKE_SH) does not have
the '-p'. A least not til Qt 4.7.3.

Task-Number: QTCREATORBUG-3094
Reviewed-by: Oswald Buddenhagen
2011-03-30 19:23:27 +02:00
Christian Kandeler
b38a256ed6 QML plugin wizard: Fix deprecated use of backslash in project file.
Task-number: QTCREATORBUG-4091
2011-03-30 11:39:40 +02:00
Oswald Buddenhagen
5038ab9f61 exclude plist.in files from the copy targets
they are handled by QMAKE_SUBSTITUTES where needed

Reviewed-by: con
2011-03-30 11:00:31 +02:00
Oswald Buddenhagen
3ccee55a5e nothing mac-specific about OTHER_FILES
Reviewed-by: con
2011-03-30 11:00:30 +02:00
Oswald Buddenhagen
4c7a8c9a8d install data from src/share/ directory
Reviewed-by: con
2011-03-30 11:00:30 +02:00
Oswald Buddenhagen
3e0e5a6086 reshuffle and simplify copying of files from src/share/
Reviewed-by: con
2011-03-30 11:00:30 +02:00
con
530e7494dd Automatic versioning for the qml tools.
Reviewed-by: Thomas Hartmann
2011-03-29 17:54:52 +02:00
Christian Kandeler
ad6a66ce20 Mobile app wizard: Fix desktop file contents.
The "Exec" value was not consistent with the installation prefix in the
.pri file.
2011-03-29 14:41:41 +02:00
hjk
1e8a783abb version bump to 2.1.83 2011-03-25 17:21:28 +01:00
Thomas Hartmann
5bfe61a59d QmlDesigner.propertyEditor: bug fix for color editing
Task-Nr: QTCREATORBUG-4069
2011-03-24 16:31:47 +01:00
Thomas Hartmann
2d8f6f371a QmlDesigner.propertyEditor: bug fix for Rectangle.border
Task-Nr: QTCREATORBUG-2960
2011-03-24 16:31:46 +01:00
Thomas Hartmann
004049db3a QmlDesigner.propertyEditor: add specifics for Flickable
The Flickable item has to be be useable in the property editor.
2011-03-24 11:15:19 +01:00
Thomas Hartmann
db8f027a1e QmlDesigner.propertyEditor: fixes a style issue
The ToolButton color has to be be light gray
instead of black (too hard to read).


Task-number: QTCREATORBUG-4070
2011-03-24 11:15:18 +01:00
Thorbjørn Lindeijer
6161d0eb0c QmlJSDebugger: Disabled the Qt Quick tool box entirely for now
This tool box doesn't add much value since the same actions are
available from Qt Creator and in the case of using the Observer, some
actions are also available from its menus.

Reviewed-by: Kai Koehne
2011-03-23 17:37:58 +01:00
Robert Loehning
3cdacc5273 Improved German translation
Reviewed-by: ossi
2011-03-22 17:20:56 +01:00
Friedemann Kleint
bd89873300 L10n: German translations for 2.2 beta (case corrections). 2011-03-22 16:23:13 +01:00
Friedemann Kleint
9bc68a3d98 L10n: Update German translations for 2.2 Beta. 2011-03-22 15:14:27 +01:00
Thorbjørn Lindeijer
a8bf2ba5e3 QmlJSDebugger: Renamed "execution paused" to "animation paused"
The latter better describes what is paused, since expressions are
actually still executed.

Suggested by Kai.
2011-03-22 10:40:46 +01:00
Thorbjørn Lindeijer
0a813cd67c QmlJSDebugger: Separated animation speed and paused state
This separates animation speed and paused state in the communication
protocol between the Qt Creator QmlJSInspector plugin and the
QmlJSDebugger server.

Point is to allow changing the speed of the animation before resuming
execution. These two things were already separated in the QML Observer,
but not in Qt Creator.

Reviewed-by: Kai Koehne
2011-03-22 10:40:46 +01:00
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
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
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