Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
62554e7647 Git: Add a soft assertion
If directory is empty, buttons remains NULL, which leads to a crash

To reproduce, open Branches dialog then close all editors
and projects and click Log for a branch

Change-Id: Icf06b76c58585c0dd6062017e94e07dad016c275
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 10:35:02 +02:00
Orgad Shaneh
e6c85d5ff9 Perforce: Support "+++ filename<tab>" for diff
Task-number: QTCREATORBUG-7136
Change-Id: I2c163356c06cdc46e39bf93989b9d56f598c0890
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 10:34:03 +02:00
Thiago Macieira
11da2fdc24 Don't accept a column/line number selection just because of ":"
If you had typed "filename.cpp:142" in the Locator field, Creator
would offer "Column 142" the first option. At the very least, that's
confusing because the user intended to select line 142, not column --
for a while I thought someone had typed the wrong word in the source
code.

But even worse, this selection was the first entry, so instead of
jumping to filename.cpp on line 142, the user ended up still on the
same file and line, but on a different column.

Instead, simply validate that the parts before and after the colon are
actually numbers.

Change-Id: I1f1fbd33d702ae26c41fd2485aa99fae800e1410
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-01 10:33:44 +02:00
David Schulz
924115d735 Cdbext: Fix QMap dumper for Qt5...
... when the symbol was added as an expression.

It seems that calling GetSymbolTypeName somehow destroys the red-black tree,
so moved the call before creating the tree.

Change-Id: Iefb187df4e7f99cfd95195a6ac9a4d8c64fa2365
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-01 09:27:39 +02:00
Nikolai Kosjar
1fad00f999 CppTools: Fix snapshot in case another project is opened
When a second project was opened the snapshot was reset. That resulted
in all kinds of problems since from then on the code model effectively
was not aware of the files of the first project.

The regression was introduced by commit a0d6df7b.

Change-Id: I1ccc9de68177205b49a4ba8ead2bc8abe4592b32
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-06-28 17:54:53 +02:00
Eike Ziller
377078ea27 Version bump
Change-Id: I7f083350d0e3191e1c2362d6179240b7e7b4c47e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-28 16:37:26 +02:00
hjk
5d005078c5 Debugger: Re-work QObject detection
Change-Id: Id7446d3898d81ac03b32b80cbc7ea22f350d191b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-28 14:23:47 +02:00
Eike Ziller
6b0be2d4a4 Revert "Fixing Info.plist.in for qmlobserver and qmldump"
The Info.plist.in files are actually handled by static.pro.
The projects should only be compiled from the deployed sources in the
build tree.

This reverts commit 30c602f458.

Change-Id: Ib63fb9e4db1c249817e59239029db7dd220ba5b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-28 14:22:45 +02:00
Eike Ziller
c63725ff66 Fix sources that are deployed into Qt Creator build for qml(2)puppet
When qml(2)puppet is built as part of Qt Creator, we need to generate
the Info.plist from Info.plist.in. When it is deployed as source into
the Qt Creator build, we need to do that too.

Change-Id: I83aa446f19984a51822c46df2ab7f41e78002ad4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-28 14:22:36 +02:00
David Schulz
7724bd4673 Checkout correct branch of the binary-artifacts repository.
Change-Id: I66e27b54b59874f5f69958cf9e178a5ce1b2da97
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-28 14:17:55 +02:00
hjk
61a1ccbfb2 Debugger: Make bytearray dumper work on anonymous data
Change-Id: Ibce8030360be161fb8944175afa0ce9119133b39
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-28 14:15:08 +02:00
hjk
58f4516e32 Debugger: Make QPixmap dumper work in release builds
Change-Id: Ib50d6968fcac38fa59df5c34c578b4a618dc9e06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-28 14:01:20 +02:00
hjk
103d0e643f Debugger: Add a more generic way to distinguish Qt 4 and 5 in dumpers
Change-Id: I1f020032984fb61554b75cc404784d39d9464890
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-28 14:00:56 +02:00
Ray Donnelly
7cb5e83d73 Fix building from MSYS shell
In debugger.pro, take path that checks and sets
QMAKE_CHK_EXISTS_GLUE if QMAKE_SH isn't empty.

Change-Id: I7c37acc5867c1ac3ab6da33db3eb2479c1d4213c
Reviewed-by: Alexey Pavlov <alexey.pawlow@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-28 13:31:22 +02:00
Eike Ziller
3c32bb8668 use master branch of binary artifacts
Change-Id: I25a7c780df5d6ddec5984be0e753d68c0bb79b63
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-28 11:31:08 +02:00
Christian Kandeler
7b73029be8 Remove workaround for qbs bug.
It's been fixed.

Change-Id: I49f3dc193752c2796548b5f49eb4e66824125b71
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-27 16:44:25 +02:00
Christian Kandeler
a86a67d883 Update qbs submodule to version 1.0.1.
Change-Id: Ic5f6968736c6d465700baf2afeb388efc90ac1ab
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-27 16:44:21 +02:00
Thomas Hartmann
98d78bed53 QmlDesigner: export NodeAbstractProperty
Change-Id: Ib34a474344d3077096c9775d1c5b99f59ae3e4fa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-27 16:35:42 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
Eike Ziller
6c8f87556a Fix build
Change-Id: I18dc32ca33f9ac50a3fc8411d075f16474d54f16
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
v2.8.0-rc
2013-06-27 14:16:04 +02:00
Orgad Shaneh
76c30832de FileName: Support "~ -> homePath" substitution
Change-Id: Ie1ca69582cfd8893b0616e51d2d5c1b13e987b69
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-27 12:53:03 +02:00
Daniel Teske
ea5aa79dca AndroidPackageCreationStep: Ensure right thread for handleOutput()
The ::run method is run in a separate thread, yet the owner of the
buildstep is the gui thread. As such we need to use a DirectConnection
to ensure that the slot is called in the right thread.

Task-number: QTCREATORBUG-9660
Change-Id: Ia206f3256a23f70f50d31c739359ff24b952fe46
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
tqtc/v2.7.2 v2.7.2
2013-06-27 11:17:45 +02:00
Eike Ziller
273dfa32e2 Adapt Qbs profile generation to recent changes in Qbs
* targetOS for mac is "osx"
* targetOS and toolchain are lists

Change-Id: I53d6c0d3669570c5c35f42a358727128d4d9d827
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-26 18:35:04 +02:00
Joerg Bornemann
5a3c4cc8ef qbs files: fix OS X checks
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-26 16:46:18 +02:00
David Schulz
ee70e9d267 Checkout correct branch of the binary-artifacts repository.
Change-Id: Id54a06a6636588a029de2e2f72d50edcf7ceaaa3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-26 16:12:08 +02:00
Robert Loehning
3f98694bf9 Small improvement in German translation
Change-Id: I0870160ef7c88658f4b6c993d196a061e23a8c7a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-26 15:53:57 +02:00
Eike Ziller
22e31f2b45 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/libs/cplusplus/LookupContext.cpp
	src/plugins/plugins.pro
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qnx/qnx_dependencies.pri

Change-Id: I6c406c2503845b08c4852db99c64491a325629c7
2013-06-26 15:28:42 +02:00
El Mehdi Fekari
9055eea11f Qnx: Check the debug token path when uploading to device
The debug token could be (re)moved outside of QtCreator.
The current patch:
- Checks the debug token path in the device wizard configuration
before uploading into device.
- Adds a new ReturnStatus if the file does not exist (for further use).

Task-number: QTCREATORBUG-9103

Change-Id: I5f48014072e4e807cd637a91f76e80c74195fee6
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2013-06-26 15:25:03 +02:00
Robert Loehning
f40c50c61b Tests: Fix typo
Change-Id: If7c06cc94e3f57fbe338e3548442e1da1861c287
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-26 15:08:24 +02:00
Eike Ziller
cabef7580e Fix possible crash when looking for version control for directory
Task-number: QTCREATORBUG-9656

Change-Id: If8babdb942830bd11fe360a311c57b75312248be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2013-06-26 14:17:27 +02:00
Orgad Shaneh
52eb3c4326 CrashHandler: Allow ptrace on current process
Required when ptrace_scope is set to 1 (default on recent debian and
ubuntu)

Change-Id: I47c4da5b5f01ae41b5a2b01cc3d35e4615d78288
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-26 13:53:22 +02:00
Thomas Hartmann
f14892d13a Wizards: remove escaped HMTL
Linguist seems to escape the escaped HTML twice.
This breaks  translations.

Task-number: QTCREATORBUG-8923
Change-Id: I820b89d7c8e140115dc8b2cf8ef28db49cfb7102
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-26 13:49:41 +02:00
Eike Ziller
965966fb47 Version bump
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
2013-06-26 13:39:40 +02:00
Daniel Teske
4174246b69 Android: Set ANDROID_HOME environment variable
Task-number: QTCREATORBUG-9424

Change-Id: Iba4a9663a8fa39160f1953366ae4aa64d5f586ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-06-26 13:38:45 +02:00
Orgad Shaneh
970f6a8035 CrashHandler: Use exec variants that search in path
Executable can be non-absolute

Change-Id: Ibb0a4385ef0d763fe2aae2c8ac0b205328a64870
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-26 12:15:07 +02:00
Kai Koehne
c219a5b514 QmlProfiler: Avoid idle engine cancelling other engine's process
Task-number: QTCREATORBUG-9643

Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-26 11:52:53 +02:00
Guido Seifert
1c6cb92958 Add commandline parameter -pluginpath to add plugin search path
One or more commandline parameters -pluginpath allows to add custom search paths
for plugins to PluginManager::pluginPaths

Change-Id: I6d2702f1713b99000679ae577ce0978b3de51354
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-26 11:29:01 +02:00
Nikolai Kosjar
b0d9dd0b47 CppEditor: Fix "Rename Symbol Under Cursor" in new split
The slot CPPEditorWidget::onContentsChanged() was still connected to the
initial QTextDocument of BaseTextEditorWidgetPrivate and not to the via
BaseTextEditorWidget::duplicateFrom() updated QTextDocument.

This fixes the visual appearance when renaming. The actual renaming
is/was not affected.

Task-number: QTCREATORBUG-9651
Change-Id: Id26dc11627c253bbf89904be3f3df21a45041d01
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-26 11:27:13 +02:00
Orgad Shaneh
a0ee1300c3 Git: List conflicted files on stash pop conflict
Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-26 10:26:18 +02:00
Eike Ziller
0855d4acfa Workaround QCompleter issue with closing its popup on escape
QCompleter doesn't close its popup if there's a application wide
'escape' shortcut.
This commit adds the necessary shortcut overrides for CompletingTextEdit
and FancyLineEdit, which fixes the issue at least for find tool bar,
advanced search, gerrit dialog and description field of submit editor.

Task-number: QTCREATORBUG-9453
Change-Id: Ib1df218ab6b9a54fbf19d6132c6edd8e83ace46c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-26 09:31:30 +02:00
Thomas Hartmann
1fd1bf981e QmlDesigner.PropertyEditor: use proper transforms for anchors
Change-Id: I71866481b6d7e9ae42d5f9c90e6006fde5767511
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-25 19:59:43 +02:00
Marco Bubke
26b51c7a95 Revert "QmlDesigner.NodeInstanceView: introducing delay in setPathToQt()"
This reverts commit 94011a12f1. It was a
hot fix which is not needed anymore.

Change-Id: I64ad1d6be54982ddd9b0ef790508a15bd0f73f72
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-25 19:59:26 +02:00
Christian Kandeler
54ed620f35 Refactor qbs project files.
- Use sub-projects.
- Move the main application and the application header products
  into dedicated files.
As a result, qtcreator.qbs becomes much simpler to understand,
consisting now of just a bunch of global properties and a few sub-project
references.

Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-25 17:05:42 +02:00
Nikolai Kosjar
195d3c6f9e CppTools: "Switch Header/Source" checks also other projects
...and not only the current one as fallback.

E.g. if the projects qtcreator and qtbase are open and you navigate into
qdir.h of your include path from the qtcreator project and trigger
"Switch Header/Source", then "qdir.cpp" will be found in the qtbase
source dir.

Task-number: QTCREATORBUG-3789
Change-Id: Ibd73c37bb626f8f7ee80cd8be3ef1244883ccf5e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-25 16:21:03 +02:00
hjk
012924ec46 Debugger: Fix behavior on pressing 'Stop' for LLDB
Task-number: QTCREATORBUG-9634
Change-Id: Iaa8eaf53169d7105e5f0657a06f5c9a780ba996d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-25 15:41:57 +02:00
David Schulz
a80bb5932a Debugger: Set cdb extension version to 2.8
Change-Id: Idd62703c1c521cd2546beb11ae070c2a6de09066
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-25 15:39:32 +02:00
El Mehdi Fekari
e02788b8ce Qnx: add a dependency to the debugger plugin
This is already done in Master and 2.8 branches.

Task-number: QTCREATORBUG-9455

Change-Id: I8ae9e5a14ba561640d3389e08cb74a5ec856d335
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 15:12:56 +02:00
El Mehdi Fekari
ded99d1e09 Qnx: Fix tag for splashscreens
Task-number: QTCREATORBUG-9626
Task-number: QTCREATORBUG-9083

Cherry-picked: 4ff03aa71a

Change-Id: I69915d9da91cde39b1bc32f150c30a5e97cba157
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 15:07:05 +02:00
Eike Ziller
84b8c1f721 Adapt the escape key logic for external windows.
Change-Id: I294ba18e8ca91060e5d0ef8f81885642e045a975
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-25 14:58:37 +02:00
hjk
78dc4ee112 Debugger: Add view menu to toolbar
Change-Id: I8783ce66d28626e9a484d6aa729fccd07bbda0b8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 14:53:34 +02:00