Commit Graph

32962 Commits

Author SHA1 Message Date
Eike Ziller
70ee1b7312 OS X: make qt version name field in options grow
Change-Id: I37294d794d91ce7198a9a8da9d2e8b1782d97fbb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-24 16:27:58 +02:00
Ulf Hermann
0cdbd78554 QmlProfiler: Properly initialize features bit field
Change-Id: Id3d0c1a7993b862b46d79af5cccb39c3f3836570
Task-number: QTCREATORBUG-13238
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-24 13:41:30 +02:00
Tobias Hunger
b159d740fa JsonWizard: Replace Python class wizard with a JsonWizard
* Remove Qt4 support.
* Remove some UI options that did not do anything in the original wizard

Change-Id: I9647cbc6cd0958a02df5b2fe480b9c8069249521
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 13:38:33 +02:00
Daniel Teske
b9a7cfcaa1 Detect qt sub projects and special case their build directory
Check every project's path against the source paths of all existing qts.
If we find a match, make it build in the right place by default.
Works for both in source and shadow builds.

Note: There's a quadratic algorithm since foreach kit we check against
all qt versions. That's unlikely to be a problem and non trivial to
fix.

Change-Id: I9f3456f3e835ee6adc35c26fe5c328c01387a8aa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 13:24:58 +02:00
Robert Loehning
880b7625ec Fix compile
Done-by: Daniel Teske <daniel.teske@digia.com>
Task-number: QTCREATORBUG-13254
Change-Id: I51da8cd76ac2f2315bf8fd74f58e28a1980c98de
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-24 12:35:10 +02:00
Eike Ziller
7735dd6e94 Qt version: Fix macro usage in default display names
The variables were changed to start with uppercase characters

Change-Id: I0173e5c943395aa2729d873f9ef7e5d860e906ec
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-24 11:56:12 +02:00
Tobias Hunger
75da1cb884 GccToolchain: Fix language variant detection
We got new C++ variants and need to adapt the logic to handle those.

Change-Id: I507628de8762f92894cbdb74244e915ea0ac4c64
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 11:43:43 +02:00
jkobus
2e364c1506 Fix reloading of patch files
(cherry picked from commit 37ddb4e9eb)
Change-Id: I06c41eb802b0a3318da3ddfa72bd3575c02867fa
Task-number: QTCREATORBUG-13241
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-24 11:41:16 +02:00
Ulf Hermann
4889239479 Debugger: notify engine if remote process finishes on android
This prevents inconsistent state and error messages if the USB cable
is removed while the application is waiting on a breakpoint.

Change-Id: I769dc5fda2775e69365d8d8a5151e67c53e3237f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-24 11:03:03 +02:00
Toralf
2adc5c5dc6 Add CVS directory actions
This update introduces options to run "cvs update" and "cvs commit" on
a directory-by-directory basis in projects with multiple directories.
Two new entries are added to "CVS" menu: "Update Directory" and
"Commit Directory", which start the appropriate actions with the current
file's directory component as argument.

This might make it easier to control what exactly is synced with
the repository when working on a large project.

Task-number: QTCREATORBUG-13186
Change-Id: I620827211ca272403f1f0f99ebd8e61a096557d3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 10:01:49 +02:00
hjk
65dbd73ae2 Clean up QmakeProjectImporter
Mostly namespaces, an unused variable, ...

Change-Id: Ia2b879873eae7cb25f796f6bcf18b10bf3de1ff6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 09:58:54 +02:00
Tobias Hunger
746882f571 Kits: Avoid some more calls to displayName()
Change-Id: I9096e2e762d52b55bf5d71b77666708fc7c7eb5a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-24 09:58:46 +02:00
jkobus
37ddb4e9eb Fix reloading of patch files
Task-number: QTCREATORBUG-13241
Change-Id: I2785343ca94c19597ad954f2d35f8bf6536b0956
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-24 09:51:11 +02:00
Tobias Hunger
386f302995 KitManager: Introduce sortedKits() method
This allows to delay the evaluation of displayNames (which might be
expensive now that we expand them) to when a sorted list is actually
needed, thus speeding up the start-up of Qt Creator.

Change-Id: I78273592bc0f8311372f8d799faf9e1289759013
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-24 08:17:16 +02:00
Orgad Shaneh
6c139bd62b Fix compilation
Change-Id: I298f5d655f69597920994d8d5efc1b67f1bd72bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-23 18:43:07 +02:00
Tobias Hunger
acd0d02e28 TaskWindow: Do not print negative badge counts
Simplify logic for calculating badge count: Just use the number of
rows in the filtered model instead of doing this ourselves. That
should stop the count from ever becoming negative.

Change-Id: I8107f8649ae8178128760d8938412d230fbaf11d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-23 17:05:26 +02:00
Tobias Hunger
3cb4f6dbf3 JsonWizard: Make TargetSetupPage available to JsonWizards
Change-Id: I59cf128635c28f5cbc45336bef82f63ee5da4e6c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-23 17:05:19 +02:00
Tobias Hunger
06d7d58c88 JsonWizard: Clean up page factories
Improve error reporting and remove useless setup code.

Change-Id: I97e9fba0aa1cf6bb2cba26f70d46d1ba87bbd192
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-23 17:05:14 +02:00
Tobias Hunger
72f0b52555 JsonWizard: Add page to query for project parameters
Change-Id: I76fad7fd563af6c33b117f1256fa06c22c4240df
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-23 17:05:10 +02:00
hjk
9ba17acc80 Debugger: Replace debuggerCore() by equivalent free functions
One indirection less on the user code side, and easier to export
if needed (partially addressing QTCREATORBUG-13187)

Change-Id: I13ab9f471a3a34da7a6331aefc83f6d02413bfab
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-23 14:12:33 +02:00
Orgad Shaneh
6b4c254bf3 Theming: Fix light colored find widgets style
It is used when e.g. searching the environment widget.

Change-Id: I203b9f5e280a8f18f7a38f8e4d7b4540c79f932c
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-23 13:57:37 +02:00
Francois Ferrand
7e544073c0 CppTools: restore C++ diagnostics messages.
The messages were computed, but not added to the document.

Change-Id: Ibeea802cf9f291ad14b2fe2e9d2a285c927a4449
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-23 13:39:02 +02:00
Francois Ferrand
a645f78cd6 Add API in texteditor to let plugins contribute extra selections.
Some plugins use extra selections to provide additional editor annotations: code coverage, spelling
mistake... This was possible for C++ editor in previous version, using
CppModelManagerInterface::setExtraDiagnostics(), but this API has been removed.

This commits adds alternative API directly in the editor, allowing to pass a Core::Id instead of
the enum value.

Change-Id: I3040bd144d6fe0876d861dd28e832729bd5d6602
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-23 13:15:28 +02:00
hjk
8eb08db536 Add MacroExpander member to ProjectConfiguration
Some derived classes already had one, at times.
Make it uniformly accessible in the base class.

Change-Id: Iccb7ebf9d163daba46a01ae5de150af4a883fad6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:59:02 +02:00
hjk
3ce62fc59e Dissolve KitMacroExpander class
It's a normal MacroExpander by now, with some extra setup code that's
used only in one place.

Change-Id: I97244b93d5c165245b02748508c7fdef1b191582
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:58:43 +02:00
hjk
0e53554dfb CppEditor: Simplify handling of comment splitting
Change-Id: I9a6e4962b52321313bb80cc3c3a77fac80aa0536
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-23 12:58:20 +02:00
hjk
d5246a069b Remove KitInformationMacroExpander
Neither used nor needed anymore.

Change-Id: I5f55af10eb5fe8aa4109c1fe0fc9f764f51c6b4a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:57:53 +02:00
hjk
eb64f214cf Adjust ProjectMacroExpander to not use resolveMacro
This can rely on subexpander and the global expander now.

Change-Id: I994c7f930322f45cdb57799b0d03ab822cd73bd3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:57:46 +02:00
David Schulz
84dd24e243 CdbExt: Version bump to 3.3
Change-Id: I168fb29bab905a9bfad427ab9ed6ebdf0067e28a
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-23 12:52:50 +02:00
hjk
cd53defc5d Restore JsonWizard expander functionality
Task-number: QTCREATORBUG-13229
Change-Id: I91fd996cdbf5f3e71bdf817e9c5beebbb007681b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-23 12:43:57 +02:00
Francois Ferrand
acf79d7fc6 CppTools: Fix C++ diagnostics hightlighting.
When the length of the highlight is specified, the code does not properly
check for end of line. This causes some lines to be highlighted when only
the last word was supposed to be.

For example, with this code:
   1: void foo(int x);
   2: int a = foo
   3:            ();
   4: int b = foo(
   5:             );
line 2 and 4 used to be completely highlighted (underlined), instead of
just 'foo'.

Change-Id: I40e895410ce0f38bad0adbccd509fd2943c93c97
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-23 10:51:54 +02:00
Orgad Shaneh
4b44d2c6c5 Fix MSVC2010 compilation
Broken in cabf14ba30

Change-Id: I83da1254ceb4636f2b75f5ef75c9f790fd13f140
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-23 10:17:30 +02:00
Eike Ziller
7d475b78c5 Help Search: Fix re-index button
The re-index button was connected to the wrong help search engine.

Change-Id: I945853886a8cb0462eef71d22c48a1ac92c1eec1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-23 10:16:26 +02:00
hjk
cabf14ba30 Debugger: Use Qt5-style connects in DebuggerKitConfigWidget
Change-Id: I1cac24387cc74ade9113b4ecbe503871e9c6150b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 23:15:49 +02:00
hjk
fd48d5e740 KitInformation: Compile for GCC 4.7.2
Work around compiler bug.

Change-Id: I2ed209ff7920fc54cdcd89f8beb601fc85909478
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 22:40:44 +02:00
Eike Ziller
0fb6e31c20 Help: Save home page in Qt Creator settings instead of help collection
And do not save the default page anywhere at all.
This simplifies the logic, and makes the setting independent of help
engine initialization.

Change-Id: I264903229e274a0bf25c18b33734d36432aa525f
Task-number: QTCREATORBUG-13198
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-22 16:07:53 +02:00
hjk
6f570684e0 Capitalize macro names
Change-Id: I6492d625ede6c4425e5dd4b6f19a327f1931f64c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-22 15:10:05 +02:00
hjk
2a240b8fab Make DeviceKitInformation available to macro expander
Change-Id: I49344683f2a5d80d6191e996161d70cd9fe5e2dd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 14:26:10 +02:00
Eike Ziller
8c6e561a64 Variable chooser: Handle geometry updates of (line)edit
The setTextMargin call which makes room for the button, can result in
sizeHint changes of the line edit, and therefore in relayouting and
geometry changes.

The patch also moves the escape key handling to the (line)edit instead
of unconditionally the focus widget, since there is code to hide the
chooser when the focus widget is not the (line)edit anyhow.

Change-Id: I687307985ca95e63c16086b8e77c371f642ab060
Task-number: QTCREATORBUG-13221
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-22 13:55:37 +02:00
Daniel Teske
be4a581e8c ProjectTree: Fix saving of tree expansion state in session
Change-Id: I747b36b0f6a63dcf60eebd95cb1acf72e1629c1c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 13:29:15 +02:00
Daniel Teske
dd93301b73 AbastractProcessStep; Check that creating the build directory worked
Task-number: QTCREATORBUG-13217
Change-Id: I26ac5db79c0e1b6556d085648f9ebc71efae015d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-22 13:28:40 +02:00
Eike Ziller
1d414e8dbd ClassView: Simplify code
Change-Id: I7b69ff062222c44ac11c4961c3a221917df73df2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-22 13:14:18 +02:00
hjk
ce0fe84208 Debugger: Remove the special do-nothing-if-not-moved far enough
The problem are tooltips not triggering, not triggering too often.

Change-Id: I707f3c5014bde310e778c6c4d604aeb4e5b8f7c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-22 13:03:26 +02:00
Christian Stenger
63e6612f17 ProjectExplorer: Fix compile for older gcc
Issue was introduced in 5003bc60d0ec8188e0f4b9458b821fb7ffb55de9;

Change-Id: Ibe016f884e4eea8093173ced497ee4c62f1265c3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 12:31:10 +02:00
Nikolai Kosjar
7a3c942f35 CppEditor: Merge AddIncludeForForwardDeclaration into AddIncludeForUndefinedIdentifier
* Fixes multiple addition of same include.
* Takes over the check of AddIncludeForForwardDeclaration for forward
  headers.

Task-number: QTCREATORBUG-9704
Change-Id: I84629d35ae433385942a9157e5d32ef04159d07f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-22 11:58:48 +02:00
Nikolai Kosjar
65e9da282f AnalyzerBase: Fix opening links with Windows drive letters
Change-Id: Iba365f9abeff2573296295e50a6100cc480374b4
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-22 11:58:31 +02:00
hjk
26bf2caa59 Add Kit ID to macro expansions
Change-Id: Ib44c93c6708ac651f1140c2654d89344a1b12b2c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 10:54:21 +02:00
Francois Ferrand
24626a6835 Use tab width in search results.
Task-number: QTCREATORBUG-2042
Change-Id: Ie1769cb44f60da8ef6b26d5d27f9c7a600534f6b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-22 10:42:38 +02:00
hjk
edc08ba2bc Move uses of ProjectMacroExpander closer to build configuration
All static functions, can live closer to related code.

Change-Id: I54c5680256c78f1d09b4bee3e8843b2f4350b75a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 10:21:46 +02:00
hjk
5003bc60d0 MacroExpander: Set the "legacy" global project values directly
This currently duplicates a few lines, but lets us address the
"better" context-specific case properly later.

Change-Id: I0e8249823d4f6d6e8f3a5f4c86b2cb0410ae3195
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 10:21:32 +02:00