Commit Graph

8660 Commits

Author SHA1 Message Date
Kai Koehne
5532f939b5 QmlObserver: Fix compilation if no private headers are installed
Don't support the Recording + Test Script features if there are
no private headers installed.

Reviewed-by: Lasse Holmstedt
2010-10-06 14:59:25 +02:00
Thomas Hartmann
fefc6cfe6d Using import Qt 4.7 (again)
We have to support the  N900

Reviewed-by: dt
2010-10-06 13:35:47 +02:00
Thomas Hartmann
f2ada23d26 QmlDesigner: using Qt 4.7 again
We need to support the N900

Reviewed-by: Kai Koehne
2010-10-06 09:47:13 +02:00
Thomas Hartmann
d211050e07 QmlDesigner.propertyEditor: fix WebView page
This patch add a proper WebView page
to the property editor.

Reviewed-by: Trust Me
2010-10-06 09:47:12 +02:00
Daniel Molkentin
371ea6177e Fix Tips of the Day with dark color schemes.
Task-Number: QTCREATORBUG-1769
2010-10-05 17:35:47 +02:00
Kai Koehne
c6c2486d5d QmlJSDebugger: Fix linkage error
Make sure that the private API used from Qt is compiled with
Q_DECL_IMPORT.

Task-number: QTCREATORBUG-2609
2010-10-05 16:58:59 +02:00
Kai Koehne
c1954e09fc QmlJSDebugger: Fix path in standalone .pro file 2010-10-05 16:58:59 +02:00
Friedemann Kleint
4e281167ee Debugger[CDB]: Adapt SharedLib-Dumpers to new std::vector.
Reviewed-by: hjk
2010-10-05 14:25:04 +02:00
dt
51bfe658da Remove accidently commited file. 2010-10-05 13:27:06 +02:00
Kai Koehne
1e19803e6e qmldump: Allow qmldump to be also built in release mode
Don't force that qmldump is compiled in debug mode: This won't work
with a Qt compiled only in release mode.

If Qt is built with debug_and_release, qmldump will be build in release
mode.

Reviewed-by: ckamm
2010-10-05 12:45:10 +02:00
Friedemann Kleint
d2bbef2fc9 L10n: Fix placeholders. 2010-10-05 10:16:27 +02:00
Friedemann Kleint
48dab76851 L10n: Update German translation for 2.1 beta. 2010-10-05 09:54:07 +02:00
dt
30044e842f CMake Run Page: Colorize output and disable finish on cmake error
Task-Nr: QTCREATORBUG-2592
2010-10-04 17:53:15 +02:00
Thomas Hartmann
defb9881b1 QmlWizards: use QtQuick 1.0 instead of Qt 4.7
Reviewed-by: Kai Koehne
2010-10-04 16:21:32 +02:00
dt
6b6d9871b8 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/templates/mobileapp/app.pro
	share/qtcreator/templates/qmlapp/app.pro
	src/plugins/cpptools/cpptools.pro
2010-10-04 16:07:46 +02:00
Thomas Hartmann
ed01ffd39c QmlDesigner.propertyEditor: adding missing qml file
This file got somehow missing during renaming

Reviewed-by: Trust Me
2010-10-04 15:34:09 +02:00
Lasse Holmstedt
2578810334 Debugging helpers: Preserve whole build log
Otherwise, users might only see parts of the build that succeeded, but
not the failed ones (depending on build order).

Reviewed-by: ckamm
2010-10-04 12:03:35 +02:00
Alessandro Portale
e1aa293544 Qt Quick app wizard: Merge two .pri files into one
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.

At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.

And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.

Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
2010-10-04 10:54:25 +02:00
Alessandro Portale
a95ed6420d New wizards: Handle Symbian icon like Maemo icon
De-clutter the app profile:
- Call the Symbian icon <project>.svg
- Define the Symbian icon in the deployment .pri file

Task-Number: QTCREATORBUG-2578
Reviewed-by: ck
2010-10-04 10:54:24 +02:00
Alessandro Portale
0a9edfe1c0 Added comment 2010-10-03 10:35:14 +02:00
Alessandro Portale
043cf532ec Improved the comments in the generate qml app code.
This was committed to the master branch, but was supposed
to go into 2.1 (I misunderstood the branching strategy of
Creator 2.1).

Since this does not change Creator code:
Reviewed-by: Trustme
2010-10-02 18:26:51 +02:00
hjk
d40007938c debugger: fix QObject property dumping on Windows
The problem of gdb finding QVector::malloc instead of the global malloc
appeared again. The workaorund is to use calloc which is not used by Qt.
However, for transfering string literal data to the inferior gdb uses
malloc internally outside our control, so we cannot use string literals
in inferior calls at all.

In the particular case of QObject property names we are lucky as the
data already exists in the inferior memory. This patch just uses it.

Reviewed-by: Leandro Melo

Task: QTCREATORBUG-2533
2010-10-01 17:47:52 +02:00
Kai Koehne
8ad34357b8 QmlJSDebugger: Fix warning about JSAgent already connected
We now instantiate an extra JSDebugger object in the generated class.

Reviewed-by: aportale
2010-10-01 13:43:41 +02:00
Kai Koehne
3e080e082d QmlJSDebugger: Check for Qt 4.7.1 or newer before enabling qml debugging
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:41 +02:00
Kai Koehne
6929d66ff2 QmlObserver: Prevent messages from being sent if there is no server side
Actually this is fixed in QDeclarativeService::sendMessage, too, but the
fix won't be part of 4.7.1, so better double-check.

Reviewed-by: Christiaan Janssen
2010-10-01 13:43:41 +02:00
Kai Koehne
eff5ceea64 QmlJsDebugger: Remove dependency to Qt private headers being installed
Copy over the private header files to creator source tree, along the
lines of the what the designer plugin does.

Reviewed-by: Christiaan Janssen
2010-10-01 13:43:40 +02:00
Kai Koehne
f343cc4bd4 QmlJSDebugger: Update API to changes in QDeclarativeEngine
Reviewed-by: Christiaan Janssen
2010-10-01 13:43:40 +02:00
Thomas Hartmann
9a49ad003a QmlDesigner: using QtQuick 1.0 instead of Qt 4.7
huge renaming from Qt to QtQuick
propertyeditor qml files moved from Qt to QtQuick
auotests fixed
files used in tests fixed

autotests pass

Task-number: QTCREATORBUG-2556

Reviewed-by: Kai Koehne
2010-10-01 13:21:09 +02:00
Jarek Kobus
d856bdf002 Update Polish translations 2010-10-01 12:17:25 +02:00
Christian Kamm
4c0814f7de QmlJS: Update qml type definitions for qmldump changes and QtQuick module
This adds the QtQuick 1.0 module to the code model.

Reviewed-by: TrustMe
2010-10-01 10:14:29 +02:00
Christian Kamm
6f1c1af833 QmlJS: Prepare qmldump for multiply exported C++ objects.
In the future, builtin objects are going to be exported in Qt 4.7 and
QtQuick 1.0.

Reviewed-by: Roberto Raggi
2010-10-01 10:14:29 +02:00
hjk
e6dd3ff5f0 version bump 2.0.91 -> 2.1.81
Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway.
2010-09-30 13:49:10 +02:00
Friedemann Kleint
44d87bf85d Debugger [gdb/win]: Use calloc instead of malloc for QObject-properties
Avoid symbol clash with QVector::malloc.
Display at least property count.

Reviewed-by: hjk
2010-09-30 12:16:41 +02:00
Leandro Melo
81d40def56 Generic highlighter: Create default dir for definitions on user's area (at runtime). 2010-09-29 14:00:19 +02:00
Marco Bubke
45bdff449d QmlDesigner: Items in Positioner cannot manipulated anymore
Add a positioner node instance and the concept of resizable and movable
items. Item in a positioner will be not selected anymore. Instead their
positioner will be selected which is not resizable.
2010-09-29 13:54:27 +02:00
Thomas Hartmann
a210978e9b QmlDesigner.propertyEditor: re design panes
This patch makes the important properties more
accessible.

Reviewed-by: Marco Bubke
2010-09-29 13:31:10 +02:00
Jarek Kobus
67cb7a3274 Update Polish translation 2010-09-29 13:01:07 +02:00
Friedemann Kleint
18688c9a23 Merge remote branch 'origin/2.1' 2010-09-29 12:23:45 +02:00
Lasse Holmstedt
91c0df0689 Build QMLObserver and qmldump only in debug mode
The problem is that we actually should have both debug & release builds,
but we don't have detection at the moment which binary to use.
See QTCREATORBUG-2496

Reviewed-by: Thomas Hartmann
2010-09-29 10:57:16 +02:00
Lasse Holmstedt
86fcf51b60 QML Observer: fix paths for the qml app template
Reviewed-by: Thomas Hartmann
2010-09-29 10:57:15 +02:00
Lasse Holmstedt
64f980a38b Fixed copying files from share
Reviewed-by: kkoehne
2010-09-29 10:07:19 +02:00
Alessandro Portale
bea2c14d76 Improved the comments in the generate qml app code. 2010-09-29 10:06:14 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
2010-09-29 09:39:18 +02:00
Friedemann Kleint
29e0f0d46b Merge remote branch 'origin/2.1'
Conflicts:
	src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
2010-09-29 09:28:52 +02:00
Aaron Kennedy
8ff81fd75d Revert "Compile"
This reverts commit a9820d4fca.
2010-09-29 16:42:00 +10:00
Aaron Kennedy
a9820d4fca Compile 2010-09-29 14:48:41 +10:00
Robert Loehning
d7fec2ae1e L10n: Improved German translations related to checkboxes
Reviewed-by: Oswald Buddenhagen
2010-09-28 20:52:36 +02:00
Kai Koehne
9db7e93e3f QmlJsObserver: Avoid false dependencies
Don't set DEPENDPATH to all qmljsdebugger folders. qmlobserver links
against the library, which updates itself.
2010-09-28 15:45:33 +02:00
Leandro Melo
5f13590372 Remove old and unused snippets file.
Reviewed-by: Alessandro Portale
2010-09-28 14:45:44 +02:00