feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,514 Commits 108 Branches 368 Tags
acfe2a2771fa2b392709471eeb0a3e36f3cd775b
Commit Graph

35514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kandeler acfe2a2771 Fix qbs build with clang. 
Properties item considered harmful.

Change-Id: I715b589bdcb6ef9ac35790122a1ba6f009652242
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
 2014-05-08 11:02:07 +02:00
Christian Kandeler 5c9f175133 qbs build: Make the autotest template available as an import. 
Just like for QtcPlugin, QtcLibrary etc.

Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
 2014-05-08 11:01:44 +02:00
Orgad Shaneh 65ee566183 ManhattanStyle: Validate widget before dereferencing 
Change-Id: Id32e59f96ed8a94f08eb0effbca4918e11659c06
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-08 09:58:43 +02:00
Orgad Shaneh bf31eb5195 Debugger: Fix debug log 
Change-Id: Id02b310e24d7f13fd444b30f20e0af10244f1798
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-08 09:43:02 +02:00
Christian Kandeler da85540971 LinuxDeviceProcess: Quote environment variable values. 
The current code breaks for values that contain spaces.

Change-Id: Ia2a318dcac09a8d1c1ce368378a33c633f28bf49
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-08 09:37:32 +02:00
hjk f1cfb5c515 Debugger: Base DisassemblerAgent on documents, not editors 
Change-Id: I7b7a0fc95ed4ce39b49e76755133030fffc13daf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-08 09:32:21 +02:00
hjk 5bc9461d83 Valgrind: Remove unneeded separate FutureWatcher 
Change-Id: I21fde2125a4a5d653fe4209e3452dec59c783d24
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-08 09:00:42 +02:00
Joerg Bornemann c8fc52bad6 fix qbs clang build 
The clang flags for C++11 were incomplete.
The linker flag -lc++abi isn't needed.
On OS X the minimum OS version must be set to 10.7.

This amends 7309b6a2d9.

Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2014-05-07 17:02:25 +02:00
Christian Kandeler 07d4c29043 RemoteLinux: Provide a custom run configuration. 
Like the existing "Custom Executable" run config,
but for a remote Linux target.

Task-number: QTCREATORBUG-12168
Change-Id: I0527c2f8080f0e3467fe7210968435fc401fbf76
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-07 16:34:57 +02:00
Orgad Shaneh b9f79cbd01 Clean some trailing whitespace 
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
 2014-05-07 16:19:47 +02:00
Orgad Shaneh 6886d0ac60 ProjectExplorer: Extend ApplicationLauncher 
Implement some more QProcess functions

Change-Id: I1afe3fa5f5b353508cf300178cb50507b3dd4b3e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-07 14:44:44 +02:00
Thomas Hartmann 28b512df44 QmlDesigner.ItemLibrary: remove forceEntry 
This feature allowed items to show up in the library even if the import
was missing. This feature was error prone and increased the complexity
of creating items a lot. Since we now have an import manager this is not
required anymore.

Change-Id: Ia127077be0b6c82a047cbb8f86ac3ab24e2d82ae
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-07 13:45:41 +02:00
Thomas Hartmann c4b1b16e9c QmlDesigner.ItemNode: Remove import handling 
We have an import manager now and do not have to handle imports
in the code for item creation. This is just a possible source of bugs.

Change-Id: I5de40b874659f27f0f1a8d83dd78bcae2194aa32
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-07 13:45:34 +02:00
Thomas Hartmann 2e1c1df7f4 QmlDesigner.ItemNode: remove check for QtQuick imports 
The Qt Quick Designer requires a Qt Quick import, so we
do not have to check for this case anymore.

Change-Id: Icbfa8fcf97eb43a503405e508e4afe1a16cc1542
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-07 13:45:24 +02:00
Thomas Hartmann 626364f661 QmlDesigner.DragTool: Remove import handling code 
We have an import manager now.

Change-Id: If0123059a0fa1b51ef91c13bf24e3e6998195880
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-07 13:45:17 +02:00
Christian Stenger 9c3604ba20 ClangCodeModel: Fix build 
Error was introduced with dc61b989ac.

Change-Id: I17217b6fc5f518104fb9f90f9a5fdbea6ef2f49d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-07 13:06:01 +02:00
Marco Bubke 622d42d4e3 QmlDesigner: Refactor NavigatorView 
Change-Id: Ibe187cc432f212889f56ec6ef8a2b9ff742e8a9e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:33:17 +02:00
Marco Bubke 948990aa7b QmlDesigner: Add NodeAbstractProperty::parentProperty() 
Change-Id: Ibb4e68cf80ab1d23680cfaf7a2c638fea5d6c5a0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:33:09 +02:00
Marco Bubke 0673a6a20d QmlDesigner: Refactor NameItemDelegate 
Change-Id: I501da870a8ebfbeb80a2c12010eadadbb3a158a3
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:32:59 +02:00
Marco Bubke 1099ecb9ad QmlDesigner: Add ModelNode::hasId 
Change-Id: I0f6e46c2f3ee91579e754dde434aa51a33b9c671
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:32:52 +02:00
Marco Bubke e401248ca8 QmlDesigner: Refactor IconCheckboxItemDelegate 
Change-Id: I947b3f928a8a83e2930a0f996f9d04a8fe85ff0b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:32:43 +02:00
Marco Bubke f9fe75a505 QmlDesigner: Move IconCheckboxItemDelegate in own file 
Change-Id: I9b3d3fc6f9be382b6141a736b5d063eebecf8364
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:32:34 +02:00
Marco Bubke aaaea73baa QmlDesigner: Move NameItemDelegate in own file 
Change-Id: I55cee9f88697b744fcc5af049630fd32c3ea81ed
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-05-07 12:32:22 +02:00
hjk f3c56654d5 Debugger: Add dumper for Debugger::Internal::DisassemblerLine 
Change-Id: I416dcb4ce95752773839169aaa76d603cbe91bfe
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-07 11:52:24 +02:00
hjk e260616b2c Debugger: Add dumper for some Qml internal structure 
Change-Id: I8e6d48fdaff77228963927e88b95eff136eac92d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-07 11:49:57 +02:00
jkobus 671ffc8f73 Fix a warning about a position out of range. 
May happen when selecting a text in diff editor.

Change-Id: I2c4790c42c91623fc8b4cabef8a4604de9fd4cef
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-05-07 08:07:42 +02:00
hjk ee3d6eba05 Debugger: Call putNumChild from putItemCount 
Reduces user side code

Change-Id: I4e6186e4af2b62983e1d14796c88654649fcda21
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-06 17:25:32 +02:00
Marco Bubke 26ac5adc1d QmlDesigner: Refactor QmlDesignerPlugin::selectModelNodeUnderTextCursor 
Change-Id: I439d049bfc399252aee1865ea66c920859c88d2f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-06 15:54:31 +02:00
Orgad Shaneh 41fe19cdc7 QmlPuppet: Remove redundant null validations 
Change-Id: I909119533646e0b29724212f764eb2685b683044
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-06 15:41:25 +02:00
Orgad Shaneh eca7fce452 QmlDesigner: Validate model before accessing it 
Change-Id: I0071e81309f9750006cab325d25c0602fb42a3f2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-06 15:39:22 +02:00
Orgad Shaneh b781d0557a QmlDesigner: Remove unused local variables 
Change-Id: I10d13161585fbe5c216fe939244f33fa27fb6336
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2014-05-06 15:38:09 +02:00
Orgad Shaneh 714fc53713 QtSupport: Fix indentation of condition 
Change-Id: I64563971749ab47d0f144bd90fbd22558783fc55
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 15:34:00 +02:00
Orgad Shaneh becf48fd82 QtSupport: Pass const QString by reference 
Change-Id: I0d708dc182b2190556ed08699876c5b7cb327628
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 15:33:50 +02:00
Orgad Shaneh 7cdbb4ba96 QmakePM: Remove unused local variables 
Change-Id: I2acc7fbaab147d652496c35970049751ba68731e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 15:33:40 +02:00
Orgad Shaneh 4b9a6b8ac4 ProjectExplorer: Validate pointer *before* accessing it 
Change-Id: I8a202aaa6961d2cc2691b13be2b76f4b7511dc0b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:33:33 +02:00
Orgad Shaneh fb206c14fe ProjectExplorer: Pass const values by reference 
Change-Id: I985aced32b95cfe4bc1bbbf7c917dc04b1d94f2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:33:23 +02:00
Orgad Shaneh 4cf0cae8bc ProjectExplorer: Remove unused local variable 
Change-Id: I268636f4f9c622868a94c68cc1d7be411899bfac
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:33:14 +02:00
Orgad Shaneh 98ebe37e21 Git: Remove redundant null validation 
Change-Id: Id4b8629fcb0c4b7d26d849bc15ab0cbd61c19fd2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:33:02 +02:00
Orgad Shaneh 642706dc44 VCS: Pass const values by references 
Change-Id: I9749c0c76b810f3d5fee1aa8c5750dac5930cd3c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:32:52 +02:00
Orgad Shaneh b3ff928b0a VCS: Remove unused local variables 
Change-Id: I72076d632ffd0b49e9e54dab27368a43787a36a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:32:29 +02:00
Orgad Shaneh 60cc818043 VCS: Cleanup slot signature 
Change-Id: I8654aa1aa730ee5a53fed372344fa46c8f634f36
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:32:11 +02:00
Orgad Shaneh e465295f75 VCS: Pass string by reference on annotate 
Change-Id: I20ce1187871a0cc82fbdaf02a555a9e12cbf185a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 15:32:05 +02:00
Tobias Hunger 3dc4e182f4 SettingsAccessor: Rename findSettingsFiles -> settingsFiles() 
Change-Id: I42161ab2f66ded277c36c4868ced13c640d26399
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 14:38:02 +02:00
Tobias Hunger eb8f88a3f8 SettingsAccessor: Rewrite bestSettings 
Change-Id: Ic0e7dfdd7df201f5050e3631011f52f64f7876c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 14:33:33 +02:00
hjk d2ad6aa972 Debugger: Simplify array dumper user code 
Heads up: This switches the argument order to allow a default
argument for the inner type if it can be determined from the
base pointer.

Change-Id: I9bf80fcdd51b5db8e7c65adba551ca667912cd86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-06 13:50:25 +02:00
Ulf Hermann e6792d33c3 QmlDebugClient: Rename "status" to "state" for consistency 
"state" is the more widely used term and we should follow that
convention. We also need to distinguish between the state of the
underlying network socket and the client itself. The change makes this
explicit.

As preparation for the upcoming centralized debug support the "State"
enum of the debug client is also moved into the QmlDebugClient class.

Change-Id: Ib9d7e03d23528f16ed696ed3518e813d11ea1c32
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-05-06 12:53:10 +02:00
Daniel Teske 7018a375c6 Fix compile 
Change-Id: I02ffcba805251ce92f50dd283da3dcffff4f7919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-05-06 12:40:47 +02:00
Tobias Hunger 74896187de SettingsAccessorPrivate::bestSettings: Use Utils::FileName 
also remove the const from that method.

Change-Id: I5df052d39595eac885e1dbdafd50ccec3e850ca8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 12:09:40 +02:00
Tobias Hunger b9338df474 SettingsAccessor: Keep upgraders in a list instead of a map 
This also removes the need to store m_firstVersion and m_lastVersion.
Add some convenience functions for that.

The bool return value from addVersionUpgrader is never used in the
unit tests.

Change-Id: I2f372ef7353b72a0c577b429f725277d2c579872
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 12:08:31 +02:00
Tobias Hunger 681963d5f2 SettingsAccessor: Make version constant projectexplorer unspecific 
Add a version upgrader to handle/document the changes.

Throw in some more key-changes while at it;-)

Change-Id: I1b2f9bd2ddbf89c11637d061cdf151fe61c95a75
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-05-06 12:06:24 +02:00