Commit Graph

4237 Commits

Author SHA1 Message Date
Eike Ziller
fa227a4eef Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/libs/qmldebug/qmldebugclient.cpp
	src/libs/qmldebug/qmldebugclient.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I9594b4e9befc78f8138deb121f0bfc4212f7edbf
2015-11-26 13:01:20 +01:00
Thomas Hartmann
bdf66b0a3f QmlDesigner: Adding specifics for GridLayout
Task-number: QTCREATORBUG-14821
Change-Id: Ifa037975c99762fb8866ffffa118332044842dff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-24 12:30:04 +00:00
Eike Ziller
3f63635053 Merge remote-tracking branch 'origin/3.6'
Conflicts:
    src/libs/3rdparty/modeling/qmt/model_widgets_ui/classmembersedit.cpp
    src/plugins/git/gitplugin.cpp

Change-Id: I78a21510d484b655e01141a3543e08ee2123f9cd
2015-11-23 14:25:38 +01:00
Sergey Belyashov
02e387f5d8 Update Russian translation
Change-Id: I35f09b4905f325f712b9d506149412dfcbb51bb5
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-11-20 13:52:23 +00:00
Martin Kampas
5077081319 Wizards: Fix inconsistent category display names
Change-Id: I24d0744351d0065793b8ccb65ba83d8a499f28dd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:22:45 +00:00
Martin Kampas
f00280d11d qtcanvas3dapplication wizard: Fix typo ${} -> %{}
Change-Id: I248a12ac502d66c331f4584c84ee8a1f1f4ac0a4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:21:39 +00:00
Orgad Shaneh
01b50d2fc3 Fix invalid long address printing
Task-number: QTCREATORBUG-15326
Change-Id: I90b73e757c0ad3fc16ef587e6b4359e6bcb843ea
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-20 07:51:14 +00:00
Tobias Hunger
bf48d54b27 Convert to Qt5 style connects
Use Clazy fix-old-style-connect to turn most connects to Qt5 style.

Change-Id: Ib81da329a7c1f5cf3e76536cbcc729a5c5d6dd56
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2015-11-19 16:22:52 +00:00
Eike Ziller
d13b22e6bc Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
2015-11-12 13:43:17 +01:00
hjk
0f9e2baa1b Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit
Change-Id: Idb14d81aa3546af0e7a21922fbb6d551ecbc1b06
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:57:37 +00:00
hjk
aa221121b6 Debugger: Pass down expanded inames in LLDB tests
... as well as the 'autoderef' flag. A lot of dumper tests were
failing even though the dumpers themselves were ok.

Change-Id: I198784d95eb0004e81bfab995121e048b1722c66
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:16:17 +00:00
hjk
aed9c46ea6 Debugger: Try to handle empty base classes more gracefully with LLDB
Empty base classes are counted towards GetNumberOfDirectBaseClasses()
but do not get reported in GetChildCount(). Fix the difference by
manually creating empty base class entries in the report.

Change-Id: I2650d9f5234302c5bf2fa0e62a886d3a39fc11db
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:11:32 +00:00
hjk
45b08e21a2 Debugger: Fix QHostAddress dumper with Qt 5.7/64 bit
Change dd920024 in QtBase introduced padding in the QHostAddressPrivate
structure.

Change-Id: I92292937cf7bdd539764f52c18b70d926e39cf29
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-10 12:12:24 +00:00
hjk
64426fb772 Debugger: Adjust boost::unordered_set dumper
... to Boost 1.58

Change-Id: I5656e0c32e1f7df0b2b74a2f9ad7d468997a8904
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-10 07:57:23 +00:00
hjk
e6454be43f Debugger: Fix QObject dynamic property dumper for Qt 5.7
Property values are stored now using a QVector, not a QList.

Change-Id: Ifc8d6b856d2aff5ce4565c43111132f2a73460df
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 13:49:34 +00:00
hjk
d6bb579a41 Debugger: Fix QAtomic* and QShared* dumpers with Qt 5.6/C++11
With C++11 we use std::atomic in the ref counter, giving yet
another possibility of structure member names. Instead of
trying to keep up with that, access the binary data directly.

Change-Id: I572f727eb9dab37ac1ca07594d55bea723050817
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 13:49:25 +00:00
hjk
a4a9529403 Debugger: Make boost::container::list autotest pass again
... by adjusting the expectations on the exact type display
and trying two possible versions of structure member names.

Change-Id: I817aeb787b905cb22c6f68856043a29db3e79e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 10:08:20 +00:00
hjk
f81dca4b38 Debugger: Relax reference counter sanity check
With C++11 we use std::atomic in the ref counter, giving yet
another possibility of structure member names. Instead of
trying to keep up with that, access the binary data directly.

Change-Id: Iabea831689f58f83150287218bb015c824e888ca
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 08:44:58 +00:00
hjk
626086e9d1 Debugger: Fix expansion of std::string et al
The objects have been reported as 'having children', but
when asked for them nothing was produced, leading to an
endless loop (until the next 'step' command).

Change-Id: I3bbfe10a7ed980b27a5fca1edfe44dd8983b8f7b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-09 08:02:32 +00:00
Sergey Belyashov
1bf1f58a9c Update Russian translation
Change-Id: I50d77ef6ae188deb7d0242ac7f8995c1febf3c56
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-11-06 15:28:56 +00:00
hjk
e5e3243dd1 Debugger: Fix std::string display for GCC 5.x
Task-number: QTCREATORBUG-15110
Change-Id: Ic1bcdf1b73e0013068e56a5d8804da42cdb2c237
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-06 14:05:07 +00:00
hjk
f58ab8d723 Debugger: Fix std::set<...>::iterator dumper for GCC 5.x and C++11
Change-Id: Icaca7da1f5ae6f958ae0fdaf217bde611d049916
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-06 10:08:48 +00:00
hjk
34196f510d Debugger: Add dumper for GCC 5.x's std::__cxx11::list
Change-Id: Idaf6692668210838488699dcab38d1517825bda3
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-06 10:08:05 +00:00
hjk
9d6c63d4d2 Debugger: Move the 'break on qFatal' implementation to gdbbridge
Easier to create invisible breakpoints there.

Task-number: QTCREATORBUG-15276
Change-Id: I76ffa45f9f0de5ffbc3b82a7ef9a4ddcdfff62eb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-05 09:42:03 +00:00
Eike Ziller
81e9b96148 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ic7cba72e7bec10e4fc0099b97e3317e391a6aa5d
2015-11-03 13:06:35 +01:00
hjk
b85d8290a7 Debugger: Restrict QJson{Array,Object} display to 1000 items.
... and don't offer expansion of isEmpty() object.

Task-number: QTCREATORBUG-15270
Change-Id: Ifb76c20c6308484d38e21273a2f33c575bb72430
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-03 09:55:52 +00:00
J-P Nurmi
7c1f8f8342 Add QML import completion for Qt.labs.controls, calendar & templates
Change-Id: I2aed529c3bedb27ae5c4c670d51d9d182815c8b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-11-02 13:16:36 +00:00
hjk
601f6fd819 Debugger: Rename GdbEngine::{stackListFrames->fetchStack}
Same as LLDB now.

Change-Id: I8a59a977fe45e7f523eae59cbb4cd24b78ad8e7b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:19:05 +00:00
hjk
d5101b5d91 Debugger: Standardize on all-lowercase for protocol options
CamelCase might be more Qt-ish, but the backends tend to use
lowercase only.

Change-Id: I04b9b7305b54226f27b70151115050c4816f911f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:18:50 +00:00
hjk
7a618c38cf Debugger: Remove unused dumper.py function polishWatcher()
Change-Id: Ib85ac34b56971b1882d91bddf9abf1af5b0506f4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-02 10:00:49 +00:00
Eike Ziller
310ae09996 Merge remote-tracking branch 'origin/3.6'
Change-Id: I68512c775ed25b51c8b0abe1818c9c7c5955874c
2015-10-30 16:08:03 +01:00
Sergey Belyashov
e3ad8d7f9f Fix JsonWizard translation
Fix generation of jsonwizard_tr.h helper file used by lupdate for
translation files.

Change-Id: I4bd293b2b107d4b7a6a49d955d9d8734a4b42e85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-10-28 13:33:25 +00:00
Tobias Hunger
660bae3a4c Wizards: Fix qmlproject wizards again
Task-number: QTCREATORBUG-15242
Change-Id: I04269e41f596ed79478c53f27aaaa7a212113772
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-28 12:13:37 +00:00
Leena Miettinen
0be8b8f5df Welcome: link to talks from Qt World Summit
- Focus on Qt Creator talks and new modules.
- Fix links to tutorials where the HTML filename changed.
- Add new icon for Qt World Summit 2015 (from Diana de Sousa)

Change-Id: I19ca398080e3a8b869f1ac27594e66cfe429bec2
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-28 12:10:50 +00:00
Tobias Hunger
6c83796896 Wizards: Fix QmlProject wizards
Task-number: QTCREATORBUG-15242
Change-Id: Iac6829cbc805a111c0b359ed871f53b1be7053b0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 17:22:46 +00:00
hjk
e5d62f3e7e Debugger: Fix of display of object addresses
Task-number: QTCREATORBUG-15236
Change-Id: Ic8f6fd60d185b759ee13dade3a18c2d955303cdf
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-27 11:45:07 +00:00
Eike Ziller
6d4135d8f0 Merge remote-tracking branch 'origin/3.6'
Change-Id: Iddfa0d2f3c0fb8ba65c0e5d479ad8e2f2cb95685
2015-10-26 10:55:50 +01:00
Alessandro Portale
1b6d97b27f Utils: New ThemeHelper class with icon handling tools
http://blog.qt.io/blog/author/didesous/ announced new designs/themes
for Qt Creator. This patch implements the helper functions for the
loading and theme-specific recoloring of icons.

Change-Id: Ie6e96eeecb70dccd6b95338c653a9d3b760557cc
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-23 16:08:32 +00:00
Tobias Hunger
9035e77800 Wizard: Add a wizard for item models
Task-number: QTCREATORBUG-7
Change-Id: Ibc06eda1b6596b08dd2e3be4e426c8b89be31064
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-21 13:57:24 +00:00
Tobias Hunger
14eafd5dca Wizards: Use C++11 in all qmake projects created by the JSON wizard
Change-Id: Idbe9053514ec94880df2d89a10ebe9bd4d9393b6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-20 15:46:48 +00:00
hjk
b8ae9fd46d Debugger: Adjust native mixed debugging after upstream changes
Change-Id: I4d137fadd0de2aa346f2f49932faac4ee9ed41e7
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-19 12:40:29 +00:00
Tobias Hunger
0cda81a99c Snippets: Add license snippets
Change-Id: If3b3d9b4f602848ffe39c72a90d4b0f1275eb828
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-19 08:43:27 +00:00
hjk
ec2e01faec Debugger: Make basic native-mixed debugging work with LLDB
Change-Id: I4d55c6a486d5adbccaa93eaa1ee461238fecfea3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-13 06:49:00 +00:00
hjk
525c33f999 Debugger: Infrastructure for reworked native mixed debugging
- Remove old experimental native mixed approach.
- Move some common stack parsing to Stackhandler.
- Mark gdbbridge.py debug output explicitly to remove it
  from actual reponse handling

New native mixed needs QtDeclarative changes and
QTC_DEBUGGER_NATIVE_MIXED=1 for now.

Change-Id: I09eed1da51cea878636d36756015b7bfaed34203
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-09 05:19:45 +00:00
hjk
ea39476ef2 Debugger: Do not try to treat labels as variables
They produce no values later anyway and are slow to process.
With this patch, stepping in VME::run from qv4vme_moth.cpp
takes about 1s instead of more than 40s previously.

Change-Id: I5c96966612bdb7c0120d9ebb545d6e8483cbf843
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-08 14:20:59 +00:00
Thomas Hartmann
de0ed107a2 QmlDesigner: Adding layouts to doResetProperty()
Those have to be hard coded in our code.

Change-Id: I2bdaec0716aeca56df9476f124a47e2dfc1658cb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-06 10:16:20 +00:00
hjk
97b64f6791 Debugger: Add watcher handling in pdbbridge for basic types
Values are passed through plain str(eval(...)), i.e. no expansion
of non-scalars (list, dict, ...) yet.

Change-Id: I21ceab29504e2bb43aef516f9beeca5470500fdc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-30 11:28:54 +00:00
Mitch Curtis
e2d0960d77 Add .directory files to git.ignore
These are created by the Dolphin file manager on KDE.

Change-Id: I292bab5fdde43a5bd65f32babbda279c5adeabad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-09-30 08:54:27 +00:00
Eike Ziller
0ba4781bfc Merge remote-tracking branch 'origin/3.5'
Change-Id: I889b93611d1762121548fb71d1d3493e4adba313
2015-09-25 10:35:42 +02:00
hjk
f229f0dbe5 Debugger: Disable CLI use of gdbbridge.py
The detection seems to go wrong in some cases on RHEL which
are not reproducible locally.

Since the feature is not important for Qt Creator's own use,
disabling is safer than attempting to guess better.

Change-Id: I95fd56985d61b604a285e7573f8775b902bcc68c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-25 07:12:30 +00:00