Commit Graph

32962 Commits

Author SHA1 Message Date
Friedemann Kleint
1adb88d2bd Introduce environment variable pointing to shared location of .user files.
Query variable QTC_USER_FILE_PATH for the path and store .user files
there under a tree replicating the project path excluding root.

Use cases:
- Developers working with nightly, clean builds of Qt / Qt Creator.
- Keep the  .user files out of the example directory when creating
  examples for bug reports.

Change-Id: Ib80c5fab3cc943317ec080eba8a6b92c16fc1aed
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-28 10:25:00 +01:00
Daniel Teske
b871b901ba ProjectExplorer: Fix crash on deleting kit from new dialog
Task-number: QTCREATORBUG-13499
Change-Id: Ibcd591620469abf56270cc512de1583900ce78e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-27 18:43:29 +01:00
Thomas Hartmann
da3b7a6c4a Theming: Fix styling of TargetSettingsWidget
If using the flat style also the TargetSettingsWidget should be flat.

Change-Id: I16147c9868e3e949a4d9aa0fedf85358504bde9e
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-27 17:19:23 +01:00
Ulf Hermann
e0d06f8681 QmlProfiler: Make TimelineModel usable from QML
Make the relevant member functions Q_INVOKABLE and properly notify
about the height change when data is loaded or cleared.

Change-Id: I7c1ee70942617af2045b84a2d8f0ab2adef72f52
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:34 +01:00
Ulf Hermann
0464c87773 QmlProfiler: Don't change row count if a model is hidden or empty
This reduces the complexity involved in making the row count a
property. Empty models do have rows like this, but don't have a height.
It doesn't get much more consistent than that. Before empty models
didn't have rows but you could still query the row heights. Having
height == 0 is very helpful for assembling the UI, rows == 0 not so
much.

Change-Id: I38ee9f46751a4beb288578d5cd1f0a17ea08814a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:27 +01:00
Ulf Hermann
7f7ebadae1 QmlProfiler: Move timeline prev/next functions to models
That's where they belong. Having them in the view makes no sense.

Change-Id: Ia2a6c8b02804ed8a1e10b0731cd62b6fd6489b0c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 16:09:19 +01:00
hjk
0dc99f568a Debugger: Handle remote setup failure in remote state transitions
Change-Id: I72886a309f1531c652186d529111d90ff3f98c37
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 15:27:01 +01:00
hjk
f2e7ec6e3f Debugger: Fix parsing of single-shot breakpoints from GDB response
This can be manually triggered by entering e.g 'tbreak file.cpp:1'
in the debugger input pane.

Change-Id: I8212e82d258bb488fc1848e7d7e3e9ff5a3cae88
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 15:14:10 +01:00
hjk
804497c32c Perforce: Limit log length even further
... and cut at the right end.

Change-Id: I89905baa86c89946d6d56aac82bca539bc705f55
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 15:14:02 +01:00
Nikolai Kosjar
c7c8f88303 Valgrind: Do not put html links in clipboard
...but plain, canonical and absolute paths if possible.

Change-Id: Ib559f00a55646929b2e548e7e671c1cb5e1d4a79
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 15:06:08 +01:00
hjk
c5d86757a1 Debugger: Fix engine state after "unreasonable jump requests"
After attempting to jump to an inaccessible location, the
engine was still expecting a ^running, while in fact GDB
was stopped. Add the right state transition.

Change-Id: I69aec785a1e9d2a23771f74ae35064ae61405fa5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-27 14:52:20 +01:00
Christian Stenger
28fb4cc015 Qnx: Fix plugin unit test
Change-Id: Ia5a16eba656190ee904f00290b23b5108e27d8b3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 13:58:27 +01:00
Christian Kandeler
8881910565 SSH: Delay channel close request to server in SessionRequested state.
If closeChannel() is called in between our channel open request to the
server and the corresponding reply, we cannot forward the close request
to the server, as we don't have its channel id yet. So wait until we do.

Our failure to correctly handle this sequence of events was the root cause
for the following user-visible errors:
    - A (since-removed) Q_ASSERT in ~SshRemoteProcess() was hit.
    - The server closed the connection because we referred to an invalid
      channel ("Received ieof for nonexistent channel -1").

Commits 26920307f0 and 3027bcc952 are also related to this issue.

Change-Id: I4994d85f5b21a72682f75389cdf8769738bd6768
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-27 13:50:17 +01:00
hjk
3431a24fee Ssh: Remove indirection in AbstractSshChannel::m_timeoutTimer
... and connect it using Qt5-style connects.

Change-Id: Ic7f36949b38d4773f5ac0f04853abf93bebcf467
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2014-11-27 12:44:29 +01:00
Nikolai Kosjar
0ef06c7523 Core: Normalize given filePath in DocumentModel
TextDocument::open() sets a clean absolute path for the document, but
DocumentModel::documentForFilePath() did not normalize before comparing.

This resulted in the creation of multiple TextDocuments and Widgets for
the same path. Was re-producible with:

  1. Open the locator
  2. Type "f a.cpp" and Enter
  3. Go to 1.

Point 2 lead to an EditorManager::openEditor() call with an unclean
path. The second iteration triggered an QTC_ASSERT in CppModelManager.

Regression introduced by:

    commit 292cf6c9e8
    Algorithms for DocumentModel

Change-Id: I82fbc39251e48c1c97d6933857de172818d73f13
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-27 11:55:03 +01:00
Nikolai Kosjar
5cc3378858 CppEditor: Fix crash in InsertQtPropertyMembers for invalid code
Change-Id: I8a3a3240033d23aa9e3df5276c4e6302d97f71b9
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2014-11-27 11:42:30 +01:00
Ulf Hermann
13c7d1c2ce QmlProfiler: Don't use the model factory if it doesn't exist
The model factory only exists if there is a plugin providing it. Also,
it's a good idea to initialize it.

Change-Id: I904bae1e733c37699a99e84e79c67ab4e8aea805
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-11-27 10:51:45 +01:00
Nikolai Kosjar
2d58001d86 Valgrind: Use "No" button in mode check dialog
...instead of "Cancel".

Change-Id: I4197e3e5d6df9996d4a68a7ad4acf7a11cf0d18e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-11-27 10:24:27 +01:00
Fawzi Mohamed
9b0bdf981f qmljs: fix library path for builtins
Change-Id: Ie43f7a3241ae8d253853a0b38781774a70cb6897
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-26 17:34:36 +01:00
Nikolai Kosjar
d927a80f2b TextEditor: Stop SnippetMode before invoking refactoring action
Task-number: QTCREATORBUG-13519
Change-Id: I206d83251c717dde419394658b5fdea8e5da48d3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-11-26 15:59:00 +01:00
Christian Stenger
1039cf4020 Qnx: Fix plugin unit test
Change-Id: Ia5a16eba656190ee904f00290b23b5108e27d8b3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-26 14:37:39 +01:00
Orgad Shaneh
7f34158041 Core: Cosmetics
* Remove redundant namespace qualifiers
* Qt5-ify some signal/slot connections
* Replace some using Core::Internal with explicit namespace scopes

Change-Id: Id1aae05e2c6fc2992c2716e1f8f9e985c6e56122
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-26 13:46:38 +01:00
Christian Stenger
a1f8bc4c5f ios: ensure that device and simulator scan with a developerPath
Change-Id: Ifcc8d8f5c389c963ee1b6c2d2d2437bd5429f843
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-26 13:36:59 +01:00
Christian Kandeler
6804c21179 QbsProjectManager: Make QbsManager instance available as a Singleton.
We now use it in contexts that do not have access to a Project.

Change-Id: I96ebad60f5fc354b004092748033d83c766a305d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-26 13:24:30 +01:00
Christian Kandeler
f19ec81a67 QbsProjectManager: Make Kit function argument const.
It's silly to force all callers in the chain to use a non-const pointer
for a Kit that is really const just because of the QList<T *> vs.
QList<const T *> problem. Instead, use a (safe) const_cast for the
list operations.

Change-Id: I929cb9e42957de48d7ad8e1e4b04a7739f9c22bf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-26 13:24:24 +01:00
Tobias Hunger
9e501ee8f1 Kits: Validate current displayname when changing it
We used to validate the displayname set before the last change,
which is not really useful:-)

Task-number: QTCREATORBUG-13424
Change-Id: Ia71f82d0ab0c8d6392be8dbd8fccad7fb9230b2d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-26 12:33:26 +01:00
Eike Ziller
938326ef2c Merge remote-tracking branch 'origin/3.3' 2014-11-26 11:11:46 +01:00
Orgad Shaneh
cc035a59b1 StyledBar: Explicitly set fixed height
Do not depend on ManhattanStyle for it.

Change-Id: I68504d23f566b594f79354149844fbbdf395ec73
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-26 11:02:50 +01:00
Christian Kandeler
26920307f0 SSH: Fix misleading error message.
- It is not an error if the server replies to one of our earlier
  requests while we are in closing state. This can happen if we
  close the channel shortly after sending the other request.
- Also change the message itself, which could be interpreted as
  "packet corrupt" when we actually meant "packet unexpected".

Change-Id: I735c67b2a9b41af0c5e0b8d229369d94ec37277c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-26 10:50:02 +01:00
Christian Stenger
050197edf3 Debugger: Use Qt5 style disconnect
Change-Id: I150df04e8b51880bb57cbc8a0a39461b0d8a54aa
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-11-26 10:08:24 +01:00
David Schulz
28907f76e4 Debugger: Fix Attach to Unstarted Application.
Use paths with native directory separator when comparing
application names. Also disable the "Continue on Attach"
combo box when a kit with a cdb is selected. The cdbengine
always continues after an attach.

Task-number: QTCREATORBUG-13517
Change-Id: I3dd9cca98f9b4255cafc318836377d802413eace
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-26 09:45:47 +01:00
Nikolai Kosjar
3f7db88ffd AnalyzerBase: Return base sizeHint() for invalid indices
DetailedErrorDelegate::sizeHint() calls createDetailsWidget() even for
invalid indices, which does not make any sense.

With this change the following messages will not be displayed anymore
when switching to the the Clang Static Analyzer:

    QWidget::setMinimumSize: (/QWidget) Negative sizes (636,-1) are not possible
    QWidget::setMaximumSize: (/QWidget) Negative sizes (636,-1) are not possible

Task-number: QCE-28
Change-Id: I7d45b2625ad94ddccfbb2c22ff5c07ee0bdd1256
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-26 09:17:38 +01:00
Fawzi Mohamed
bc939fe4b9 iossim: better check of command line arguments
Change-Id: I05da4f6ec071d331757dddc202a2e2fba25cbdb2
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 17:38:28 +01:00
Fawzi Mohamed
e757643690 iOS: fix simulator selection
get simulator type and SDK version dynamically from the available ones,
and let the user choose which one to use.
This fixes the static solution that did break with Xcode 6

Change-Id: I5cb2be68b9ea8736fc880cf3dd9d39d77f030293
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 17:36:58 +01:00
David Schulz
a3c9104e35 Editor: Fix "Mark text changes" setting.
The revision markers are configured by the display
settings. There is no need to set them manually.

Task-number: QTCREATORBUG-13498
Change-Id: I99ee829d64dd23a7d24f13580a75c7c1666823f4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 16:10:49 +01:00
Marco Bubke
771f47c0da QmlDesigner: Use Core::AsynchronousMessageBox
Warning which needs return value should be asynchronous because the event
loop of the blocking dialog leads to crashes.

Change-Id: Ie49c95d63ec3f2183378013c726c3b99680dc7b0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-25 15:24:49 +01:00
Fawzi Mohamed
fbaa9d8389 qmljs:reduce warnings for private plugins
Private plugin are considered those whose name ends with "private".
Avoid being misleading, i.e. do not declare the plugin dump as successful.

Change-Id: Id181d3a09dc9c4895f6566e22ad670435bd5a7f8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 14:37:02 +01:00
Fawzi Mohamed
27d5e309a9 qmljs: ignore dump errors on initial scan
Change-Id: I7dd5d472148244116bf3d5e3dcc55e74f2c8f203
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 14:36:39 +01:00
Fawzi Mohamed
2c0125f67b qmljs: do not reset ProjectInfo in updateProjectInfo
updateProjectInfo did reset the ProjectInfo to the default one.
As now currentProjectChanged calls it at a different time, it did
give several issues.

Change-Id: Ia1eabc0ea83e89038a8f7d10cc6cda0544abfaea
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-25 14:35:57 +01:00
Fawzi Mohamed
addb1c171a qmljs: phase out qtImportPaths
builtins were always using qtimportPath, which is now being removed,
so prefer qtQmlPath.

Change-Id: I99d9214c2188507859f27b729c027aaf77eb579e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 14:30:17 +01:00
Fawzi Mohamed
ebea99d399 qmljs: make dumping nonrelocatable by default
Change-Id: I543a72a90be38e6d2af49c70cb9c3f3301cf9bad
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 14:29:42 +01:00
Christian Stenger
20cf9add91 Perforce: Fix compile
Change-Id: Ief5ba86354a9c657fc9676bf6693fe4a11f543c5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 13:33:40 +01:00
Fawzi Mohamed
af803b60ae qmljs: cleanup
Change-Id: I951403ecec2b896e5b0322d79dfad952deeaae4a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 13:06:41 +01:00
hjk
cf09ac882c Perforce: Don't crash on large log output
Change-Id: I3766d20f5faaa01f38418cdfdcc4977cf9189fc7
Reviewed-by: Cristian Adam <cristian.adam@here.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 12:57:45 +01:00
Eike Ziller
4bfe6f9327 Revert "ToolChains: Do not list ToolChains removed by the sdktool"
Obviously the patch removes too much.
This reverts commit 9a5f81d96f.

Change-Id: Id6f128a8d72b51d0d1701a0a82377b56e2a314b2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-25 12:30:10 +01:00
Marco Bubke
e5c16c796e Move Utils::AsynchronousMessageBox to Core::AsynchronousMessageBox
The MainWindow was not always the first window and active has to returned
instead of a nullptr. Using dialogParent should fix it.

Change-Id: If78edb5e9567111aa998bbe5da70b3f148a3fd16
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-25 12:07:13 +01:00
Daniel Teske
9b27c9b9f1 Android: Fix name for api level 20
Change-Id: I21ec1294c090966b59d556992f45b5be4615cb20
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-11-25 11:58:23 +01:00
Nikolai Kosjar
2efc022be8 Valgrind: Use "Copy" instead of "Copy Selection"
There are no other copy related (menu) action, so it's clear that "Copy"
applies to the current selection.

Change-Id: I1042e6be2be79a7865fedeb0d84ea968ce4b41dd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2014-11-25 11:12:30 +01:00
Fawzi Mohamed
9c3f5dd3a4 qmljs: avoid storing qmltypes and qmlproject
qmltypes files were stored in the snapshot during scan, this is wrong
and bloats the memory usage.

Task-number: QTCREATORBUG-13369
Change-Id: Ie8c3970ad7a8d732230f3dc73a9ba65ab62ea4e9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-25 11:05:47 +01:00
hjk
96be6ae15f TextEditor: Shuffle some convenience functions
Remove rarely used ones, add a currentTextEditorWidget()

Change-Id: I27b97c17927c71e07dc3b489785b7f2f76eb801e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-11-25 10:49:41 +01:00