Commit Graph

32877 Commits

Author SHA1 Message Date
David Schulz
f4983975cc cdbExt: Fix dump of QFile.
Change-Id: If5d31efba42592bf518be45a3c8c368ebfc00f05
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-18 14:55:04 +01:00
David Kaspar
efa1d47650 Qnx: Updating BlackBerry 10 documentation
The following pages has been updated:
qnx/creator-deployment-bb10.qdoc
qnx/creator-developing-bb10.qdoc
qnx/creator-key-management-qnx.qdocinc
qnx/creator-projects-running-qnx.qdocinc

Change-Id: I925d14e849bd46e92590c12f8f82071427d42dfc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-11-18 14:02:49 +01:00
Nikolai Kosjar
c1225ea3f4 CppTools: Use editor manager's codec as fallback
...for reading not already opened files.

This partly reverts commit f7c68f6. In case TextFileFormat::detect()
fails, the user configurable editor manager's codec is used instead of
QTextCodec::codecForLocale().

Adds also a qWarning() to easier detect encoding errors.

Task-number: QTCREATORBUG-10378

Change-Id: I0fa4e6b898ed090d85414ce2a001f11b115a42d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-11-18 13:03:08 +01:00
Marco Bubke
2f040fc6ad QmlDesigner: Change version number of the puppet to 2
Change-Id: I0aafaf76a6d4d6edfd4c3ccc73b702edbbfaa385
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-18 12:42:04 +01:00
Marco Bubke
765242637a QmlDesigner: Fix composite hack in the ObjectNodeInstance
There was no check for the else branch that the type pointer is null.

Change-Id: I0c40eb86f324033dc7878465bd5f603d9b96df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-18 12:41:43 +01:00
Tobias Hunger
ef584f176c CPlusPlus: Use correct placeholders in printf
Change-Id: I42a41608c2f025a196e539b58c1992049f7eca35
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-18 12:24:37 +01:00
Tobias Hunger
399a44b8f7 ManhattanStyle: Remove one line of useless code
Change-Id: I5adc362e486eb16f18aed7a496d2012fbc219bb8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-18 11:47:57 +01:00
Tobias Hunger
b1ecbaa31d ShortCutSettings: Remove a couple of letters of useless code
Change-Id: I99f1ef932c23162d40b57cfa9d7db8f91bf0fa60
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-18 11:47:21 +01:00
Tobias Hunger
04cc2029af StyleAnimator: Make sure we have a sensible duration
Change-Id: I75c5cb59e0f273e1646c835d60d470dc27e492c1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-18 11:46:30 +01:00
Eike Ziller
b4b065d8ec Fix painting of search results
Painting the highlighting was wrong, and it was worst for selected rows.
The QItemDelegate::drawDisplay implementation also paints the
highlighted background at the wrong position wrt to the text
(PM_FocusFrameHMargin), so we now do all the highlights ourselves.

Task-number: QTCREATORBUG-9838
Change-Id: Iad68f114a984680e41aeb78d7c61a16651653213
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-11-18 11:38:07 +01:00
Aurindam Jana
9d38b866f9 QmlProfiler: Remove ScrollableQuickView
As the timeline can scroll by itself now we don't need an external
scrolling helper anymore.

Change-Id: I831eaf2302ced7649b4746e5c7d10121d83a4794
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-11-18 11:35:37 +01:00
Orgad Shaneh
a3535e667e MsvcParser: Correctly parse ambiguous symbol error
Change-Id: I27a4e2e43209887b26c42163dd3234672c42967e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-18 10:11:28 +01:00
Orgad Shaneh
920fa79667 Git: Really add new/existing files
Task-number: QTCREATORBUG-10117

Change-Id: Ic254cb2f7860ca0973cfda58cf66f62b1b8eaeb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-18 10:11:14 +01:00
Tobias Hunger
825244224e Project: Do not lose project file path information
... when opening a project that is no longer found on disk.

Task-number: QTCREATORBUG-10703
Change-Id: I5163c85469d354d2cf48959dcae6303c69392b8f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-18 10:08:10 +01:00
Tobias Hunger
ba54384aaa Qbs: Show products in simplified project tree
So far the simplified project tree was a flat list of files for qbs
projects. With this change it is a flat list of Products, each
containing a flat list of all files referrenced.

Change-Id: If53e80ca69f595df245a20af9f9ced1121cf30af
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-18 10:06:42 +01:00
Leena Miettinen
1d4fb08daf Doc: fix path to General Build & Run options
Update screen shot.

Change-Id: Icf09fd196f86f1ba9be13817528ac509c34d8655
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-18 09:17:01 +01:00
Kai Koehne
5c3a507668 Fix doc about ProgressManager
Change-Id: I49b0a7d83d0be4586c5e11a482b109461f1a05d6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-18 08:39:53 +01:00
Tobias Nätterlund
229ca0981a QNX: Fix continuing the BlackBerry environment setup wizard
This fixes an issue that wouldn't let you continue in the
BlackBerry environment setup wizard after installing an NDK.

Task-number: QTCREATORBUG-10675
Change-Id: Id36f9ea95793f04d21304d92b2a2d0de675546f1
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-11-18 07:31:13 +01:00
hjk
fefbc172f2 Debugger: Use thread id, not model row to remember current thread
Task-number: QTCREATORBUG-9207
Change-Id: Ic98fb9a99c250dccf2735f28d0d3fefa7d1da52f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-17 22:55:22 +01:00
hjk
7f6c793f75 Debugger: Fix passing of maximum string length
Change-Id: I96498b93bb1632de8ca960ae24ec54e31f8c0897
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-17 18:28:51 +01:00
Oswald Buddenhagen
e64cc71194 set QMAKE_INTERNAL_INCLUDED_FILES even without PROEVALUATOR_FULL
some qt prfs use this variable, so better set it it to avoid some noise.

Change-Id: I606c88dd7664b1cd8b490d60badd5c6bf80fd1c9
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-15 19:23:45 +01:00
Oswald Buddenhagen
f30f44062b support a cache that is really just a cache
unlike .qmake.cache & co., the presence of this file has no magic
effects on where mkspecs, modules and other things are searched.

as the obvious name "cache" is of course already taken, we call it
"stash".

the file is searched up to the super cache (if present), otherwise up to
the normal cache/conf (if present), otherwise up to the root.
if it's not found, it is created next to the super cache (if present),
otherwise next to the cache/conf (if present), otherwise in the current
output directory.

note that the cache really should be created and populated by the
top-level project if there are subprojects: otherwise, if there is an
"anchor" (super/cache/conf), subprojects would race for updating the
cache and make a mess. without an "anchor", each subproject would just
create its own cache, kind of defeating its purpose. this is no
different from the existing "cache", but it's worth mentioning that
removing the "anchoring" function does not remove the "nesting order"
constraint.

Task-number: QTBUG-31340
Change-Id: I786d40cef40d14582a0dd4a9407863001bec4c98
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/ff31d87cc883dcf17ab459a15eac04e074d9614a)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-15 19:23:25 +01:00
Oswald Buddenhagen
871c714903 clean superfile and cachefile paths upon creation
otherwise, if the output dir is the root, the path would be denormalized.

the code for finding existing files already does that.

Change-Id: I56d70477e9c9ffcd936325068624a84df10ffd87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/72075656cfeac570ce002c517a22b1c5d7bc0dd0)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-15 19:23:13 +01:00
Oswald Buddenhagen
c3b083b521 move setting of _QMAKE_{SUPER,CONF,CACHE}_ to a more logical location
there is no point in setting the variables already when peeking into
the caches, as that is done in a separate evaluator anyway.
it also makes no sense to have them set while loading the spec itself,
as it's not permitted to do anything with the caches.
so set them at the next convenient point, which is right before actually
loading the caches.

Change-Id: I3717ddf94353dc04e12c52e542f16ed27b578e14
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0f68222e9ebdf42778d4bb84260268764eb55b30)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-15 19:23:02 +01:00
Daniel Teske
fe0e3701b7 Android: getAbis prevent endless loop
We need to check all ro.product.cpu.abi# properties,
but there's a limited amount of those. So only check up to 5 to ensure
that the loop always terminates. On irc a user reported that on his
device adb shell getprop returns  "/bin/sh: getprop: not found", so
this loop was never terminated.

Change-Id: I819b28cdbedb0bf557ba58e8495a8da5eeb8dc8d
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2013-11-15 17:56:43 +01:00
Daniel Teske
095d911452 Android: Skip boot to qt devices
Change-Id: Ibce483484975e2817ad28ce00ea1f2d9ae06a497
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2013-11-15 17:56:32 +01:00
Daniel Teske
899dac18f7 Android: Don't search for ant.bat on linux
Change-Id: Ia149f8eed040d5fe370286025cf76f7a6e7f47db
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-11-15 17:44:10 +01:00
Tobias Hunger
127c99ff01 Qbs: Finish qbs evaluation future watcher
Looks like you need to do that after canceling it... This stops
"Evaluation" progress bars from sticking around.

Change-Id: Ie0a9f88ba96cba261939c210fddb11bc43779416
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-15 17:33:09 +01:00
Leena Miettinen
67f59d4b20 Doc: sync Android requirements with the Qt docs
It would be better to have this information only in one
place, but as we have it in several places, it should at
least be the same information everywhere.

Change-Id: Ib599a25156780f8f897ad87d0dce9c968a32098b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-11-15 16:31:16 +01:00
El Mehdi Fekari
134e4deedf Qnx: Disable remove button for pre-10.2 NDKs
Change-Id: Icfbe5d46d0f6e29cfe68be57872fba9c15b5419d
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-11-15 15:36:07 +01:00
El Mehdi Fekari
4444a7889c Qnx: Fix the QnxUtils::qdeInstallProces() implementation
Change-Id: I08805d2901b4e7577497594ea0aaf5c45bec4a5f
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-11-15 15:35:46 +01:00
Thomas Hartmann
5b693cdac0 QmlDesigner.ItemLibrary: Allow bindings without extra source file
This makes drag and drop faster than merging code.

Task-number: QTCREATORBUG-9361
Change-Id: If9779d7439ea41edfb80c08161b7ef3d0f08cf41
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-15 15:13:57 +01:00
Thomas Hartmann
ed03740435 QmlDesigner.PropertyEditor: Adding missing control for TransformOrigin
Now the TransformOrigin can be edited again.

Change-Id: Ie89c7aed2f092f303286091cc44655ff70dae777
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-11-15 15:12:52 +01:00
Leena Miettinen
a89a32c2b2 Doc: Settings for binding pointers and references
Update screen shots.

Change-Id: I0205792498150b2aabd11e12ee65e03fff3bf577
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-15 14:59:43 +01:00
Eskil Abrahamsen Blomfeldt
e4ebad5eaf Don't overwrite deployment options for non-iOS unix-platforms
A missing else was causing the else:unix-branch of the ios condition
to always execute for unix platforms, overwriting any of the
settings from before. Result was e.g. that Android builds would
not properly install their assets.

Change-Id: Icf8d2e77ff7eaea478cc2f945d3aee7929cc4078
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-15 14:59:41 +01:00
Orgad Shaneh
c1bb68fe68 isVirtualFunction: Fix false positive for constructor
When class has a virtual destructor

Change-Id: Ifcc9a05ee1eb1144ed7e035b9f077846fcb96cf3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-15 14:53:21 +01:00
Ulf Hermann
1fd14c4c99 Disable the Javascript profiler while there is no data available.
With V4 the Javascript profiler is unusable. In order not to suggest to
the user that it is actually usable, we disable it if it doesn't show
any data. However, when profiling applications that don't use V4, yet,
the JS profiler actually works and has to be enabled.

Change-Id: Iecb97c0940addd157c5ebe229edb614448cc0554
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-15 14:44:12 +01:00
Tobias Hunger
4196e9c2e9 Qbs: Fix subproject nodes not getting the right path
Change-Id: I31db9d3f969d8e634cb5c84b1f3563c09e13cfd7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-11-15 14:35:07 +01:00
Leena Miettinen
868f32dd83 Doc: remove excessive links to the same page
The Glossary was linked to three times from the
Building and Running topic.

Change-Id: I01f934abc3a51bfd32a1233e19da3073abe56e8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-11-15 14:17:35 +01:00
hjk
5ab28b2429 Debugger: Add a simple dumper for Debugger::Internal::ThreadId
Change-Id: I09c83b1746462b688d9c8328987ee23c0a09be7e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-15 14:10:36 +01:00
Leena Miettinen
863bd18d24 Doc: Remove all references to Qt Simulator
Simulator Qt is not distributed any more and plugins for
the platforms that used it are no longer delivered with
Qt Creator. If someone is still using Qt Simulator, they
will have the documentation delivered with it.

Change-Id: Ifc0cc7fa875e29b0cdff89772cf0f41d52a05f35
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-15 13:49:22 +01:00
David Schulz
844e26390a Debugger: Fix find nmake in dumper test.
Change-Id: Ie4a53b05bf4e32a80cc7636f9ac16b094f6dc359
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-11-15 13:46:30 +01:00
Orgad Shaneh
4f0ae3b572 CppEditor: Optimize non-overriding virtual functions lookup
Instead of building the hierarchy from the most basic class that
implements the virtual function, start from the looked up class.

Change-Id: Ia674fbb4a92dd45d4ca7bc621c54b411264cbe3d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-15 13:42:31 +01:00
Thomas BOUTROUE
85e6f8a1c8 Fix 'dsFunction' (Kate syntax file) not colored in TextEditor
- Added the right TextFormat for dsFunction
- Added TODO comments for missing dsError and dsAlert

Task-number: QTCREATORBUG-10788
Change-Id: I31862971ac5b47f13036aa9c55552778ad88d4ee
Reviewed-by: Thomas Boutroue <thebootroo@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-11-15 13:41:38 +01:00
Tobias Nätterlund
49eb734973 QNX: Fix QML debugging on remote QNX devices
Change-Id: I7e5be01328ab32db9218fbdefaede7044131d2b9
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-15 12:51:17 +01:00
Eike Ziller
56fc59ab5f Editor views: fix issue with unsplittable editors
Task-number: QTCREATORBUG-9843

Change-Id: If25196f727f5cc573560fa69f69c645eba00b0d0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-15 12:26:29 +01:00
Eike Ziller
0d724e40a0 LLDB: application always got at least one argument passed
Even if it was an empty argument.

Change-Id: I610c4cea82bdbc557e63acd1663040ca70a5d3ee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-15 11:39:49 +01:00
David Schulz
4024b7c187 Debugger: Fix QFile dump test for Windows.
Change-Id: I9daf0e057a3f5a274ae6b44c0c46ac7b1e036fe6
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-15 11:09:33 +01:00
David Schulz
c09616aa18 Debugger: Print invalid when QByteArray can not be converted...
...to a numeric value for encoded debugger values.

Change-Id: I9969ea01f50738210963fa08dc871edc90c1bae2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-11-15 11:09:06 +01:00
Przemyslaw Gorszkowski
6eed8e385f CppEditor: tests for "Include Hierarchy"
Very simple tests for include hierarchy model:
* test if checked file includes one file
* test if checked file is included by one file
* test if checked file includes one file and is included by one file

Change-Id: I3688f9ddb86a569f780fc156bdfcf6b81a9fb0c1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-11-15 10:51:01 +01:00