Commit Graph

31174 Commits

Author SHA1 Message Date
Fawzi Mohamed
bd5583eb9d process_stub_unix: fix race condition with reading of env file
The stub incorrectly send its pid before reading the environment file,
and qtcreator does interpret that as sign that it can delete the
environment file.

Task-number: QTCREATORBUG-9024
Change-Id: Id44777abdfdd94aa10815cb00ca27846b95a3ec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-25 13:48:06 +02:00
Eike Ziller
14cca9e94e Workaround for Clang generating wrong debug info
Clang obviously takes PWD as a basis for source paths in debug
information (AT_comp_dir) if it is set. Since the build tools are not
executed in a shell that would set PWD to a sensible value, debug
information with Clang is broken if the build environment got a wrong
PWD to start with, for example by starting Qt Creator from a shell
(which sets PWD).

Workaround is to explicitly unset PWD for the build environment used for
the Clang tool chain.

Task-number: QTCREATORBUG-8825

Change-Id: Ia3e47693121edd61b0ea43bddbb1fcaaac9eb390
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-25 13:41:36 +02:00
Eike Ziller
a88599aee2 Fix escape key for "About Qt Creator"
Change-Id: I15c49541a6914c8db58784935de43f0b046895b0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-25 13:40:38 +02:00
El Mehdi Fekari
4ff03aa71a Qnx: Fix tag for splashscreens
Task-number: QTCREATORBUG-9626

Change-Id: I4150e5e7898c6b4b527feaf3476627c4b05d42b6
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-06-25 13:40:26 +02:00
Kai Koehne
696e12c8b1 QmlProfiler: do not show richtext in event details
Change-Id: I1daa2573e6c0ca26d6082a52473372432054a628
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-06-25 12:00:02 +02:00
Nikolai Kosjar
a3cb35edbe C++: Handle recursive using/typedef declarations
Remember using/typedef declarations we have already looked up and
stop if we try it again.

Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit 50a900e509)
2013-06-25 11:04:21 +02:00
Nikolai Kosjar
8aa8f22536 C++: Handle recursive auto declarations
Remember auto declarations we have already looked up and stop if we try
it again.

Task-number: QTCREATORBUG-9503

Change-Id: I989b11609c98bf197ce916d79c9d452294355053
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit 8f1b665667)
2013-06-25 11:04:17 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Eike Ziller
4680099aa1 Fix searching for repeated characters in files.
Searching for aaaa in aaaaaaaa would give 5 results instead of 2 in case
of non-regexp search.

Task-number: QTCREATORBUG-7883
Change-Id: I5936090b3eef5e68405201fe63d02bf0dd2469d5
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-25 10:03:42 +02:00
Nikolai Kosjar
021dbc2e96 CppEditor: Respect whitespace in operator names for more quick fixes
* Affected quick fixes: InsertDefFromDecl, MoveFuncDefOutside
* Fix also reformating pointer declaration of operator functions for
  qualified name ids

Change-Id: I6a7578f496221557d103f5fdbb5dacc9540ee779
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-25 09:57:23 +02:00
Eike Ziller
c59ba462ad Merge remote-tracking branch 'origin/2.7' into 2.8 2013-06-25 09:52:11 +02:00
Jerome Pasion
72b06779ab Doc: Get Creator and Extending manuals to use new qdocconf variables.
-navigation variables for Qt 5.2's navigation bar
-buildversion is for including specific build information such
 as branch name and patch version

Change-Id: I4d36f1ea73b8c37ab787d154c9fdd91650305bc5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-25 09:49:43 +02:00
El Mehdi Fekari
728fe7d7c0 Qnx: Add support for internal 10.2 NDKs
Some changes in the new NDK 10.2 break the setup of BlackBerry 10.
Main changes that the current patch covers:
* Qnx environment variables are evaluated when sourcing the bbndk-env script
and are no longer hard coded when istalling the NDK
* The version number is appended to the bbndk-env file name.

More eventual changes may come and we may need to directly
parse the ndk xml descriptor file.

Task-number: QTCREATORBUG-9403
Change-Id: Ie7daf7b0eaf2a49339775cacb9973062d6101afa
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-06-24 23:03:15 +02:00
El Mehdi Fekari
6b2162f2a9 Qnx: Move the dataDirPath() method to QnxUtils class
Change-Id: I6bc02a83263da4ce01fe3238aefee20a68507595
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-06-24 23:03:01 +02:00
hjk
ab94f6ebc5 Debugger: Make strip_typedefs robust for older LLDB
Change-Id: I9adac11f8997fcb0594d0a67419d4733dd4ed86b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-24 16:54:08 +02:00
El Mehdi Fekari
4d026f9b53 Qnx: update the runconfiguration display name
The "on BlackBerry Device" sequence makes little sense
and could be removed to be more consistent with the rest of
QTC run config widgets.

Task-number: QTCREATORBUG-9550

Change-Id: I024929a13352040f032cd51382ff57bb9bed59ff
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-06-24 16:18:07 +02:00
hjk
ee77d21b00 Debugger: Make use of {S,G}etCondition optional with LLDB
Some older versions don't have it.

Change-Id: Ie6e73e0bd13e7aa5a1cae8f6d1647d4695a315a8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-24 15:05:08 +02:00
Jerome Pasion
ee9c8dafc3 Doc: WS fix in qdocconf file.
Change-Id: I57767dbf8c5af8f2961136cb9a7ca16dab6fcf5b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-24 14:20:09 +02:00
hjk
749eec1996 Debugger: Don't kill lldb process if we get only a warning
Change-Id: I2dab93625e534dbbe9dcb8072fa058a35a9dec84
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-24 13:36:47 +02:00
Oswald Buddenhagen
958672e460 find qmakespecs in source directory of shadow built qt
qt 5.2 does not copy the qmakespecs to the build directory any more.
a fallback to the /get property variant ensures that other build types
continue to work. consequently, this has no effect whatsoever on
installed qt versions.

(based on qtbase/214b55d5d4c8fdf975b3c36f69bac4b07d8d39d0)

Task-number: QTCREATORBUG-9572
Change-Id: I9edac11f8997fcb0594d0a67419d4733dd4ed86b
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:13:30 +02:00
Nikolai Kosjar
dc5a0e3e5a Project managers: Force "Parsing" notification
...so parsing progress will also be reported for projects consisting of
only one source file.

Task-number: QTCREATORBUG-9597

Change-Id: If35a00b6f949258d64921f144919269fa0c81d36
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:11:16 +02:00
Nikolai Kosjar
26fbefb26c CppTools: Allow to force a "Parsing" notification
Task-number: QTCREATORBUG-9597

Change-Id: I726a818c7d4af35dcb4863f74b08cd639a189bdd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:10:51 +02:00
Oswald Buddenhagen
174874f526 introduce /src qmake property variants
this is for shadow builds during build time, where the respective files
are expected in the source dir.

Change-Id: I18dcfbdef99e1562a51dacac333642cae8105ebd
(cherry picked from qtbase/4531c83376c1a3546305a9fa5203e0a885e8860d)
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:09:18 +02:00
Oswald Buddenhagen
890c10b60f remove pointless string conversion
Change-Id: I1640083007ed0c428dfb8ab5ce8b68a7d7e2a749
(cherry picked from qtbase/d1b1b31c9237e0bd11c61fc54ad45551b7d862da)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:08:49 +02:00
Oswald Buddenhagen
880c699c12 make .qmake.{super,cache,conf} find "anchored" features
these files function as "anchors" for mkspecs/ and features/ directories
used by projects which load these files. ironically, these files didn't
see these feature files themselves.

Change-Id: I590855eb4a9d2c72b9abfcaa431d2f85a719c6e2
(cherry picked from qtbase/7456dfb4552c4e4f900af9fa8923828a23737280)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:08:41 +02:00
Oswald Buddenhagen
80b672defd find features/ under mkspecs/ of source & build root
we were finding features/ directly in the source & build root, and we
were finding features/ under mkspecs/ from $QMAKEPATH and other mkspecs
locations, but we omitted the "transitive hull". this was
counterintuitive.

Change-Id: I9823e6606467c98f264c81385250da92311f51ca
(cherry picked from qtbase/0bf65180b8710e4516496d0bc53a265ff0dd6a01)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 13:08:15 +02:00
Oswald Buddenhagen
83818a9dae make Makefiles not depend on .qmake.super
sync with qmake. this is a no-op in qtc.

Change-Id: Id5158d7e272fdee4f4a041fb7c828295a0a86684
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/d135a311a34e693d761a3607663b0879be9bbf65)
2013-06-24 13:08:01 +02:00
Robert Loehning
d29960ce20 Squish: Added note about HTTPS
Change-Id: I316a83ac9169b9d0e43df066936503291cb64fba
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-24 12:57:47 +02:00
Robert Loehning
c0272c7919 Squish: Updated used MSVC Qt versions
Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-24 12:57:30 +02:00
Nikolai Kosjar
6df66e883f CppTools: Do not hand over partly reloaded files to the code model
When a reloading operation was in progress, CppEditorSupport::contents()
could return a partly reloaded file to the code model leading to parse
errors and incomplete highlighting.

Fixed by checking if the file is currently being reloaded.

Task-number: QTCREATORBUG-9382

Change-Id: Iee97e10444763c0cbf481132afa4617c5cdbd15c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-24 11:13:35 +02:00
Nikolai Kosjar
10ff6769ac Core: Let IDocument also report failed file reload operations
Change-Id: I8fa02f2398f59306c49481316fdedf50a1c4e32f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-24 11:13:29 +02:00
Leena Miettinen
a043977999 Doc: reflect changes in Generic Highlighting options
A redundant check box has been removed.

Change-Id: I7d0da4df7baced67ed937183739e242cb82ee891
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-24 11:11:16 +02:00
Lorenz Haas
b7ba23f92d CppEditor: Fix InsertDefFromDecl::match
Now InsertDefFromDecl finds the right implementation file and the speed
of match() is improved.

Task-number: QTCREATORBUG-9627

Change-Id: Ibff824f52124e8cc10ccb6a97c133e11565473db
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-24 10:16:15 +02:00
Robert Loehning
89225167fb Squish: Removing now unused constant defaultQtVersion
Its use was being removed in 6078d7e028

Change-Id: Ib27d7e9a7596fc6358edc1e4a09962951d105752
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-21 18:01:25 +02:00
Tobias Hunger
161b818b23 Qbs: Fix crashes when switching QbsRunConfigurations
Do not use pointers to qbs::(Group|Product|Project)Data. Those are
implicitly shared classes, and now have a isValid method so that
default constructed instances can be spotted.

Change-Id: Icd49fa517f2e17bc60cc82d103f479d3a2e7097a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-21 17:54:37 +02:00
Tobias Hunger
28be3fb83b Qt4PM: Fix warning
Change-Id: I65b3e950a78821c8395e13c459e1e4ad3d348b18
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-21 17:49:16 +02:00
hjk
e6f407be89 Debugger: Display QImage size without debug info
Change-Id: I1f7b57385c77c4cd6bae9cf033bec91eeb984ac6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-21 17:49:08 +02:00
Tobias Hunger
f332d00700 Qbs: Fix pseudo command string for qbs build step
Change-Id: I69a4550b347d24825d19ce9d37cd68de01604c72
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-21 17:48:19 +02:00
Leena Miettinen
10c47e9f58 Doc: update screenshot of FakeVim options dialog
Change-Id: I04c03df79f695198ed645224a802d22d84fc9ad5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-21 16:55:55 +02:00
Friedemann Kleint
1477729aa0 Fix broken list requests in CodePaster.
Pastebin.com-support: Remove header from list data.
KDE Paste: Add trailing slash to prevent redirection.

Task-number: QTCREATORBUG-9547
Change-Id: If47c4bc64767efb6f1a17db22ff9e0dbee3841bc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-21 16:51:51 +02:00
Leena Miettinen
f28039fca1 Doc: Open Documents option in the Advanced Search pane
Change-Id: Ibede904f49905d0840051783f233ef290436cf14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-21 16:43:02 +02:00
Leena Miettinen
5956ffd410 Doc: the macro recorder does not support code completion
Change-Id: Ibf3225f32c2a89f7028554060f73fd89bce86fb4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-21 16:42:52 +02:00
hjk
178cbf5adc Debugger: Add createReferenceValue also to gbridge.py
Change-Id: I540616df3d4ca689495851783d1d111e14c28a3b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-21 16:38:39 +02:00
hjk
fe2b79157c Debugger: Make QDateTime dumper work in release builds
Change-Id: I5f7b57385c77c4cd6bae9cf033bec91eeb984ac6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-21 16:34:29 +02:00
Eike Ziller
553e33979a Fix external file change notification in case of multiple windows.
The notification was only done when the main window was activated which
leads to funny results with external editor windows.

Change-Id: I657ef7e429256f9c098b1fc744d40ffbc2bb5260
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-21 16:22:37 +02:00
hjk
82133aa5f1 Debugger: Mork workarounds for LLDB enum lookup issue
Change-Id: I236e2d5195ea0f9813fe7ebaa7dc2434579abbe5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-21 16:15:29 +02:00
Thomas Hartmann
0b3bdf675f QmlDesigner.Rewriter: Disable unreliable warning
Signed-off-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I8df152acc647f1770737bfa47969d27bb43197f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-21 15:54:24 +02:00
Daniel Teske
2fdb70bdce Qt4Project: On folder change just schedule a async parse
On a folder change we need to collect all files which we add to the project
tree due to INSTALL or DEPLOYMENT rules. On a folder change the old
implementation only collected the files in the changed folder, but also
started a updateCodeModels(). If multiple Qt4PriFileNodes would react to
the folderChanged() signal, then a lot of updateCodeModels() would be
started.

This new code does a unnecessary complete iteration of the files starting
from the top level INSTALLS or DEPLOYMENT folders, but optimizes the
updateCodeModels() by going through the more advanced scheduling the
qt4project does for evaluation.

Task-number: QTCREATORBUG-9581
Change-Id: I50345516c56bd33e6e1e1b2e0d7db50635ea1552
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-21 15:49:48 +02:00
Leena Miettinen
d5a975cec8 Doc: fetching code snippets from URL
Change-Id: I8fcf0909dd97dd067fbb25f395ca766cb1bd1b10
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-21 15:27:37 +02:00
hjk
405fef48e0 Debugger: Safeguard against wrong child count
Empty base classes do not seem to show up as children
but are recorded in GetNumberOfChildren

Change-Id: I175b8b0f9a2c761850d34e1ab26ff343be7a16c7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-21 15:19:54 +02:00