feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,174 Commits 108 Branches 368 Tags
b8e1860c885fe3e7cb901b96c3303dd9d70ea26c
Commit Graph

31174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orgad Shaneh
b2a09f7b45 Git: Rename branchName -> fullName 
The model can contain tags

Change-Id: I70a75534848232476447125801a5ca7e963bbdcc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:22:31 +02:00
Orgad Shaneh
2af4c05b8c Git: Use -x for cherry-pick 
Change-Id: Iaa6bfdaa1307a3c7a73fd80fb0ffe3b80a01312d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:21:47 +02:00
Orgad Shaneh
aad68917b9 Git: Always allow stash before cherry-pick/revert 
Currently done only from "Actions on Commits"

Change-Id: Ide34e198e72f554ba6fd75ef21aaaf35917b4f6a
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 13:21:41 +02:00
hjk
0b57c8ded2 Debugger: Fix LLDB display of std::array with "complex" content 
Change-Id: I43dd9b8afe76f204fe2509f1f2f81f74c48a16ab
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-08 13:15:20 +02:00
Orgad Shaneh
8aa1c9bc37 VCS: Remove removeColorCodes 
status output can be uncolorized using the git config value
color.status=false (works for short status since git 1.7.0)

Change-Id: I0887ab9a02f4c98fe54a94a53ffcd4f91fef8699
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:56 +02:00
Eike Ziller
7017e95531 Progressbar: Fix uninitialized variable 
Which lead to progress indicators sometimes not having a cancel button.

Change-Id: Idd470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:33 +02:00
Orgad Shaneh
54b7146986 Gerrit: Notify on invalid configuration 
Task-number: QTCREATORBUG-9548
Change-Id: I4c5f9a4c6b7a818d296a923df1d665c22afd8292
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:47:03 +02:00
Orgad Shaneh
ffdd317773 Git: Support remove/rename for tags 
Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:43:13 +02:00
Orgad Shaneh
0ae3d29a66 Git: Simplify button enabling conditions in branches 
Change-Id: I6484dd62eac80e1e4aba00890926e7dfb542f0be
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 12:30:34 +02:00
Daniel Teske
5948bcf328 AndroidSettingsWidget: Don't show a message box for wrong settings 
I believe this is responsible for the crash reported in
Task-number: QTCREATORBUG-9724

Change-Id: Id5721e46b9dc9587ff8423cd3d5e6aa9107e7dba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-08 11:48:23 +02:00
Daniel Teske
7517a3408a Android: Show more information in the compile output for devices 
Task-number: QTCREATORBUG-9690
Change-Id: I9b3e20db9049edc42364b005a7920a040f3feaf7
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-07-08 11:47:02 +02:00
Robert Loehning
b830444e24 Squish: Fix tst_simple_analyze on Windows 
Seems like I broke this with
c0272c7919
Sorry!

Change-Id: I13dd9b8afe76f204fe2509f1f2f81f74c48a16ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-08 11:43:25 +02:00
Kai Koehne
108899ef8f Don't return negative numbers in sdktool 
Negative return values are interpreted as 'process crashed' on
Windows: QTBUG-28735 . This in turn means the installer framework
always shows an error dialog.

By using positive numbers even for error conditions the installer
can decide to ignore certain errors instead.

Change-Id: Ib5cdd461372ac13fe417feb6ff43a7424c159f68
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-08 11:33:32 +02:00
Marco Bubke
514ba53b35 QmlDesigner: Add capturing for qml puppet streams 
Change-Id: I094e01b85cfe1ddafb0590f56d9d5b810a390cb4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-08 11:28:44 +02:00
Marco Bubke
90ce3aec8b QmlDesigner: Test mode for qml puppet streams 
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-08 11:28:38 +02:00
Robert Loehning
486b5c4739 Squish: Removed pointless progressBarWait() 
Waiting already done in createNewQtQuickApplication()

Change-Id: Ibc9dfa1c5fdec0dd34c6dfe2e9c3e9fda6f55fa1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-08 11:27:15 +02:00
Orgad Shaneh
45ccd7d919 Git: Fix crash on checkout branch 
Task-number: QTCREATORBUG-9756
Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-08 11:24:03 +02:00
Christian Kandeler
5388a43cbf Remove pointless project property forwardings in pluginspec.qbs. 
They might have been necessary in ancient times, but nowadays project
properties can be accessed in prepare scripts.

Change-Id: I209b3c7d0caba7c2f4fc2dda80e57b16d8255fe0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-08 11:18:29 +02:00
hjk
d2469bc9e8 CppRewriter: Treat libc++'s std::__1:: as std:: for debugger display 
Change-Id: Iabc1330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-07-08 11:07:42 +02:00
Orgad Shaneh
a6626b49c4 Git: Reorder reset types 
Hard is now the default (as it is in 2.7), and the types are
properly ordered

Task-number: QTCREATORBUG-9733
Change-Id: I54fb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-06 20:18:52 +02:00
Orgad Shaneh
3cefd0288e Git: Remove wrong assertions 
Changed in 89523c14

Change-Id: I872c37633a877e982046b2a44266159d86defbde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-06 20:18:14 +02:00
hjk
26e97398ab Debugger: Fix LLDB QMap dumper 
It needs spaces _exactly_ as found in the debug info.

Change-Id: I3ad0052b364c5c3cfea17d8169de8a235d37b891
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 18:49:45 +02:00
hjk
6aea42251b Debugger: Make LLDB dumpers more robust 
Take care of older versions without SBValue.GetCanonicalType()

Change-Id: I10c1330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 17:55:19 +02:00
hjk
8312ce2761 Debugger: LLDB dumper for std::__1::vector 
Change-Id: I11f5eb1e9b9047b86aeeb79bfd104079897a021c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 17:53:55 +02:00
Friedemann Kleint
2651b1aa7e Debugger: Display unsigned hex values in watchhandler tooltip. 
Change-Id: I2605c29ecb4417ce114702ef9d878343cc67b72d
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 16:55:15 +02:00
Daniel Teske
2a030ac95a EnvironmentAspect: Fix various aspects broken in the refactoring 
Switching the base environment needs to update the environment.
Fetching remote environment didn't work.

Task-number: QTCREATORBUG-9734
Change-Id: I4dd0052b364c5c3cfea17d8169de8a235d37b891
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-05 16:53:04 +02:00
Michal Klocek
39f618b88f Fixes generated RSA private key in OpenSSL format with no crypt option 
* adds missing fields dmp1, dmq1 and iqmp to RSA structure
* verified with openssl 1.0.1

Change-Id: I2891cd04303f7b44bbe24a844b2d74669c07f521
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-05 15:04:48 +02:00
hjk
ed9296300f Debugger: Fix std::string display when using libc++ 
Change-Id: Ifec1330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 13:58:03 +02:00
Friedemann Kleint
1f338e53ff Fix debugger watch data tooltip. 
Display value correctly, omit empty display types.

Change-Id: I840a8bb1db65d721f871b9c33ca327f2ba6c8e26
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 11:16:03 +02:00
Petar Perisin
6312cc18e2 Git - added ability to launch git gui 
Change-Id: I65ed3e0408e43e354a289bbbd385aec2e254746c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-05 10:16:59 +02:00
jkobus
c59c1661d1 Fix jumping to wrong line after double click in left view 
Task-number: QTCREATORBUG-9655

Change-Id: Ide2a68e4d49b0bb17d745e7f13f1c565b8629c03
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-05 09:43:08 +02:00
hjk
16ed4c018a Debugger: Fix QSet dumper 
Change-Id: I62f5eb1e9b9047b86aeeb79bfd104079897a021c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 09:05:17 +02:00
hjk
8a6dc82385 Debugger: Fix LLDB QHash dumper 
Change-Id: I694f175dd2f8cdc1f123f978fa3d018398035fd8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-05 08:01:58 +02:00
Eike Ziller
5d5b769281 LineNumberFilter: fix uninitialized variable 
Change-Id: I90c1330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2013-07-05 07:23:25 +02:00
Orgad Shaneh
2103a4a96c Git: Clear branches model when repository becomes empty 
Change-Id: I78932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-04 17:59:49 +02:00
Orgad Shaneh
49bad12787 VCS: Emit repositoryChanged when ExpectRepoChanges flag is set 
Change-Id: I7ae5199a1397258c9816ff1801fb5d0909feb626
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-04 17:59:30 +02:00
hjk
6f75191d2c Debugger: Be more explicit about conversions in QHash dumper 
Change-Id: I35e36edf31bb8d45e92d39d2c069734c560711cc
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 17:53:47 +02:00
hjk
ea8ecfb890 Debugger: Suppress printing of name fields in LLDB 
Brings it more in line with what we do on the GDB side
and makes a few more autotests pass.

Change-Id: I89fd7a9d5b7bfd6ffd68dcda824c95dd7a7a52b0
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 17:08:28 +02:00
Marco Bubke
24d1e54490 QmlDesigner: Rename removeVariantProperty in removeProperty 
Change-Id: Id350f7d3e215d08210a3a535f89b12fe15928321
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-04 17:05:53 +02:00
Marco Bubke
7048709ab8 QmlDesigner: Clean up form editor code 
Change-Id: Ife16e84a7b9d1c41ec6481c7d91a1872281a1064
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-04 17:05:45 +02:00
Orgad Shaneh
a26c884b70 Git: Preserve current selection on log change refresh 
Change-Id: Ic6be652a1d5cca87ae5effdcb3cb5df7b1b73c2c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 16:57:43 +02:00
Friedemann Kleint
d99e14fad8 Persistent settings reader: Implement QRect-type for values. 
Format in X11-resource syntax.

Change-Id: Ifc8cd76202d0e1e02ae18809ac8d276e94a27262
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 15:50:33 +02:00
Friedemann Kleint
87fa3adb2d Persistent settings reader: Emit proper warning on value read failure. 
Fix annoying assertion when reading session files:

SOFT ASSERT: "simpleValue.isValid()" in file
.\persistentsettings.cpp, line 126 .

Change-Id: Ia73a7a4a6f7a28c20876daf11a527b638ee02d89
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 15:50:28 +02:00
Robert Loehning
6dd6ce935e Squish: Handle Squish installation path with spaces 
Change-Id: Ia988ceaeab83d3b1b5258024f9c4ee5232eaf43c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-04 15:42:50 +02:00
Orgad Shaneh
be5133cf72 Git: Update branches dialog when repository is changed 
and on fetch

Task-number: QTCREATORBUG-9667
Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 15:26:39 +02:00
El Mehdi Fekari
10f2e59aed Qnx: Add BlackBerry kits for qt5 
Qt5 is available in the internal 10.2 NDK builds.
N.B: This is for testing purpose (internal developers).

Change-Id: I0858e05f5902d602a0f921ed22f34b79d557a10a
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
 2013-07-04 14:14:06 +02:00
hjk
0159774451 Debugger: Improve QVariant dumper 
Access to the is_shared flag seems somewhat indeterministic
across platforms/compilers. Hard-code to non-shared for now.

Change-Id: Iaac9dd8fcee28ffd1e599300a1c12f3215823573
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 13:24:32 +02:00
hjk
ea6a72143d Debugger: LLDB related dumper fixes 
QTime, boost::bimap size, QAtomicInt

Change-Id: I0239dd8fcee28ffd1e599300a1c12f3215823573
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 13:23:51 +02:00
Robert Loehning
80b0156918 Remove unreachable link 
Change-Id: Id14add2f8669c97d8608a7ed8455e63e50d3bcbe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2013-07-04 13:08:30 +02:00
Daniel Teske
6773d47a63 AndroidDeviceInfo: Rename cpuABI to cpuAbi 
Coding style.

Change-Id: I433b4d47f54c5a3a9aed68d99b2ab64a7e82d698
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-07-04 13:05:29 +02:00