Commit Graph

39344 Commits

Author SHA1 Message Date
Christian Stenger 8a29109fe9 ProjectExplorer: Fix possible accessing null pointer
Change-Id: I285437f8eb21ce9f1a32d631a9c75d32d5ab2859
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-13 08:30:50 +01:00
Jake Petroules 960b5b3bfa Remove QBS_INSTALL_ROOT env var. This is no longer needed by Qbs.
Change-Id: Idcf6d0ceffb35a2c3a28dbfb3757b8ca04133a15
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-12 16:32:10 +01:00
Eike Ziller b072bc8660 Show some helpful hints in empty editor views
Change-Id: I123147930244df38f436afd3ad8257b5f23e0d7a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-12 16:11:41 +01:00
Tobias Hunger 8bd53cfdc4 QmlJsTools: Fix typo in comment
Change-Id: I51cf21704c8a2b7ff8217aaf189a7ca66c2f24a6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2015-01-12 15:24:37 +01:00
Tobias Hunger 67a62183f0 BlackBerry: Make current project behave like it used to
ProjectTree::currentProject was changed, update the code to
get the old behavior.

That behavior is most likely not the best to have, but that
is for another patch:-)

Change-Id: I8c84825443b8383f738c237ec67332e62199fe5e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-12 15:23:18 +01:00
Nikita Baryshnikov 20e4f62eb3 Fix linker error in HighlighterEngine test
Complains on highlighter.cpp:213: error: undefined reference to
`Core::MessageManager::write(QString const&,
QFlags<Core::MessageManager::PrintToOutputPaneFlag>)'

Change-Id: I296a105a8322e8b6ac1ab4a7085500f76acfcdeb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-12 15:22:11 +01:00
Orgad Shaneh 24e257f5ed QmlProfiler: Fix compiler warnings on release build
Change-Id: Id6fde7279f80cdc7a74322bcee4e0ce41f7fc3bc
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-01-12 15:13:41 +01:00
hjk ec046eaa59 Core: Modernize PluginDialog style
Change-Id: I407fe2ec6753255cc5fad6014187cd592fe4aee1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-12 15:11:34 +01:00
Eike Ziller bae5782166 Add locator filter for all included files.
Collects all included files from any file of any project or
that is open in an editor. It has the same shortcut as the
files from any project filter and is also enabled by default.

Task-number: QTCREATORBUG-280
Change-Id: I7cd89ee68d2f8ec4e0ea03de0c11671f489c47dc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-12 15:06:20 +01:00
Eike Ziller 9c088727a8 Locator: API thread-safety improvements in BaseFileFilter
Make it possible to set or clear the file iterator while a search is
currently running.

Change-Id: I5309a8920057112375ce22e5fd24806fb6f09857
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-12 15:03:57 +01:00
hjk ac77a8d10e Debugger: Use Utils::TreeModel for breakpoints
Change-Id: I7f62f9d64daf7624794aa82495d4b2c8d97b33df
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 14:35:04 +01:00
hjk 2f17b74753 Debugger: Take advantage of new tree iterator in option page
Change-Id: I1a8e065cfaa57b49c852a3a1d67149447d4d87b2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 13:18:24 +01:00
Eike Ziller ac18f9f1d8 Fix Help index filter after recent refactoring
It was incorrectly updating cached results, so e.g. shortening the
search string was not forcing a new search.

Change-Id: Ie55fce72b7363258195423f5686f013aeafc7d57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-12 13:13:02 +01:00
Eike Ziller e40477cc81 ActionManager: transfer ownership from main window to core plugin
Also make a bit less dependent on main window:
- Menus do not need to start with main window as parent.
- Centering the presentation label on the main window is wrong in the
presence of extra windows anyhow. It should be centered on the active
window.

Unfortunately, actions still must be added to the main window, because
actions that are not children of visible widgets do not trigger.

Change-Id: Ibb99644a3723de476db465ebe6a9cdc0820ea692
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-12 13:05:17 +01:00
Orgad Shaneh dc86025879 GenericHighlighter: Display exceptions
Enables tracking of syntax/logic errors in highlighters.

Change-Id: Ia9c314d0a314ab49ca2045327e2d34c9e9d275c3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-01-12 12:59:18 +01:00
Eike Ziller b9597d402d Submit editor: Unclutter UI
The new layout that was supposed to give especially the files list more
space looked very unstructured with the different boxes in different sizes
everywhere.

Vertically align the description edit and file list. Even though it gives
the header much horizontal room, it has fewer visual breaks. Also use
MiniSplitter.

Change-Id: I62699d2b9e9142b9d2c3d01f29db9a3b49b79b00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-12 12:55:15 +01:00
hjk 737c327fd1 BaseTreeView: Fix connection.
Strings are not typo-safe.

Change-Id: I9fd0e0574fb51ea995037c7b22ff2a87b95f5965
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 12:51:12 +01:00
Daniel Teske 4be0d123e2 ProjectExplorer: Fix changing language via context menu
Task-number: QTCREATORBUG-11719
Change-Id: Ica2d822026adadf2293da158fa4b25ccdb7e1608
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-12 12:26:29 +01:00
hjk 7fd21d22ac ProjectExplorer: Use Utils::TreeModel for KitModel
Simplifies code.

Change-Id: I3db07f8b0ffd980856e65abee856559a0a85dfdb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-12 12:16:49 +01:00
Orgad Shaneh e62e47f0d0 Tests: Cleanup FileUtils test
QTestData converts raw string as Utf8.

Change-Id: I201f283ce16732dfc85927fdcc9bb15c230ec16f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-12 12:03:37 +01:00
hjk 14038d143b BaseTreeView: Add a way to let models request item expansion
Change-Id: Ib964af4411fe7665dcb0947b52fc100eacba6a16
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 10:29:57 +01:00
hjk 6ebdc18f98 TreeModel: Simplify indexFromItem()
Change-Id: Ief7f120ef27eb43746826da7c771b5f9a3f7ce8f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 10:29:42 +01:00
Orgad Shaneh c6a983d271 Core: Use FileName for file path in IDocument
Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-12 10:23:37 +01:00
Orgad Shaneh 9c1b28fec2 Core: Pimpl IDocument
Change-Id: I157383b24add5dd5f255323a15c500b48c94a23a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-12 09:07:27 +01:00
hjk 39c7472862 TreeModel: Add good old ModelTest's code
Currently #if'd out, but takes only a one line change to enable
quick testing. Tests pass with the included change to flags().

Change-Id: I6dca376f162ad26e8ce6de65241e56497ff7267e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-12 08:49:05 +01:00
Tom Deblauwe a700e625ef cmake: Fix finding corresponding source directory from build directory
When trying to find the corresponding source directory for a build directory,
it is better to just read it out of the CMakeDirectoryInformation.cmake file
found in the CMakeFiles subdirectory of the build directory, instead of
guessing it using the relative paths.

Change-Id: Ie96b3255a27f46bcd7f0ab1566dfb91ac52f3be9
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-11 18:26:26 +01:00
Christian Kandeler c0670b120b Update qbs submodule and do the necessary adjustments.
Namely:
    - Expose the new build options in the UI and document them.
    - Remove the default deployment step.

Change-Id: Ic2c9fd93276ab925effe327fac38642d2153f6cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-01-09 17:20:48 +01:00
hjk 3d0537fa8a TreeModel: Add function to remove all children of an item
Just convenience.

Change-Id: Ieff2291ca63584cfa113a24cc2930adc3e764d08
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-09 16:52:24 +01:00
hjk 82c2f51a29 TreeModel: Make debug help code less intrusive
Has not been needed for a while.

Change-Id: I141725d77343c4afa9907fde6af8e283f2744c88
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-09 13:49:00 +01:00
hjk 94b8a21fbf Utils: Add TreeModel iteration facility
Change-Id: Iaf115377de0e5fc0b004d5ea8ddc5c6eb31b5b6f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-09 13:48:03 +01:00
Daniel Teske 4eecf47903 Android: Preserve settings on upgrading the qt sdk on windows
Only override a setting from the sdk provided settings file if the
sdk settings file contains the setting.

Change-Id: I29a0f88d5075bfe432eb89c90fb959ef984e17b6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-09 13:06:58 +01:00
David Schulz 113bdf11ed ResourceEditor: Use open with menu from document manager.
Task-number: QTCREATORBUG-13723
Change-Id: I4acc8bd0c2b9fa9c6c4c82008a20c44e5d6055ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-09 09:45:02 +01:00
Christian Kandeler c5c7b79b65 Help: Fix qbs build.
Change-Id: I9ec359d6c2c38ad832fa0215bd41a92a33109bb5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-09 09:22:49 +01:00
hjk 62f19feef6 ProjectExplorer: Use Utils::TreeModel for AddNewModel
Less code.

Change-Id: If02cf7685a1b37be4887ebe21a9c8b55079308f2
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-08 21:41:22 +01:00
Orgad Shaneh 384641d798 Suppress "file outside the project" warning when there is no project
Change-Id: I46f6e38ba167a85b17ae9f7ac89d5fbbc75abfcd
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-08 13:59:57 +01:00
Eike Ziller 9007d2cb33 Help index filter optimizations
Move retrieval away from prepare search, and do some caching. Also split
the keyword search into individual chunks per help database that are
executed on the UI thread individually.

Change-Id: I0b8fe4abfc3cba46620985752d3d90638e10512f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-08 11:27:10 +01:00
Eike Ziller 61cea1a445 Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator 2015-01-08 10:39:02 +01:00
Eike Ziller b5b47f7df2 Merge remote-tracking branch 'origin/3.3'
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
2015-01-08 10:38:20 +01:00
Kai Koehne b650bf7d1f Revert "don't LoadPostFiles in build_pass reader"
The change broke the parsing of DESTDIR for debug_and_release configurations on Windows.

This reverts commit 1304c08764.

Change-Id: I3ddb768658398ea914929078554c0dfbbfe505a3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-01-08 10:35:48 +01:00
Christian Kandeler d698a47887 Timeline: Fix qbs build.
Change-Id: I66aa7316a68035e68652645a6fc3e3d0f406c8e2
Task-number: QTCREATORBUG-13773
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-08 10:28:38 +01:00
hjk 0a5186700c ProjectExplorer: Remove some unneded declarations
Change-Id: Ie6ca99c032b40e6baa7dc1149ebc2a945af025ad
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-08 08:09:21 +01:00
Orgad Shaneh ecd9c4c813 Dumper: Fix some more internal dumpers
Change-Id: If17614d1fa451bb93cfe5a6ea06af39986d7ad4d
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-08 08:04:23 +01:00
Tasuku Suzuki 9cdede0174 Fix a typo in share/qtcreator/static.pro
Change-Id: Ic5ef242c0cd66a857ab3625ee4f870555d27d415
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-08 04:44:11 +01:00
hjk fdc2491fdc ProjectExplorer: Use Utils::TreeModel for ToolChainModel
Simplifies code.

Change-Id: I2363d4dd767d9b3badb1b8ce3205a9f80e0bb8ff
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-07 18:10:00 +01:00
Eike Ziller de3c3454e9 Welcome: Fix compilation with QQuickWindow
broke with 0be4f01ccc

Change-Id: I3f34894d00cf5d9c505b9cb836a1aa82879e4284
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-07 17:48:18 +01:00
Kai Koehne e83388a5b5 Remove what's this button from Plugin Error dialog
Change-Id: I713bb7608f06b5ce31d63f07149bac94f0b20a53
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-01-07 16:21:48 +01:00
Aki Koskinen bfbcce94c5 Fix a few memory leaks
Some raw pointers never got released.

These errors were found by running QtCreator via Valgrind.

Change-Id: I9c5b2862b98597f3e468d573e7126d7d9ec46b05
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-07 16:12:37 +01:00
Kai Koehne 8891318eef Fix build for MSVC
0eeb590fdf causes errors because the list iterator constructors
are not exported.

Change-Id: Id1c1463f7982e23d815fbe4c0f28a09ed9ace72c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-07 15:52:14 +01:00
Christian Stenger 91fabc4868 CppTools: Fix hanging test on OSX
Temporary directory is created in a folder having a symbolic link,
verification was done with the unresolved path and failed.

Change-Id: I40c943a307fe136a0f3f6fdbea5145296a63a19e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-07 15:21:18 +01:00
Robert Loehning 89ca18e4d7 Further string fixes
Change-Id: Iab93aea9e7ec17dd8196a957f90beb1ee3179605
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 14:34:29 +01:00