Commit Graph

5173 Commits

Author SHA1 Message Date
Thomas Hartmann
d2e58eeeec QmlPuppet: move allPropertyNames() to QmlPrivateGate
This patch also fixes a memory leak.
The inspectedObjects in the default case were never deleted.
We now use a pointer to an object on the stack instead.

Change-Id: I07490e26b956e6c04911cb3e5e051704b2c2c35d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:24:03 +00:00
Thomas Hartmann
868c8e3fe7 QmlPuppet: Move createPrimitive() to QmlPrivateGate
Change-Id: Ia635d3c0c4f00c90955f29b487a9d18911488908
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:23:57 +00:00
Sergey Belyashov
0171f5f6b7 Russian translation update
Change-Id: I56133c7459be50efe5eda7382de7a211a62ba34c
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-05-19 12:18:28 +00:00
Thomas Hartmann
e0a3e25491 Qml2Puppet: Introduce QmlPrivateGate
The goal is to avoid direct usage of private API.
Any access to private QML API is supposed to go through QmlPrivateGate.

NodeInstanceMetaObject is moved into QmlPrivateGate and renamed to just
MetaObject.

Change-Id: Iba0b574605e455b01e7b86306ec3ca47be7b4e58
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-05-19 12:04:41 +00:00
Tobias Hunger
1da94d5fac QMakeProjectManager: Replace consoleappwizard with a Json wizard
Change-Id: If05743ad530ee7d589fde324202ffb9c2750a669
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 15:39:28 +00:00
Tobias Hunger
3d0b690d31 Git: Replace CloneWizard with a Json wizard
Change-Id: I2188c083665acc239bc98bf857ff57b071805fbc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 13:43:39 +00:00
Tim Jenssen
3c9efc3e72 refactor NodeInstanceMetaObject
Reduce the use of NodeInstanceMetaObject in QtQuickDesigner code
to two static methods:
 - registerNodeInstanceMetaObject
 - createNewDynamicProperty

Change-Id: I0ef8ee96995184e968467b799147c6b4c80fbccc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:27:03 +00:00
Tim Jenssen
8409c6a724 remove unused code
engine can be used from the ObjectNodeInstance and
prefix is not used since some time.

Change-Id: I857537643f149955a8ca9c5538ad15420bca9ab4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:26:57 +00:00
Alessandro Portale
8c1b8239f4 QmlProjectManager: Qt Quick UI templates via json wizard
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of Qt
Creator, the .qml.ui split is now optional.

Change-Id: Ic6d35e650cf0a7735cdfac9080f95015309a5879
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:00:17 +00:00
Tobias Hunger
3f6f02f2f1 Bazaar: Replace CloneWizard with a Json wizard
Change-Id: Ifce4d43a2f8d1ec97af4b30d32e5c8bb03c22bc9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2015-05-18 12:43:12 +00:00
David Schulz
f34b32abd5 Editor: Make parenthese mismatch color configurable.
Task-number: QTCREATORBUG-14357
Change-Id: I92a0d50fb8f3448195f3d38f7544a31eb695733b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 12:18:17 +00:00
Tim Jenssen
de2f5f6339 remove NodeInstanceSignalSpy
Change-Id: Ia002967367e39ef9f8a6229e3c39d785382cc1a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:36:00 +00:00
Tim Jenssen
1e9f7e1e44 fix spelling in a comment
Change-Id: I7241a1e7e4cad1c1614ac95e7fe4e3a080eab265
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:13:33 +00:00
Tim Jenssen
76245df442 remove spaces
Change-Id: I0ca4812acd7c7efa710e18204ab0cd4426827396
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:12:44 +00:00
Tim Jenssen
31ddfd3e0a reorder includes and use <> where it makes sense
Change-Id: Ia4957cb5cfd2a58d293bda190490f30cdf475dd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:12:36 +00:00
Thomas Hartmann
d32c4cddf4 QmlDesigner: Remove qmlpuppet for QtQuick 1
Change-Id: I7427267a5f92f02bd6b90afcfb1cf666f85f0617
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 11:11:32 +00:00
Alessandro Portale
828360d87a Dark theme: Light icons for build step actions
For a dark background we need light icons.

Change-Id: I86714598be70bff981f94fb6c4e4afd6acfbe96a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 09:35:13 +00:00
Tobias Hunger
5aeccb3be6 Mercurial: Replace CloneWizard with a Json wizard
Change-Id: Idcf5c523010ecb46d0ec6fa9475d182d14984852
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 08:14:03 +00:00
Tobias Hunger
5d63c06e75 Empty Qmake project wizard: Make .gitignore work again
Change-Id: I590a88c4c66a0dbc879d2ba9198f273333fa35e5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-15 15:42:31 +00:00
Alessandro Portale
8ae18a9ca8 ProjectManager: Qt Quick application templates via json wizard
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of
Qt Creator, the .qml.ui split is now optional.

Change-Id: I4b5ebcc35a585fad6ebc2e994711ca23e3300717
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-15 13:14:37 +00:00
Tobias Hunger
0b91b77cdc Subversion: Replace Subversion Checkout wizard
Replace the subversion checkout wizard with a Json wizard.

Change-Id: I969ff00e2e6fdc8088f8c7a928f80454cd987164
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-15 09:11:44 +00:00
Tobias Hunger
4f4c6b6288 CVS: Replace CVS checkout wizard with a Json wizard
Change-Id: I27c5c76923bae3e4df514e228873330fd8232c7f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-15 09:11:23 +00:00
Tobias Hunger
8211e6a084 JsonWizard: Simplify handling of bools via JS
Change-Id: I5381e83f6714886b7bf8cbcb859e1dd3b115a6c3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-11 13:33:10 +00:00
Ray Donnelly
f5dcc93b7e Debugger: Handle case of os.path.sep being '/'
On MSYS2, if QtCreator is launched from one of the msys2 shells
then the MSYSTEM env. var is set and our Pythons set os.sep and
os.path.sep to '/' so that it aligns with the default separator
of those shells.

fromNativePath(str) then fails to convert '\' seprators embedded
in binaries since str.replace('/', '/') is a noop. The operation
we want here is to convert all '\' to '/' anyway so this is more
explicit regardless of any opinions on our choice to dynamically
vary os.sep and os.path.sep

Change-Id: I76c05b188abca41c6a1b516c68b584e0c06e7235
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-11 11:23:11 +00:00
hjk
5c58293a36 Debugger: Some Python 3 support for PdbEngine
Change-Id: I052bc093086a5da0b2cbd4e99df32e42627ceaf5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-08 10:50:34 +00:00
hjk
c5ac8fc21b Debugger: Use simpler construction of basic types in LLDB dumper
Cheaper, more robust.

Change-Id: I989853dc288864f4088f09f60c8c5b717e4faef0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-08 10:35:08 +00:00
Orgad Shaneh
bba6515562 C++ Dumper: Fix potential endless loop on invalid pointer
Change-Id: I554f2cd0b97c549767453ad3df290d93da483360
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-05-07 12:46:02 +00:00
Eike Ziller
4058ff6fe9 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010
2015-05-07 14:42:46 +02:00
hjk
e855de4037 Debugger: Fix GDB hanging
This partially reverts commit e33da6a6b3.
GDB seems to hang while executing str(some_pointer) in some setups.

Task-number: QTCREATORBUG-14374
Change-Id: Ia678533b9122e505b21ef6659d404239995ddb81
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-06 06:19:00 +00:00
Nikita Baryshnikov
ee93b202de Qbs: added qmltypes
generated from qbs-qmltypes
to support highlighting and auto completion

Change-Id: Iae0f2c5ccb244c1909fe71f8ef02e58f21f51996
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-04-30 11:21:38 +00:00
Tobias Hunger
5b77a3a8c1 Blackberry: Remove blackberry support
Keep QNX.

A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.

I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.

Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-30 11:15:53 +00:00
Orgad Shaneh
4752c809c9 C++ Dumper: Support int in template arguments
e.g. Temp<int>

Change-Id: I3d737a696396548a896685aa48fc99a1c3289a6c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-30 06:59:01 +00:00
Daniel Teske
ed986f73d3 Remove Qt Quick 1 Template
Since this was the only template using the qt quick application viewer,
remove all traces of that too.

And this was also the only "upgradeable" template, so remove all traces
of the upgrade code too.

Change-Id: I68989dc5a87621593f3b5dd8c4979bb59f137200
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:32:30 +00:00
Daniel Teske
3f183b7ee0 Purge deployment.pri
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.

Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:32:07 +00:00
Daniel Teske
e6881bd6d6 QrcDeployment.pri: Remove unneeded android scopes
- andorid-no-sdk should not be used for new projects anymore.
- The android scope is handled in android.prf in qt, and there the
  handling is better, so removing this actually fixes a bug.

Change-Id: I2b901e0cb1fd4bc0d00fbcd3c8ea08b22e4bca49
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:31:45 +00:00
Orgad Shaneh
3b0a75c9e0 Dumper: Fix internal dumpers with Python 3
Change-Id: Ic38a827ce32e17fc7038ea974e05c77959367342
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 06:17:20 +00:00
Viktor Ostashevskyi
3a25e53267 Ukrainian translation update for 3.4
Change-Id: I3c8b0af8f204cf7c31f1452cf43bea82788e7cb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua>
2015-04-24 11:23:43 +00:00
hjk
7697bd4b6f Debugger: Remove broken old LLDB QSet dumper workaround
Task-number: QTCREATORBUG-13153
Change-Id: Ifc1393a9bedd0be793d752ad6af85221f5f8d247
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-23 12:09:07 +00:00
Eike Ziller
6c2c505228 Merge remote-tracking branch 'origin/3.4' 2015-04-23 09:39:09 +02:00
Kai Koehne
c92adf5ab4 Revert "QtQuick templates: add QML files to OTHER_FILES"
This reverts commit 67581c5faa.

The patch has multiple issues:

Removing and renaming the .qml file will leave the 'other' 
place unaltered. Also, adding new .qml files won't add them
to both places.

Change-Id: I918aa398f9cd183378982fb15562e8fa66d3ede3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-22 12:56:04 +00:00
J-P Nurmi
67581c5faa QtQuick templates: add QML files to OTHER_FILES
It's nice that main.qml shows up in the project tree under "QML"

Change-Id: I4e8be4cc962f2d1c204e7435e0a67a88ea76db5e
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-04-22 07:15:41 +00:00
J-P Nurmi
802a305737 qmljs: add import completion for QtQml & QtQml.Models
Task-number: QTCREATORBUG-13780
Change-Id: I9819e25559848f6635a83522b856da97679c5126
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-04-22 06:36:43 +00:00
Thomas Hartmann
6a1a6ae557 Wizards: Fix import for .ui.qml file
Change-Id: I448dbdb9fcbd72e6388cd15268447c08eebc68f0
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-04-21 15:03:03 +00:00
Sergey Belyashov
93d46b1835 Updated Russian translation
Change-Id: I641f212cd3239c2b211c55599cf92d01766b14db
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-04-16 14:15:10 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
2015-04-15 17:45:47 +02:00
Leena Miettinen
53502d7c5b Welcome: update links to videos from Dev Days 2014
Give preference to videos about using and developing
Qt Creator.

Add new icon for 2014 and updated icon for 2013 with new logo,
and remove icon for 2012, because it is no longer used.

Change-Id: If7f34b03247eb8cbe68b9460efbb55dc42770dd4
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-15 11:49:37 +00:00
hjk
89661af04e Debugger: Fix one call to check(False)
Not much harm done, the code was meant to raise an exception anyway...

Change-Id: I81db4081b4ca583e46a826aaee2fc8fa3f186a11
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 11:37:35 +00:00
hjk
6965fc30b1 Debugger: Disable parts of QDate* dumper for GDB on 32 bit
Older versions of GDB (~GDB 7.4 on 32 bit) will cause segmentation
faults in inferior calls due to misaligned %ebx values in an SSE
call in qstring.cpp:findChar.

Change-Id: I44492106080f12e645f9d57828438ec70fd66ca6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 11:07:30 +00:00
hjk
c50286db3c Debugger: Remove workaround to get dynamic type in std::*_ptr
Seems to not be needed anymore with recent GCC, and makes the
LLDB test pass on Linux.

Change-Id: If793e726656df8b319d2f50e1986e0a92f68411d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 07:46:14 +00:00
hjk
c5de4fa358 Debugger: Adjust std::__1::unordered_map dumper
Implementation seems to have changed.

Change-Id: I196d02cddcccdd7765e5a098bb98f894122781a1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 05:53:22 +00:00