Commit Graph

32962 Commits

Author SHA1 Message Date
Alessandro Portale
895e0d8439 applicationicons.svg: Use one shared icon background
...instead of duplicating it. This way we can apply a unified outline
to the Qt logo to work around scaling aritefacts on OSX.

Task-number: QTCREATORBUG-13359
Change-Id: I23ababf0a6598d92682e65856676b113937c86af
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-10 13:35:58 +01:00
Christian Kandeler
76b3a99552 Core plugin: Fix compilation.
Change-Id: I74e9322e482ebcd16036afc3e7de23f38afbedfe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-10 11:26:48 +01:00
Tobias Hunger
1fd3a37fb8 SVN: Remove unused method
Change-Id: I369afad134587e0d498c275837fffda5674b7c59
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-10 11:19:08 +01:00
Tobias Hunger
d301fb42e9 Git: Fix description of git status progress
Remove color.status option. Creator can handle ANSI now, so there
is no need to suppress that for user-visible output anymore (Git
is intelligent enough to not print colors, even if we do not explicitly
ask it not to:-)

For the internal uses of git status: Prefer using --porcelain instead
of the -s format. That is meant to be stable and does not use colors
ever.

All supported git versions (>= 1.7.2) support --porcelain.

Task-number: QTCREATORBUG-13277
Change-Id: Idd88bcba0c4e4ed68bb27fbf475fe88fae497f1c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-10 11:17:44 +01:00
Christian Kandeler
bdb9a14de0 QbsProjectManager: Allow users to override profile properties.
Creator derives its qbs profiles from the kits and overwrites
them as it sees fit, which means users cannot set custom properties
by editing the respective settings files or using the normal
qbs command-line tools. Therefore, we need to provide them with
a way to do this from Creator itself. For this purpose, we
introduce a settings page where a user can add or override
qbs properties per kit. The resulting "diff" is then applied
whenever the profiles are written, so qbs will take the
custom properties into account.

Change-Id: I909f5243c65647f62c91a2afa242fd531ddaf915
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-10 11:05:11 +01:00
Orgad Shaneh
685ea30204 Theming: Enable theming info bar
Use same role for info bar and search result widget

Change-Id: Ibe1f226d4ea8edaafb3daa1cc629e23a48322cf2
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-10 09:03:37 +01:00
Orgad Shaneh
c00e69acbc Fix compilation with Qt 5.3
Functor override for QTimer::singleShow was introduced in 5.4

Change-Id: I8970c73a1d4b97c6cc588cddca8d617fdaa8bfa2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-10 07:41:05 +01:00
Dieter Piringer
4a4ee5cda0 Core: Fix segfault with -presentationMode
Change-Id: I5db01695fd6af338348994bed7498a3d4c7676ea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-09 09:07:32 +01:00
Orgad Shaneh
c43d958e6b ThemeEditor: Enable browsing through built-in themes
Change-Id: I2ce389abdffe99e27992c71ca64a4888c2e7fac5
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-08 17:37:17 +01:00
hjk
ea029b4cb5 Debugger: Rename hide to hideAllToolTips in tooltipmanager.cpp
Easier to guess what gets hidden.

Change-Id: Ie7731dc6bb601bfa1ea6eb8cb69822e72bdfbd66
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-07 16:34:33 +01:00
hjk
897ca7a6f4 Debugger: Simplify debuggertooltipmanager.h
Change-Id: Iaa4204d374913c65e322b2a00831caeb1b3b1ccc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-07 16:33:14 +01:00
hjk
4b57427ee1 Debugger: Expose WatchModel signals
This opens it up to be used with Qt5 connects in the
TooltipManager and simpler user code.

Change-Id: Ifc6fcc3a04d325437f5a2bdf1da463d28d650ee3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-07 16:01:08 +01:00
Daniel Teske
6bb51244ca Cmake: Fix include paths for some cmake projects
The affected cmake projects have the CMakeLists.txt in a subdirectory
of the project's root. We can't figure out the right project part in
that case. Falling back to the "all" target is wrong though, since
that has not every include path. Instead search for a good target
that has more include paths.

Change-Id: I1a874042fcb9533888a41c001fbf8adc2aa90a39
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-07 14:31:27 +01:00
Daniel Teske
21638efe9d Utils::FileName: Fix append("") appending a '/'
Change-Id: I2767a901220711dbba6b34c36e256d282f468778
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-07 14:31:22 +01:00
Christian Kandeler
5d8c0f9c88 Update qbs submodule.
To HEAD of master branch.
Also do the necessary adaptations.

Change-Id: I51830dee41341c9be294caf69fdb0459ed8c8bfe
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-07 14:23:46 +01:00
jkobus
1ce60cb31d DiffEditor: remove description when the diff is saved.
The description itself isn't saved so no need to
keep it anymore.

Change-Id: I8e521ce261261eb91a1f218f4e65092fc3fb44e8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-07 14:19:08 +01:00
hjk
f6c8fafcfd Deprecate 'CurrentSession' in macros.
It's just 'Session' now. The old values will continue to work
but not offered in the variable choosers.

Change-Id: I7e7a62f04abfd895d21cc3c07c4f89056d90b596
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-07 14:17:30 +01:00
Orgad Shaneh
e569ab8f2b Mercurial: Replace Alt+H with Alt+G for accelerators
Alt+H triggers the Help menu.

Task-number: QTCREATORBUG-12531
Change-Id: I357db8f01fa28209a818e8c9a9587f213e0d0ca5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-07 14:15:00 +01:00
Eike Ziller
5fb0d57d93 Hide variable chooser if current edit widget is hidden
Change-Id: I4b908fd76602170a186b9e1430c7d0e65046d17d
Task-number: QTCREATORBUG-13355
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-07 13:04:49 +01:00
Nikita Baryshnikov
0b5866bcf8 Utils::transform: Add missing overloads, simplify implementation
Use a helper class so that the actual implementation is shared and
introduce a helper class for treating QStringList and other qt
containers in the same way.

There are now 2² overloads, because:
- member function pointer vs everything else
- same container type, different container types

Change-Id: I343ca7d4e0007f7146b2e646c436c22174e27779
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-07 12:43:18 +01:00
Volker Vogelhuber
4a0df73b53 don't deploy static libraries build using cmake
Change-Id: I00f0fb2474620f86ca4d50a2e47c8ee4bf69239b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-07 12:28:14 +01:00
Nikolai Kosjar
e510c80c92 CppTools: Provide whether a sub project is selected for building
Analyzers can use this to rule out irrelevant (sub) projects.

Change-Id: I5a9eb66f06156f0619dc639f6f4080a8fc761ee6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-07 12:10:22 +01:00
Przemyslaw Gorszkowski
0ff1cba77b C++: fix follow symbol for const arguments
Fixed case:

class Foo {};
void foo(int v) {}
void foo(const char *v) {}
void foo(const Foo &v) {}
void foo(char v) {}

void test()
{
    foo(5);
    foo("hoo");
    foo('a');
    char *var = "var";
    foo(var); // Jumps to last override, regardless of its type
    Foo f;
    foo(f); // Jumps to last override
}

Task-number: QTCREATORBUG-13128
Change-Id: I038553bb3bdbe1c300fc01573c14b6fedf0320cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-07 11:34:28 +01:00
Tobias Hunger
2de666da61 Vcs: Report stderr messages in checkout wizard
Do not delay them till after the command has finished.

Change-Id: I52984e1deeaeb33e3feba0a5b6b982059870f4b8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-07 11:32:47 +01:00
hjk
66a87a1748 Debugger: Fix number of appearances of data watch points
At least on Linux setting one data watch point resulted in two
view entries, since we parse two responses (direct command
response, and later GDB notification). Suppressing the second
was not working well enough.

Change-Id: Ica99c000d4912a9480a9e7020d2fdfdb866753b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2014-11-07 10:50:15 +01:00
Nikolai Kosjar
ba60b512e5 QbsProject: Cancel (last) C++ indexer before new code model update
...otherwise we might end up having multiple indexer running for
different (build) configurations.

Reproduce e.g. with:
 (1) Open a project (adds "Parsing C/C++ files" progress notification)
 (2) Trigger build of project
 (3) While it is still building, switch between e.g. Release and Debug
     build configuration
 (4) Once the build is finished, a new code model update is pushed but
     the indexer for the old configuration might still run

Change-Id: I685d0b3eeeb43ba5923c6af0e6b16aee6609419b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-07 10:28:10 +01:00
Nikolai Kosjar
1fcba8df5f QbsProject: Provide compiler call data
...so that analyzers can make use of it.

Change-Id: I9694535f02f631cac266c26b4f4c973a06c6c899
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-07 10:27:25 +01:00
Nikolai Kosjar
33359a7922 CppTools: Add API to set/query compiler call data
...and make some comparison functions public.

Change-Id: If4c9a95031dece32073ce111484a890230190688
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-07 10:27:17 +01:00
Orgad Shaneh
bb4a58304d Fix compilation
Change-Id: Idf445b94c1b43ab4f4c3b2e121134f7a722be1d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-07 10:02:26 +01:00
Orgad Shaneh
5c03037a0b Core: Hide the theme editor
It isn't ready for production yet, will hopefully be reworked for 3.4.

Change-Id: If738f40df5cd2b4ab7edbcdc0086c7aa5d5f47f6
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-07 09:38:39 +01:00
Orgad Shaneh
c1a76f8cc1 Core: Separate theme settings widget from options page
Change-Id: I6537e592f87969af5c2e53606a704fabec62fedc
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-07 09:38:23 +01:00
Eike Ziller
ec176b4bf4 Merge remote-tracking branch 'origin/3.3'
Change-Id: I3a8ef73222c64fb93f1d00adbea2057d2f8dcf43
2014-11-07 08:19:34 +01:00
Robert Loehning
e86cc3e337 VariableChooser: Remove 'always on top'
Change-Id: Ib5cdf1b53f136671eb9152c86abb705af32e3029
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-06 18:06:01 +01:00
Alessandro Portale
01bac8555d adding 24px-size to qtcreator.ico
Change-Id: Ic5e6b861e0c66e5a1f1a4e081c76b436a669c622
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 17:30:37 +01:00
Alessandro Portale
b97c3fd78f Updated Qt Creator icon
Change-Id: Ib95510a3c9b6e15ae9956181c3462bb8251df61a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 17:27:55 +01:00
Tobias Hunger
296543166b Vcs: Add scrollbar to AddToVcsDialog
This makes it handle adding a long list of files more gracefully.

Task-number: QTCREATORBUG-8467
Change-Id: I54dc0e405295694b4ea46ea426397223eb931722
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-06 17:12:48 +01:00
Tobias Hunger
b669ba9dce Subversion: Fix argument order when using --username and --password
These need to go after the subcommand, not after the "svn"

Task-number: QTCREATORBUG-13066
Change-Id: Id3de0af8b7b2f07159d5ddb1af2e5fa00dd0dbb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-06 17:08:24 +01:00
Nikolai Kosjar
5a1ffe6f1c CppTools: Remove ProjectInfo::operator bool()
This one does not buy us much...

Change-Id: I1d6c4667c038d319d2c16166505a386653a9f066
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-06 16:45:24 +01:00
hjk
ca151d07fa CPlusPlus: Use QVector<Token> instead of QList
Better suited to avoid the indirection (sizeof(Token) > sizeof(void *))

Change-Id: Ia5f42781e720ef6aa8161f8f81ae8ddd8e58c837
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-11-06 16:13:58 +01:00
hjk
cb1d040c32 ProjectExplorer: Avoid some needless indirection
ProjectExplorerPrivate::m_editorConfiguration has the same lifespan
as the Private itself.

Change-Id: I8037528bec44109b9cf076fa5daafcfab280b459
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-06 15:57:23 +01:00
Alessandro Portale
fded552bae Qt Creator logo: Remove one gradient
Change-Id: I4d44c110473da415bf1101da20d1f67f4ed183d5
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 15:24:02 +01:00
Alessandro Portale
a072fc55a1 Qt Creator logo: Fix the gradients
(they broke when changing the page size in Inkscape)

Change-Id: Ib5c4eed0c81ccde2ed2dcb2be57a9801eb85392d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 15:06:08 +01:00
Alessandro Portale
b67cb53d25 Application Icons
This adds one svg file with all Qt related application icons.

Change-Id: Ie9893e2baaef822c55348946f84600ea141d121f
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 14:36:33 +01:00
Christian Kandeler
45de9ee23f SSH: Add support for the recommended cipher modes from RFC 4344.
New OpenSSH versions do not support the (required) CBC modes out of the
box anymore, so let's add some CTR ones.

Task-number: QTCREATORBUG-13340
Change-Id: Ia3e38be3aab95be258e64396283736d246c8b93b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-11-06 13:41:46 +01:00
Orgad Shaneh
c0d6c7c54a Remove workaround for Qt bug that was resolved in 5.1.1
QTBUG-31569

Change-Id: I33ffc505a9a26f5cd338d7768f5f854ef3cccaca
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-06 12:43:46 +01:00
Orgad Shaneh
c1b92fea69 QMakePM: Try to set current node even if rename fails
It always fails if the file is included by $$files(*), but the new
filename is expected to appear nevertheless.

Change-Id: I4ae102372685013182b4471b996610e68cb7f751
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-06 12:43:41 +01:00
Eike Ziller
3f1deee5e1 Merge remote-tracking branch 'origin/3.3' 2014-11-06 12:38:37 +01:00
Eike Ziller
41db321a69 Find: Unbreak find/replace next/previous/all when focus is in tool bar
Broke with 222be8f2ee

Task-number: QTCREATORBUG-13351
Change-Id: I12cf4681dc9f264c46ee307d622a5aa74f6800c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-06 12:25:19 +01:00
Thomas Hartmann
454dc3ddc1 QmlDesigner: Crashfix
we have to check if there is a valid kit. Otherwise we use the
fallback puppet.

Change-Id: Id9682542d2961a616029fad57c2dc57b827c7605
Task-number: QTCREATORBUG-13350
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 12:07:32 +01:00
Thomas Hartmann
300f54260c Use always white as the background color in HelpViewer
Our css styling assumes white as the background color.

Change-Id: Ieeddf1eba5bb29cadf0f4da7c8ee6b14c5d1387e
Task-number: QTCREATORBUG-13300
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-06 12:07:26 +01:00