Commit Graph

32962 Commits

Author SHA1 Message Date
Fawzi Mohamed
6fed775226 qmljs: do not warn for QT_TR* functions
Change-Id: If5cf78434458ae639b4ebd0cb156110b5a291613
Task-number: QTCREATORBUG-12494
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-06 11:40:19 +01:00
hjk
17fd4d8853 CppEditor: Fix off-by-one in string literal auto splitting
Task-number: QTCREATORBUG-13272
Change-Id: I343eb2b8b3a42c0090856f038254908611f25155
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-06 10:47:20 +01:00
David Schulz
4e475fb5e6 BinEditor: Close removed files silently.
The file cannot be saved as creator just
holds a chunk of the file.

Task-number: QTCREATORBUG-13014
Change-Id: I53c79f4ca5102673e66c5bd3f901c373ec8e0d90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-06 10:19:33 +01:00
hjk
e5a174a353 MacroExpander: Remove unused method and include
Change-Id: I6f0d9656efcea7bcaf6552ae20bd9cd0acbe46f6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-06 09:37:58 +01:00
Thorben Kroeger
cf45c854e0 Theming: allow to override base style
Change-Id: I48e2d03b83fccf3d6eb4b508bd77912dbdaea1d0
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-06 08:40:57 +01:00
Thorben Kroeger
82bbc6f562 Theming: Allow to apply theme palette globally
Change-Id: I709bd6b6c566e016731af1fb94ddaef6326ef485
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-06 08:40:49 +01:00
Orgad Shaneh
6a8fddc401 Fix MSVC2010 compilation
Change-Id: I62378e088c9a212fedd752b43ed9b3b9e1a18d73
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 23:07:17 +01:00
Lukas Holecek
ab1159096d FakeVim: Refactor cutting text
Change-Id: Iea371c67c67c9a810ee47aec98e18297993098b2
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-05 21:25:03 +01:00
Lukas Holecek
5458fdee72 FakeVim: Move common movement operations to functions
Change-Id: I06dce44098a535e0d8f49d885b77a4f07731288b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-05 21:19:26 +01:00
Lukas Holecek
743e1ca67e FakeVim: Don't change cursor column after 'yy' command
Change-Id: I44b61dfc6a03fba242c8d9d42d483806ca9d85ce
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-05 21:03:32 +01:00
Volker Vogelhuber
6d0591090d Allow overwriting of default executable deploy targets
Change-Id: If704160a6ca5dbb862ebe4f6a1479aa749f42451
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-05 20:40:17 +01:00
hjk
bbdf1dae3e QmakeProject: Add macro expansion to desktop qmake runconfig widget
Change-Id: I434b7308c927c65280671ec7eb4e4dbad92edd6a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 20:38:48 +01:00
Thiago Macieira
c080f68300 Fix linking with the Intel Compiler for OS X
ICC does not understand the -sectcreate option. Since this is really
just a linker option, use -Wl to pass it to the linker. This works with
Clang too.

Change-Id: I3edff1a856ba235a60984c745fc144b4046cad77
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 19:48:18 +01:00
Tobias Hunger
1ef3d9dff3 Subversion: Bump minimum subversion version to 1.7.0 or later
Change-Id: Iaca84fb6b5c218f37ce415e72d409893c2306254
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 18:10:18 +01:00
Tobias Hunger
2669813c77 Subversion: Offer to trust server certificate on import from SVN
Task-number: QTCREATORBUG-3753
Change-Id: I60ae8cbefa494b0b530afed54bd51ce8df23e475
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 18:08:48 +01:00
Orgad Shaneh
ef0eca53d7 ThemeEditor: Preselect widget style on edit
Change-Id: I9992d595fc5995c9dbd9f244744b80f93548e942
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 17:56:26 +01:00
Orgad Shaneh
0c95024c9b ThemeEditor: Fix some style issues
Change-Id: I43e96ec0633cfbc3606969af3e44e2dd994c49ff
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 17:55:36 +01:00
Tobias Hunger
97e9760a9a Subversion: Do not treat all numbers in log/annotate as revisions
Be more picky about what we consider to be a revision.

Task-number: QTCREATORBUG-11845
Change-Id: If6dc68a564376df7dd26a0e996c74f7ebcc29177
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 17:47:57 +01:00
hjk
b94a6a0537 Set up hierarchy of ProjectConfiguration macro expanders.
BuildConfiguration asks Target,
Deploy and Run ask either activeBuild, or Target.

Change-Id: I3845cfbd16de7b85268d83b5324865ff24482152
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 17:44:39 +01:00
Jake Petroules
368b2acaf0 Qbs: set cpp.platformPath for OS X and iOS profiles.
This is an (effectively) required property which is necessary to locate
a number of SDK tools.

Change-Id: Ia4912e383a053c7abcbd47715cf4b130c4fbafd6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 17:43:42 +01:00
Jake Petroules
b5f4899220 Make a few simple changes towards 64-bit iOS support.
Change-Id: Ia931f98f6f155a619b9d3efa5777d0c30e62adac
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 17:41:52 +01:00
Eike Ziller
d8edeb1e38 VariableChooser: Fix closing with Escape key
Change-Id: Ibf0f344d50941255a28c19cf6914521c1c7b0cf6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-05 16:46:16 +01:00
Eike Ziller
222be8f2ee Find: Fix wrong target of (replace) next/previous actions.
They were always triggered on the find support that had the find tool bar,
even if the focus moved to a different one and even if the find tool bar was
not visible.

Task-number: QTCREATORBUG-11587
Change-Id: Ica7ef6275dc8a7e0e8b974c2796651c9ca7809a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-05 16:45:07 +01:00
Eike Ziller
515c6d3a88 FindToolBar: Refactor opening the tool bar
Introduce flags for what to do instead of doing much of the
logic itself in that method.

Change-Id: I3ee38e39549e1267c55c94c3a93211492eb2e2f3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-05 16:44:20 +01:00
hjk
61c4f8d80e QtSupport: Add macro expansion to custom executable config widget
Change-Id: I3a36b4bc8e4abca8b9b71558f303ac5019cbe23c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 16:43:26 +01:00
hjk
edd960a012 Add way to recursively link a variable chooser to suitable child widget
Change-Id: Id4937fc4367cca96833c46db87e37ed6524bda0a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 16:43:15 +01:00
Eike Ziller
61ae85631f Escape key: Fix more cases of closing find tool bar
1. Close find, but not output panes, if pressing ESC while focus is in
the editor that has the find tool bar

2. If find tool bar is visible anywhere else (e.g. in the navigation
panes), close it together with the output panes (it was not hidden at
all in that case).

Change-Id: Ia91900144c9f31ec53d1a046aa2972ac22b1a6b6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-05 16:13:12 +01:00
jkobus
2a9c9f2d70 Hide some diff editor controls when diff editor is bound to a file.
Remove unnecessary anymore "ignoreWhitespace" argument
from functions which read a patch file.

Transfer the ownership of reloader into controller.

Task-number: QTCREATORBUG-13250
Change-Id: I68183005b845d6ece9ea2be9888abc8597310426
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 14:38:51 +01:00
hjk
f406a38ca7 Provide %{buildDir} macro expansion again.
This was a regression introduced during the macro expander rework.

Task-number: QTCREATORBUG-13260
Change-Id: I9fd28c6a522faa11992931f937dd0b0eb779f419
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-11-05 14:37:44 +01:00
Tobias Hunger
7d417271c3 Subversion: Make sure commit messages are handled as utf8 encoded
Change-Id: Ic53e29111578d5813379843458671d90d586dc58
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 14:34:09 +01:00
hjk
6d28a58e94 Nicer error reporting for infinite recursion
Change-Id: Idf0adfe70f46c7062ccdc0cbea309f47c5fca89e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-05 14:01:41 +01:00
Orgad Shaneh
c4e2e42a82 Create "Other Languages" category for Python and GLSL
Reusable for other foreign languages

Change-Id: I264ad145601850397702d5dd656b77d495661eb8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-05 13:40:02 +01:00
hjk
d302d40ec4 Use better context and simplify macro expander translations
Change-Id: Ia05936f6c461b1b8208481588f1a2ac114c32ec9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-05 13:38:23 +01:00
Daniel Teske
df6ace109e SessionManager; configureEditors on project opening/parsing
So far editors were only configured on opening, which meant that if a
project was opened after the file was already open, the editor settings
were wrong. This commit fixes that by connecting to project opening.

Also due to changes in how qmake projects are parsed on initial opening
the project has a empty filelist. Connecting to fileListChanged() fixes
that too.

Task-number: QTCREATORBUG-13299
Change-Id: Ia648818c8c0adb9c6e5047b8c855b1f6790a7ae2
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-11-05 13:38:17 +01:00
Tobias Hunger
403f55a517 Subversion: Remove some dead code
Change-Id: I6f94ecdfb003eac9cc1eaf4460bb4d4a07e883f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 13:18:19 +01:00
Nikolai Kosjar
85ead5f0da CppEditor: Remove invalid QTC_ASSERTs in signature synchronizer
They were triggered for

    void f(void);
    void f() {} // add space in parameter list to trigger

Change-Id: I410f3ac13380429a1803b95576afa92fef1fe4cf
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 13:13:55 +01:00
Nikolai Kosjar
d23d81f951 CppTools: Locator: Do not index *.moc files
The symbols of these files do not provide much value.

Change-Id: Ie81b12dc795c068742600e272807f9e6a87609ea
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 12:58:43 +01:00
hjk
1c12b30bef Prevent indefinite recursion in macro expansion
Task-number: QTCREATORBUG-13315
Change-Id: Ibf963569bdebf8a791f0a7ceb8cd010efed99dad
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-05 12:30:46 +01:00
hjk
bb81a61814 Provide a facility to hide macros in the chooser
... and use it for the Current* fallbacks in the Kit expander.

Change-Id: I1d346aa56647f6d3030bd4384eb89e2a27db6418
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 12:05:18 +01:00
hjk
a12344ce61 MacroExpander: Minor interface cosmetics
Change-Id: Id6963a6ef29478db85c92c4d557f823502e173a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 10:42:59 +01:00
Leena Miettinen
b93ba85c58 Doc: new QML code syntax check messages
Edit the new messages and add them to the Qt Creator Manual.

Change-Id: Ib494fd20861473ea824dd0d4260cad621c4081a4
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-05 10:40:15 +01:00
Orgad Shaneh
c456968b07 Mercurial: Fix highlighting
* Hash is not a comment, "HG:" is.
* First line *that is not a comment* is a summary

Change-Id: If4e3428bfd4461dc105583a998be5d8185be3ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:47:38 +01:00
Orgad Shaneh
f0a6345fde Mercurial: Use TextEditor::SyntaxHighlighter
Change-Id: Ic215b778a6365d8bce5cb8eeb0d016d8ce80e476
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:47:34 +01:00
Orgad Shaneh
697f70cb33 Subversion: Show output on commit
Task-number: QTCREATORBUG-12929
Change-Id: I6b395a2bed6c90ac5ba62a7732c99a5cd763599c
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:34:35 +01:00
hjk
3607866ac1 De-pimpl Macros::Internal::MacroEvent
Less code, less cycles.

Change-Id: I1bbc2d5050fd29f199c12120d183f84c686953fe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:33:19 +01:00
hjk
f80e580003 Avoid Id->QString->Id round trip in macrohandler setup
A minor glitch in the startup profile.

Change-Id: I2195530e922b3fb37dbfadc800933a9378491833
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:33:12 +01:00
Tobias Hunger
16844e1fbc Subversion: Add vcsTopic
This partially addresses QTCREATORBUG-12929 which is about svn commit no
longer showing output which does include the revision number

Change-Id: I149f1fea05a63cc80625ba5e02c10edbce471e1a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 09:32:57 +01:00
Orgad Shaneh
ace663a5be Mercurial: Properly cleanup commit message
Change-Id: If035d3a2476408d3c54aa30f9b276bc5921845b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-05 09:32:18 +01:00
Tobias Hunger
0ee23c2313 Subversion: Allow describing the initial commit
Change-Id: If99b9d2bdd2f21d605beb39e65a4188f1b45ffc5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-05 09:27:22 +01:00
Orgad Shaneh
fb68072b94 Valgrind: Callgrind log is not XML #2
Complements commit 1840a89aff

Change-Id: Idf09e77ae766aa43683ffaf0a7aa108f4b41d705
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-05 09:22:45 +01:00