feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
41,089 Commits 108 Branches 368 Tags
43d716bb5ab7f933337a51b0f1635715cb15bc6f
Commit Graph

41089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Hunger
7b8a867011 JsonWizard: Remove error reporting when a key was not found 
Change-Id: Ic7066aa4ce1a8b2e584c825b5b013b9621c28010
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-05-04 15:26:16 +00:00
Tobias Hunger
c3012d0e34 QmlDesigner: Remove unused files 
Change-Id: I5038963f13ab82a58fddbf0dd95fa173d5f07424
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-04 15:13:26 +00:00
Leena Miettinen
133f994589 Doc: update the Qt Quick application tutorial 
To version 3.4, but still using the Qt Quick 2.1
component.

Task-number: QTCREATORBUG-14341
Change-Id: Ifd9638ea5b111554f2ea7838623104aab27963a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2015-05-04 15:11:22 +00:00
Tobias Hunger
b2e3f0262b Sdktool: Add switch to set environment for kits. 
Use --env TEST=somevalue or --env TEST (to unset TEST) once per
environment variable you want to set/unset.

Task-number: QTCREATORBUG-14342
Change-Id: Ia968aeb55a9702d12bc0beb9a38bdd8309a18559
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-05-04 13:50:34 +00:00
Tobias Hunger
5aba7fb095 Sdktool: Fix default kit handling 
The default kit is addressed by its id, not its number for a long
time now. Update sdktool accordingly.

Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-05-04 13:49:19 +00:00
M. Moellney
3bbc83addc Add missing qmake functions to profile completer 
A lot of qmake expand and test functions were missing from
the ProFileCompletionAssistProvider.

This patch brings the database on par with the listing in
the qmake build in functions from current qmakebuiltins.cpp.

Change-Id: I635776f6b449d62fd6a505969451e8630fb26ee8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2015-05-04 10:24:02 +00:00
Daniel Teske
9a811e96d1 Fix "Add new being disabled" 
A connection was missing, so the actions weren't updated on
closing the new dialog.

Change-Id: I3ee8c4ed3d7fc4a81dcdd067897f42ac70118b77
Task-number: QTCREATORBUG-14377
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-05-04 08:28:16 +00:00
Tobias Hunger
9fef4fb9ca CPlusPlus: Fix warnings about overriding visit(...) methods 
Change-Id: I142b6c7b6573518dbd44557f3a66c5d683bb592d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-05-04 08:22:43 +00:00
David Schulz
766b222d8f Editor: Move inFindScope back to exported class. 
To allow invoking it from BaseTextFind.

Task-number: QTCREATORBUG-14300
Change-Id: Id9f553d166f7b929e00238327e22d6a915957b77
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-05-04 07:54:14 +00:00
hjk
1d3b4abbfc Help: Allow use of stripped down WebKit as help browser 
Change-Id: I9571b70b6eb3c6e27adf482ea24049d66244bbc7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-04-30 14:13:06 +00:00
Alessandro Portale
ff6949952b projectexplorer: Fix msvc warning 
C4138: '*/' found outside of comment

Change-Id: I4c68d57643cceb1a9f088c9a944d3a365e345711
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-04-30 12:43:59 +00:00
hjk
a6990e7e24 CMake: Use ArgumentsAspect in CMakeRunConfiguration 
Change-Id: I30fbfc0bcc5e6c997190c3f1a1c279dab06fdbc0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 12:37:16 +00:00
Nikita Baryshnikov
ee93b202de Qbs: added qmltypes 
generated from qbs-qmltypes
to support highlighting and auto completion

Change-Id: Iae0f2c5ccb244c1909fe71f8ef02e58f21f51996
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-04-30 11:21:38 +00:00
hjk
0493a0e347 Qbs: Use new ArgumentsAspect 
Change-Id: Ib1ea9ab9d7c1e15db2d60081e81ae0f4478d9bc1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 11:20:48 +00:00
Tobias Hunger
5b77a3a8c1 Blackberry: Remove blackberry support 
Keep QNX.

A short informal search did not turn up any more blackberry users,
even though there is interest in QNX. So this patch removes the
platform: We had no contact with the maintainers in months, there
are no changes going into the code for about as long.

I am not even aware of anybody testing the platform, so any
remaining users are probably better of with Qt Creator 3.2 or so
where the code was extensively tested.

Change-Id: Ibeda6bfd8565599918cfcc08fd01cb5ed8793dc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 11:15:53 +00:00
Tobias Hunger
b5090ddde4 VcsCommand: Add method to set the display name of a command 
Change-Id: Ie8b34de88d23a279c17e89497e177bc1b8f31255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-30 11:08:19 +00:00
Nikita Baryshnikov
b3a8444c30 Kit: ignore invalid ids 
Change-Id: I4947b4188fdddaa63670891fb8988324ff6686fd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 11:08:03 +00:00
Christian Kandeler
271794fbc9 Remove some superfluous QT_VERSION_CHECKs. 
5.4.0 is required these days.

Change-Id: I0dc4c788b058f4c3fd2b9026fd7d6c7ab2840884
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-04-30 10:20:45 +00:00
Orgad Shaneh
aeb0b54c26 Dist/GDB: Upgrade to 7.9 
Change-Id: I2ec8c663830e547bdf852dc3dde2dd12ccef0763
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-04-30 09:49:23 +00:00
Leena Miettinen
d9e11e8d40 JSON wizard: fix capitalization of message box title 
Use book-style capitalization for titles.

Change-Id: I7912f63aeaa87ae5d562839edfafa584140b88e4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-30 08:47:23 +00:00
Orgad Shaneh
4752c809c9 C++ Dumper: Support int in template arguments 
e.g. Temp<int>

Change-Id: I3d737a696396548a896685aa48fc99a1c3289a6c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-30 06:59:01 +00:00
Robert Loehning
6d2fb84a8e Qbs: Compile fix 
Change-Id: I583407e1952a1645f557154592aa022f3baa0a79
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-04-29 15:17:37 +00:00
Leena Miettinen
4f743e9bbb Editor manager: fix punctuation in message 
Added a full stop.

Change-Id: Ieba978bc219dc94adecb97e1c6f8f8986398e526
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-04-29 13:02:35 +00:00
Leena Miettinen
942a59a3a8 Android: Fix UI text 
Open GL should be OpenGL.

Change-Id: I1d73f3feded69aedb4127024579c9fe7d13de88e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-04-29 13:02:18 +00:00
Robert Loehning
6febfc802e Squish: Test showing Creator's first commit 
Change-Id: Ibbd7a2ed6ac7c54a304fec057a61357fed3b4274
Task-number: QTCREATORBUG-14322
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-29 12:31:26 +00:00
hjk
7c8a43cac3 ProjectExplorer: Merge terminalaspect.* into runconfigurationaspects.* 
Change-Id: I24c61feac5e25171f5878c4f87e760481eff7996
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 10:52:21 +00:00
Tobias Hunger
d8a258e55a QNX: Quieten warning 
Change-Id: Id804213dd44cbeeb63eca09b62b9e4f885552224
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 10:43:16 +00:00
Alessandro Portale
b7964e6c97 ProjectExplorer: Replace QScriptEngine with QJSEngine 
Change-Id: Iccc14c2197a30a7e62b2d388d163d1f89a5d1e87
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 10:12:11 +00:00
Tobias Hunger
ad5c0261e5 BinEditor: Add markup.cpp to build system 
The header file is part of the build, so should be the source file.

Change-Id: Ifb577611a4560a6262df1326aa99ed3826bda492
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 10:04:08 +00:00
Tobias Hunger
a71080c452 Revert "BinEditor: Remove unused file" 
This reverts commit 4d0fbd90dd.

There is a markup.h file that is built, so we should keep the
source file around.

Change-Id: Ibc55c1bc0fa1fb1743cff5f9855fd075f095328d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 10:01:59 +00:00
Tobias Hunger
b77f48a8bc QmakeAndroid: Remove unused file 
Change-Id: I314cb7edc9c7553f781b4a0cf54172aee3ccc336
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-04-29 09:56:48 +00:00
Tobias Hunger
be7196bb83 ProjectExplorer: Remove unused files 
Change-Id: Ide9173a58956f0f477a9389bb3841a80cbb69cb6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
 2015-04-29 09:56:39 +00:00
Tobias Hunger
5e9d08ed37 BareMetal: Remove unused file 
Change-Id: I5e2c1f400a5b308fd3858750954a5aae7566bb21
Reviewed-by: hjk <hjk@theqtcompany.com>
 2015-04-29 09:56:00 +00:00
Tobias Hunger
d10c0c8f60 Documentation: Remove some unused images 
Change-Id: I8080798092f3c0a142dc772611ebb684337a0aa1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-04-29 09:48:52 +00:00
hjk
652d50012f ProjectExplorer: Introduce more RunConfigurationAspects 
- WorkingDirectory
- Arguments
- Executable

Change-Id: I6bc83b32d33ec3b27b04ec1b334f75ae3b9d13cb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 09:41:42 +00:00
Jake Petroules
769d7450bb Qbs: fix equivalent command line for "show command lines" option. 
Change-Id: I91de51de3ce2fb0acc20b87992324e9ec8a26bc2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2015-04-29 09:29:22 +00:00
Tobias Hunger
4d0fbd90dd BinEditor: Remove unused file 
Change-Id: Iebaf1fbe52c71bf38833989ff05f308d9d1ef6a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-29 09:28:01 +00:00
Tobias Hunger
c7c785ace3 Vcs: Push the binary into the Jobs of VcsCommand 
This is the first step to generalizing the class for wider use.

Change-Id: I40ccb5bec4fdcb9d0a67388160c867799331007b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-04-29 08:40:46 +00:00
Jake Petroules
5c75924d81 Qbs: display native separators for qbs.exe file path. 
Change-Id: I979118e3552e75cd3a64c3b600a448e36214b646
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-29 07:33:04 +00:00
Orgad Shaneh
6a9bd957cb C++: Fix instantiation of typedefed type in block 
Use-case:
template<typename T>
struct Temp { T t; };

struct Foo { int bar; };

void func()
{
    typedef Foo *pointer;
    Temp<pointer> temp;
    temp.t->bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14351
Change-Id: I13ca6145a0069bbc7a7207f69b43011c69ec72c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-04-28 13:54:40 +00:00
Orgad Shaneh
ad4cb444fb C++: Fix specialization resolution for nested types 
Use-cases:

template<typename T>
struct Traits { typedef typename T::pointer pointer; };

template<typename _Tp>
struct Traits<_Tp*> { typedef _Tp *pointer; };

struct Foo { int bar; };

// 1
template<typename T>
class Temp
{
protected:
   typedef Traits<T> TraitsT;

public:
   typedef typename TraitsT::pointer pointer;
   pointer p;
};

void func()
{
   Temp<Foo *> t;
   t.p-> // complete
}

// 2
class Temp2
{
protected:
   typedef Foo *FooPtr;
   typedef Traits<FooPtr> TraitsT;

public:
   typedef typename TraitsT::pointer pointer;
   pointer p;
};

void func2()
{
   Temp2 t;
   t.p-> // complete
}

Task-number: QTCREATORBUG-14141
Change-Id: Id3459671117c0c81bcde7c9714b42750634c0225
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2015-04-28 13:54:25 +00:00
Nikita Baryshnikov
aa893918c1 Locator: run external tools 
Change-Id: I7f5b6a452822481e4b85b91a356727979b23cab4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2015-04-28 09:59:56 +00:00
hjk
62da71491a BareMetal: Fix recent regression in GdbServerProvider view 
Long live override.

Change-Id: Icbd8d258ae35fd405b958786a7346d4a8c688eb1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-04-28 09:48:17 +00:00
Daniel Teske
ed986f73d3 Remove Qt Quick 1 Template 
Since this was the only template using the qt quick application viewer,
remove all traces of that too.

And this was also the only "upgradeable" template, so remove all traces
of the upgrade code too.

Change-Id: I68989dc5a87621593f3b5dd8c4979bb59f137200
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-04-28 09:32:30 +00:00
Daniel Teske
3f183b7ee0 Purge deployment.pri 
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.

Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-04-28 09:32:07 +00:00
Daniel Teske
e6881bd6d6 QrcDeployment.pri: Remove unneeded android scopes 
- andorid-no-sdk should not be used for new projects anymore.
- The android scope is handled in android.prf in qt, and there the
  handling is better, so removing this actually fixes a bug.

Change-Id: I2b901e0cb1fd4bc0d00fbcd3c8ea08b22e4bca49
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2015-04-28 09:31:45 +00:00
David Schulz
e75620c60d Editor: Limit size of generic proposal widget. 
Task-number: QTCREATORBUG-14331
Change-Id: I3a120c82628e3cd43f9abc3c97021a3674300fbc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-28 08:44:55 +00:00
David Schulz
e4e9983622 CDB: Unify handling of stopped debugger process. 
Task-number: QTCREATORBUG-14344
Change-Id: Id05b16e649d39e354e6fda9ede9aa44984f3f429
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-28 07:00:52 +00:00
David Schulz
583b8dbefd Editor: Fix hihglighting current line in read only editors. 
Task-number: QTCREATORBUG-10104
Change-Id: I3c4adb62c1cae61e9eb409a58359a687852023a1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-04-28 07:00:15 +00:00
hjk
c1410878cf Remove unused Utils::NetworkAccessManager::getUrl 
Change-Id: I445be50bd9460a5adad1bb7fb99479096d2d2fb4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-04-28 06:10:00 +00:00