Commit Graph

41387 Commits

Author SHA1 Message Date
Tobias Hunger
6d6bb7a433 ios: s/Q_DECL_OVERRIDE/override/g
Change-Id: I34749159abb7c48172a093037a4de800fabcecd2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-04 08:31:15 +00:00
Tobias Hunger
68970e9d96 iostool: s/Q_DECL_OVERRIDE/override/g
Change-Id: I05e269b56bcdc3e4555116a584c2efaaccced6e5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-04 08:31:06 +00:00
Tobias Hunger
90a5fa6079 valgrind: s/Q_DECL_OVERRIDE/override/g
Change-Id: I627db3b06f9c62f466e692674f1074c667d070b7
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-04 07:23:37 +00:00
Tobias Hunger
6f5accfd98 fakevim: s/Q_DECL_OVERRIDE/override/g
Change-Id: I84c9d5df0b267c5039ce37e3ea4ddc1b83efc2a3
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-04 07:22:32 +00:00
Tobias Hunger
e9d05d82b6 glsleditor: s/Q_DECL_OVERRIDE/override/g
Change-Id: I818ad4a11c70a455462e91478b8ac955ad634530
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-04 07:13:15 +00:00
Christian Stenger
35680abd9e TreeModel: Inform view about changed root
This removes the need to emit the respective signal by the caller
of setRootItem() if the tree has been constructed before using
setRootItem().

Change-Id: I6f6210a9ef7d9ec3d347dc7cfdaf853535ca7656
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-06-04 06:24:39 +00:00
Marco Bubke
e2f8a9883b Introduce codemodelbackend process and library
This is a partial result of wip/clang-oop. More will follow.

This allows us to invoke the completion out of the Qt Creator process
and thus safes us as against libclang crashes.

At this point only the completion use case is supported.

Some notes on the individual components:

 src/libs/codemodelbackendipc
  * library encapsulating the inter process communication handling
  * used by the backend application and in a follow-up change by the
    creator integration

 src/libs/3rdparty/sqlite
  * version 3.8.10.2
  * dependency of codemodelbackendipc, will be used to storage indexing
    data, among others

 src/tools/codemodelbackend
  * the backend application

 tests/unit:
  * unit tests

Change-Id: I91a48e27467581a22fb760a18d8eb926008fea60
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-06-03 14:22:09 +00:00
Tobias Hunger
51fec1a3ca cmakeprojectmanager: s/Q_DECL_OVERRIDE/override/g
Change-Id: I9465394a8c128e894e3e758d2494e5e8b50c8b37
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-03 13:48:24 +00:00
Tobias Hunger
80f9ef0160 qmakeprojectmanager: s/Q_DECL_OVERRIDE/override/g
Change-Id: If62b4ad44288894cab818a7a943d53f62c57a63a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-06-03 13:48:11 +00:00
Tobias Hunger
c26aa3ec94 subversion: s/Q_DECL_OVERRIDE/override/g
Change-Id: Ie877cab36dde8f0f62a08d47c4006332e0be8e9e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-03 13:46:08 +00:00
Tobias Hunger
2749855240 qbsprojectmanager: s/Q_DECL_OVERRIDE/override/g
Change-Id: Id5d53a6896762dd2a427a89e15307567592b6eb6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-03 13:43:11 +00:00
Tobias Hunger
4d166c6ae2 Wizards: Bring already running wizards to the front
Change-Id: I8f8daddd2efd46a2ad0596ed44e4ee1932c3b815
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 13:29:12 +00:00
Tobias Hunger
2cd5b448e1 NewDialog: Simplify code a bit
Convert some connects to Qt5-style while at it.

Change-Id: Ib5d8af8ccded1005302ad2da3c185c73a8992bd6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 13:08:24 +00:00
Tobias Hunger
093a54cbb8 Make BaseFileWizard async
The side-effect is that WizardEventLoop can go!

Change-Id: I0eae0e0fa91a48e2a5010b47cc0de86758969904
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 13:08:13 +00:00
Tobias Hunger
9d0c39768f Wizards: Allow for async wizards
Change-Id: Id150ede2549150be8e720c5a0e31b05309cb3fb9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 12:59:22 +00:00
Tobias Hunger
e2dab7685c Core: Improve dialogParent() to work better with detached windows
Make new windows center on the window the user is currently looking
at instead of the mainwindow.

Change-Id: Ia6246a4f1935b6d2d66db329c6141f4cb8349916
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 10:25:08 +00:00
Tobias Hunger
86b50d83c0 Wizards: Disable wizard actions while NewDialog is visible
Change-Id: I4ceeeeba2e67132cca40e59f9f01c6da994b0f3b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 10:23:05 +00:00
Tobias Hunger
5699ca9616 Wizards: Block reloading of wizards while NewDialog is visible
Change-Id: Iaaca36ce540104a9ccf1d2b354785463d711aacb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 10:22:52 +00:00
Eike Ziller
7c9e8f8767 ImageViewer: Support splitting
Change-Id: Id789bd4a77d14ff990f3c9092a9ba533ac4fab7a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-03 09:48:52 +00:00
Nikolai Kosjar
45194515c0 CppTools: Export CppCodeModelSettings
Needed for the ClangCodeModel tests, where we need to activate the clang
code model.

Change-Id: I368b840875ca2a46da4535338bf55967cbcdf5ea
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-03 09:16:24 +00:00
Nikolai Kosjar
65137313b0 CppTools: Do not return a language option for ProjectFile::Unclassified
This led to an invalid command line ("-x" without further argument).

Change-Id: I8cfe1a8a29789fba426b61fe3702496d8089db6b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-03 09:15:41 +00:00
Nikolai Kosjar
c5c57dca0c CppTools: Tests: Allow to check only project relevant state
Needed for ClangCodeModel.

If editors are open, the global snapshot and working copy will not be
empty.

Change-Id: I0d1bab8e082a7f41630c7b1b78febe2da009298b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-03 09:15:39 +00:00
Nikolai Kosjar
9425812066 CppTools: Export ModelManagerTestHelper
Needed for tests in ClangCodeModel.

Change-Id: I58bdb35811776751a95b5db198ea8d6cdb0cd6de
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-06-03 09:15:36 +00:00
Nikolai Kosjar
e661a9c19e CodeAssist: Support asynchronous processing without threads
This is required for the CodemodelBackendIPC integration in the
ClangCodeModelPlugin. Since the heavy calculation happens in a separate
process, we only need to send appropriate requests and receive results
for a working completion. However, the CodeAssist API does not fit here
since it only provides means of caculating the results in the main
thread or a worker thread. We can't use the worker thread approach since
that would lead to threading issues regarding QLocalSocket in
CodemodelBackendIPC.

IAssistProcessor::setAsyncProposalAvailable() will hand the results
back to CodeAssist in order to display them.

Change-Id: I496192560fb406ec40fa8bcb7904f7a03d2eef50
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-03 08:59:17 +00:00
Nikolai Kosjar
7050f78b8d Core: Make EditorManager::reloadSettings available for tests
Needed for a test in ClangCodeModel in order to avoid a blocking pop-up
dialog.

Change-Id: I5a337cfcbf514052681f1941845a995d2a5856ac
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 08:59:06 +00:00
Tobias Hunger
7e41b40c91 Wizards: Treat running wizards in the same way as a running NewDialog
That is block the New file or project action.

Change-Id: Ic7bb6013fce02fdcdd5c86b70ba5428218597a40
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 08:07:29 +00:00
David Schulz
3ceec86577 Editor: Add Check for TextMark color definition.
Change-Id: I805402a5ec9595bd31b6d72c5934198c77a1f402
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 06:48:06 +00:00
Eike Ziller
19f63a5d8a Merge remote-tracking branch 'origin/3.4' 2015-06-03 08:39:25 +02:00
Orgad Shaneh
00d4e0456c Debugger: Fix MSVC warning
debuggerruncontrol.h(87) : warning C4273: 'Debugger::createDebuggerRunControl' : inconsistent dll linkage

Change-Id: Id202fcebe0f66a94be3b6efff8ce575a5da3c3e3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-03 05:56:46 +00:00
Robert Loehning
e869d794c8 Revert "Squish: Fix verification in tst_rename_file"
Didn't think of the bug mentioned in my own comment. Sorry.

This reverts commit c7b7fde2bf.

Change-Id: Ida2791a7c985c8036194df437c720a170a39458e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-06-03 04:52:16 +00:00
Daniel Teske
26059dbb1e Make every operator bool() explicit
operator bool() is a trap, but with explicit it's far safer,
and we can use that now.

Change-Id: I4e58631c94e87c00256c3ab3cff4fd2c5f632713
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-02 16:06:22 +00:00
Friedemann Kleint
2189464a84 Qt Designer plugin: Use C++ 11 member initialization.
Simplify/obsolete constructors accordingly.

Change-Id: Id7b974317f2be81a89ff3a279eed95171d34991f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-02 09:54:19 +00:00
Friedemann Kleint
9572b6f739 Qt Designer plugin: Port to new signals & slots syntax.
Split ResourceHandler::updateResources(bool updateProjectResources)
into 2 slots to make it compatible to void signals.

Change-Id: I0614637cd575c45f9acd6514fe04fe08dfcfcff8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-02 09:54:08 +00:00
Friedemann Kleint
17aaf04309 Qt Designer plugin: Introduce override.
Change-Id: I1b69865dfeb19322693f11ea2c276bd016ceed4f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-02 09:17:02 +00:00
Eike Ziller
b281869b25 Fixed that File > Open With was not working with already open file
It was just activating the existing editor, instead of reopening with
the new editor type.

Change-Id: I1fee08d1df1d78a32298d222a09cf05cf9433f19
Task-number: QTCREATORBUG-14336
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-02 09:05:22 +00:00
Orgad Shaneh
b67ebf9ffc C++: Fix lookup for instantiation of using
Yet another std::vector issue...

Use-cases:
// Case 1
template<typename T>
using type = T;

// Case 2
struct Parent {
    template<typename T>
    using type = T;
};

// Case 3
template<typename T>
struct ParentT {
    template<typename DT>
    using type = DT;
};

struct Foo { int bar; };

void func()
{
    type<Foo> p1;
    Parent::type<Foo> p2;
    ParentT<Foo>::type<Foo> p3;
    // bar not highlighted
    p1.bar;
    p2.bar;
    p3.bar;
}

Task-number: QTCREATORBUG-14480
Change-Id: I9ab08ea7360a432c48eb4b85aa0d63e08d2464c1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-02 08:37:02 +00:00
Johannes Lorenz
2a966a8917 C++: Support ellipsis on variadic inheritance parsing
Change-Id: I571aefdb1f2aba88ba0c7710f16b6d8ad2e8f5a8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-02 08:24:17 +00:00
Eike Ziller
697479572f Move Open With... handling to editor manager.
Change-Id: I27faa327ae33244927e21aa74875d9601aaf9e50
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-02 07:00:50 +00:00
Eike Ziller
2e4a86a87c Simplify Open with... menu handling
In the light of lambdas we can get rid of some complexity.

Change-Id: Id28b52c42d7c34526c93785723387b6c44c0cd52
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-06-02 07:00:31 +00:00
Eike Ziller
832aa7851c Designer: Move "open" implementation to document.
This avoids that reloading needs to call back to the editor, and is in
preparation to a complete move of "open" to the document.

Change-Id: Ic24ecf7612c311055276e81edb080ab855590df9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-06-02 06:59:01 +00:00
Orgad Shaneh
08d94196fb Core: Fix compilation with gcc 4.7
mainwindow.cpp:491:77: error: 'this' was not captured for this lambda function

Broken by c0952e22f7.

Change-Id: I6fd9b6fb021c21ccec2b15695e07d1af8284fe2b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-02 05:41:58 +00:00
M. Moellney
3627f311f3 Add profile completion keyword VERSION_PE_HEADER
qmake of Qt 5.5 introduces a new predefined variable
VERSION_PE_HEADER. It was not part of the known keywords
for the qmake profile editor.
This patch adds VERSION_PE_HEADER.

Change-Id: Iae671d89ff623c4062da621e571769df736fa6d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-06-01 20:24:24 +00:00
Orgad Shaneh
4a8a7f22b4 C++: Remove unneeded null validation
addNestedType should never accept null scope.

Change-Id: I6e4a86d0c7595af11079915faffdd8d213e92bd2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-01 16:43:54 +00:00
Orgad Shaneh
07f8c474be C++: Fix decltype resolving for template function
The last nail for std::unique_ptr (GCC variant, MSVC still doesn't work).

Use-case:
template<typename T>
static T f();

struct Foo { int bar; };

void fun()
{
    decltype(f<Foo>()) s;
    s.bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14483
Task-number: QTCREATORBUG-8937
Change-Id: I5bab757400b070cf9dbb688a44fd8eafe95ddc61
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-01 16:30:47 +00:00
Denis Kormalev
a429ef3d50 TODO plugin: Add file patterns to exclude from parsing
Additional list of regular expressions added to TODO plugin settings
to allow set patterns to be excluded from file list to parse by this plugin.

Change-Id: I718f111ac7592557a6aa86865283468c53d58078
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-06-01 15:45:25 +00:00
Christian Kandeler
4f5a02d596 SSH: Fix compilation with system Botan.
Change-Id: Idc44375335fae419fff8a409a0f6cb6feee92ba3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-06-01 15:39:34 +00:00
Daniel Teske
d7fbe79c1f ResourceEditor/Node: Add 'Remove missing files' feature
Change-Id: I081ec83b8cdb4f7c29e754b95370b58865ca2993
Task-number: QTCREATORBUG-13941
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 15:07:26 +00:00
Tobias Hunger
47660a8f09 NewDialog: Keep information on whether the dialog is open or not
Keep that information in the NewDialog instead of ICore.

Change-Id: I3e351251be6c4927b80a22db175ed79cb1f24621
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 14:47:30 +00:00
Tobias Hunger
c0952e22f7 ICore: Move handling of New File/Project dialog into ICore
ICore only used to pass this on to MainWindow.

Change-Id: I3c4a214330713928a50a291e3c5c6624310db03a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 12:56:32 +00:00
Ray Donnelly
5e61c2dfc7 MinGW-w64 Utils:: compilation fix
The include for utils/environment.h was omitted
unless Q_OS_MSVC, but the code that uses it is
also compiled for MinGW-w64, so change that compile
guard to Q_OS_WIN instead.

Change-Id: I2fa5a09f1864c0ed38d09e3fbb2c6f661fbc8b26
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-06-01 11:38:37 +00:00