Commit Graph

32962 Commits

Author SHA1 Message Date
Daniel Teske
742e14f1e9 ~QmakeProFileNode: Simplify code
Change-Id: I6d56b8637b4194b57c4c0df033d0bc7919e24aeb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:43 +02:00
Daniel Teske
679d4e3582 QmakeProject parsing: Move code from gui thread to parser threads
Change-Id: I05c1ec01a2c1ae4017ad2d09b07aa87854e3f118
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:33 +02:00
hjk
c61804679f QtSupport: Use the new MacroExpander base
Change-Id: I8a3f3d461179ab1abf1704166ad3861645d49f99
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:23:04 +02:00
hjk
46c4ab7bf9 Utils: Introduce a not-so-abstract MacroExpander utility class
The current use of AbstractMacroExpander requires some boiler plate
code that can be avoided.

Change-Id: I753d872d824274d94d5105232a8fc05ac7bf0711
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:22:52 +02:00
hjk
326d057d32 FancyMainWindow: Fix method naming
... and resulting logic error.

Change-Id: Id1d437c6ad3e9531387859b7d449d4b47f86f0e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-10 13:37:24 +02:00
Daniel Teske
fa8d52cd23 Profile parsing: Extract VPATH information for the .pro file
And reuse that for all .pri files. This is a lot faster.

Change-Id: Iff81a50b892ad666ed6c899aa242b6e9b394f339
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 11:49:45 +02:00
Thomas Hartmann
20b118782c Adding new QtQuick features for Qt 5.4
Change-Id: I2b23d08c9d9602b1001c96901a57cf8abfb2e9dd
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-10 11:27:29 +02:00
Eike Ziller
9cc88836f7 Help: Make it possible to create multiple index views
This unfortunately means doing the filtering by hand,
because filtering on the QHelpIndexModel would be shared
between multiple views.

Change-Id: Iae38952a92dbb1b4a9685aea6f057d96f0d0784f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-10 10:14:38 +02:00
hjk
a10f207756 Partially revert "GenericProject: Use some Qt 5 connect"
The QSignalSpy parts are 5.4 only, but we need to run with 5.3

Change-Id: I77f778cd66af2f2182d067ca16d2aceeacb9ab3f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-09 23:26:34 +02:00
hjk
c17b540fd4 Re-introduce option to toggle FancyMainWindow auto-hiding
This reverts commit 1541fbd2ba
in parts. The title bars can now always be shown (the same
state as the old "Unlocked" state) or not always be shown
(the previously "new" behavior).

The default is now "Always shown". Hopefully that makes hiding
the titlebars a conscious (usually one-time) activity
that's not forgotten.

Change-Id: Id31fb193b2eb6376000c845d4a61194e2ed33129
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 17:17:40 +02:00
hjk
ab34b23e10 Make SessionManager::instance() return a SessionManager* again
That's easier to use with Qt5-style connects.

Change-Id: If6afac0718502edc1df6bf0cec1db1466116bbb8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 16:52:32 +02:00
Daniel Teske
4012b7590d Fix handling of current node if project tree view is hidden
I'm not 100% sure that this fixes the crash from QTCREATORBUG-12876.
But it's clearly wrong to only check for removed nodes in the project
tree widget and thus only if a tree widget is shown.

Task-number: QTCREATORBUG-12876
Change-Id: Iaaafcef0fe408e8bc2f4d2b61133f4419a612d57
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:59 +02:00
Daniel Teske
0047718205 CMakeProject: Add option to override the make command
Task-number: QTCREATORBUG-11788
Change-Id: If6a908ced927051b8ae131f4876c24a04b0ccaf7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:13 +02:00
Daniel Teske
c0b3dd7afe ProjectMacroExpander: Actually make it work
Fixes 7 of 9 variables which didn't work due to kit always being null.

Change-Id: I47fbb9ba8aea4736c137939b7ec1d685f94d3fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:20:07 +02:00
Daniel Teske
7255b71422 BuildConfiguration: Use ProjectMacroExpander
So that in the context of the buildconfiguration and its buildsteps
current project and others refers to the project of the bc.

Task-number: QTCREATORBUG-12869
Change-Id: Idad7741301432a5fddffdff4225762f4100a3dee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-09 16:19:49 +02:00
Eike Ziller
be65afa958 Help: Save side bar visibility without keeping track manually
Change-Id: I95982455a996cdec3a68f3db5cf714a609207814
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-10-09 16:04:00 +02:00
hjk
5530e2de66 GenericProject: Use some Qt 5 connect
Change-Id: I990aa7a6f59fa323d2d8e3c90bf89b18f6fc2058
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-09 16:01:30 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 15:43:28 +02:00
Nikolai Kosjar
32d795f2b6 C++: Do not share dependency table when copying a Snapshot
There are multiple situations were the snapshot is copied and
access/modifications to the dependency table data is made in other
threads, e.g.:

    * FindUsages called by ProcessFile
    * findReferences() in cppuseselectionsupdater.cpp
    * CppModelManager::projectPartFromDependencies() (clang path)

Change-Id: Ided1c5350f339c5bc960b87b32c78ccc21fa61f6
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-09 13:39:07 +02:00
Eike Ziller
35e22754f7 Help window: Unregister print action on close.
Change-Id: I5b9470ab7a62ab00dacf6b2c718197f7379c3d78
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 12:30:21 +02:00
Tim Sander
c298c8d894 CMakeProjectManager: add BareMetal support
Change-Id: Ia9a6d03636e79cbd1eb945608a897bf41fbc0db7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 11:47:34 +02:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Tobias Hunger
c6c091ab31 Remove StandardFileWizardFactory
This class is now unused.

Clean up includes of basefilefactory.h (and surrounding includes)
while at it.

Change-Id: I7d4f695b5ebf9ef0a32d523442084d0591f12d02
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 10:38:07 +02:00
Tobias Hunger
3191aac828 JsonWizard: Replace QmlFileWizard with JsonWizards
Change-Id: If1079db1f4e3eb4fc62d0066a43aa58c072e2290
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 10:13:21 +02:00
Nikolai Kosjar
a366429766 CppEditor: Add very first include after include guard
...when adding an include for an undefined identifier.

Change-Id: Ia338e924901262a847d3bd7ed9733d8e66c631dd
Task-number: QTCREATORBUG-10391
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:49:04 +02:00
Nikolai Kosjar
eefcd23cee CppEditor: Offer refactoring action without CppClassesFilter
...in AddIncludeForUndefinedIdentifier. Even without this locator filter
we can offer an refactoring action. See findIncludeForQtClass().

Change-Id: Ic616b82b0af9d59984da882e08f6ede714e85a86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:48:52 +02:00
Nikolai Kosjar
2db588f8c5 CppEditor: Make AddIncludeForUndefinedIdentifier work on template name ids
Task-number: QTCREATORBUG-9704
Change-Id: Ib08c331364fbfcb6e3fb9971d45e8b27311143ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:48:47 +02:00
Nikolai Kosjar
57279c0d0f CppEditor: Trigger AddIncludeForUndefinedIdentifier on qualified name base
Now there is no need to position the cursor on "C" of "Namespace::C" to
trigger the quick fix. It will already trigger if the cursor is
somewhere within the name.

Change-Id: Ic99325f95b5cf5551fc74b55606c402461849fb0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:48:42 +02:00
Nikolai Kosjar
cb320e1bfa CppEditor: Tests: Rename some tests and add one
...for AddIncludeForUndefinedIdentifier.

There are two basic tests for AddIncludeForUndefinedIdentifier:
 * Tests bypassing match() in order to only test the inserting of an
   include at the right position (now named *_inserting_*)
 * Tests also testing match()

Change-Id: I5b2b008ff9462a1cdaa5718f6a430c46992effab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:48:37 +02:00
Nikolai Kosjar
208c58bf88 CppEditor: Extract some functions in AddIncludeForUndefinedIdentifier
...to make the high level code path easier to follow.

Change-Id: If0ff9a15c9de399286e3a7f59a571949ca8f04de
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-08 15:48:26 +02:00
Daniel Teske
1546afd0e3 CMakeProjectManager: Fix crash on selecting make target
Task-number: QTCREATORBUG-13129
Change-Id: Ie964e547809ee7626c526a6a3f5741f19b8a2f0f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-08 11:53:34 +02:00
Orgad Shaneh
2835fb0308 Todo: Fix crash on MSVC when chars >0x7f are read
Change-Id: I919c1d795f846b9a16c4428f7d2cd91be7e04c75
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-08 10:57:57 +02:00
Nikolai Kosjar
c2e5f1c819 C++: Pass on the byte offsets of macro arguments
...to the Document/Block.

Change-Id: I1a96dc70ac93254e6030326b36a5df9a2cdc2bd8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-08 09:51:17 +02:00
Christian Kandeler
f865f7d8ac Update qbs submodule.
And do the required adaptation in QbsProjectManager.

Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-07 14:02:45 +02:00
David Schulz
25a8ee7344 TextEditor: Do not use deleted TextMarks.
Task-number: QTCREATORBUG-13136
Change-Id: I12e7d16012bc6118cc5907dd805dedb41414aa52
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-07 11:17:09 +02:00
hjk
1f65111e55 TextEditor: Move CompletionAssistProvider construction
... to the editor factories and pass it to the document, not the widget.
Saves some code, puts fewer objects into the object pool.

Change-Id: Iaaf250af74dc4e0c62700873accbb40ba88b7d9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-06 22:32:48 +02:00
hjk
5bb8134ec1 Debugger: Support gdbservers that don't have --once again
There are too many setup without support for --once.

Change-Id: I172b8b8d58a3960d9d93b48e692e612b7627ba56
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
2014-10-06 22:28:27 +02:00
Christian Stenger
6157b2a72a CppTools: Avoid compiler warning
Change-Id: I19c423dd9f6cbaecbaa925df0090af001b951601
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-06 16:12:34 +02:00
Erik Verbruggen
e29324118a Clang: fix indexing to at least compile
Change-Id: Ife43b0850f61e17af5f2c2e4397c7db6bb12e598
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-06 15:55:57 +02:00
Christian Kandeler
580b5d1239 Don't build qbs sbubmodule if installed qbs is provided.
We want to build against that one then.

Change-Id: Iab6aaec4872ec02735292f2d8b3507fcbf3140ea
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-06 15:33:48 +02:00
Nikolai Kosjar
eb2bfc3b4a CppTools: Tests: Remove unused object
Change-Id: Icf5837de56fc7bf5015dcad581206dcf07412a35
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-06 15:28:10 +02:00
Nikolai Kosjar
983c87dd6a CppTools: Handle reset case for setIndexingSupport
For the time being, this function actually sets an additional
CppIndexSupport to be executed. Handle the case that a client tries to
restore the previous CppIndexingSupport (see SymbolSearcherTestCase).

This fixes GenericProjectManager::test_simple in interaction with
CppTools::test_builtinsymbolsearcher. Now first running the CppTools
tests and then the GenericProjectManager tests work fine.

Change-Id: Ibe7248ec8651d4fdc312f10cdcc9c56d6dd086d9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-06 15:28:00 +02:00
Daniel Teske
721b0f7033 GenericProject: Ensure that special nodes are only added once
Task-number: QTCREATORBUG-13106
Change-Id: I3db25390879489a898bb263405319deb80a53092
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-06 12:31:52 +02:00
jkobus
656bcc4cf0 DiffEditor: Use lambda for the common initialization
Change-Id: I834754f7d52f29257e822464132d5fe24dbf5ec7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-06 11:36:34 +02:00
Orgad Shaneh
5671676ff5 Git: Find renames and copies on Show
Change-Id: I453956908bf4c99f42d1239cf793d3ea1c91fdde
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-06 10:49:30 +02:00
Orgad Shaneh
0b1b080cb3 DiffEditor: Fix detection of subsequent renames
Change-Id: Ie47c5a7ca91752b0da40b46f780ee5e0b3b6ce29
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-06 10:46:13 +02:00
jkobus
c3c19aaab6 DiffEditor: remove unneeded local variables
Change-Id: Ibfe35171525f136d0a40707e0531b72d36a62349
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-06 10:44:27 +02:00
Orgad Shaneh
bd10aa81d5 Style: Fix sunken style for menu again
ea83fe7423 apparently was not enough

Change-Id: I54d471ae79496f42d85e5fe3d8239cb2cd902349
Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com>
2014-10-06 10:30:52 +02:00
BogDan Vatra
d3942a50a9 Show project name.
Task-number: QTCREATORBUG-12877
Change-Id: I6126903f82e3cfa1dd2669a9f7333410e99e1aee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-03 08:22:12 +02:00
hjk
8872ef1b73 CppEditor: Allow connect quickfix to operate on disconnect, too
Change-Id: I94794214d969aeda6b3ce21fdca9e0bd23dea800
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-02 15:52:11 +02:00