Commit Graph

39480 Commits

Author SHA1 Message Date
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
Oswald Buddenhagen
10e6c40e16 fix exclusion of qbs from tr()-collection
note that the TR_EXCLUDE is actually not used currently.

Change-Id: Ifc89587029e2c025d1e0253794668a515127a43f
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-09 16:05:49 +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
Robert Loehning
6e2782b8b0 Squish: Test first commit in git repo
Task-number: QTCREATORBUG-12755
Change-Id: Idf27f4bc19ec62ce10ca9367e0b32b8d2b031587
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-09 12:16:21 +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
a304229c42 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I8abb74b0a037efc550c52a209dc11e2a6ee5e6d6
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-09 09:23:31 +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
David Schulz
2e3ec6b680 ClangCodeModel: Fix expression to find lib dir.
Change-Id: I71362574d8437a7d95348c23eaf3698b7467b44d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-09 08:55:23 +01:00
Eike Ziller
084cd16541 Fix OS X file drops from Finder
This is a workaround for QTBUG-40449.

Change-Id: I24a3bfb78d49e94dcafb99ee6d6b36ef4c4299c5
Task-number: QTBUG-40449
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-09 08:38:27 +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
Robert Loehning
566aaba933 German translation
Change-Id: If9869a5d4e0999a7422a5e876ef4b69202b371e7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2015-01-07 13:40:22 +01:00
Eike Ziller
0eeb590fdf Locator BaseFileFilter: Iterator based API for list of files
There are situations where we can generate the list of files on the fly in
the worker thread instead of generating the full file list in the UI
thread beforehand. Change the API to support that.

Change-Id: I331336f4b019184ba0da311b66e6283029c612c4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-07 13:38:44 +01:00
hjk
94e8577852 Debugger: Display debugger type in debugger configuration detail page
Change-Id: I24432af08db8ead2a2b91059e795445e654ac5cd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-07 13:37:27 +01:00
Maksim Klimov
8276253558 TextEditor: Highlight and animate matching parenthesis for generic highlighter
Change-Id: I78db37a91f1770513fcb5192bf45623799e14e34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-01-07 12:38:59 +01:00
Aki Koskinen
7661ba74ed Prevent using an invalidated reference
Inserting to a std::vector (possibly) invalidates all iterators and
references for it.

In this piece of code tok is a reference to a member in _tokens and it
should not be used after an insertion is made to _tokens. Switched the
order of two code lines to prevent this.

Change-Id: Ia9d1ce66fc67406f56b426e7431402c6fe68a38f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-07 12:05:50 +01:00
Eike Ziller
a0715512ca Locator: Incrementally update result list
Instead of waiting for all filters to finish before showing anything.

Change-Id: I7178213af7c9fc02a4fbfb2ac78241158c365ff6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-07 11:52:34 +01:00
Leena Miettinen
e6f9443394 Doc: fix broken links to Qt 5 reference docs
Some titles had changed and the hash mark references
do not seem to work anymore.

Change-Id: I4ebb877a483eff0a11c32932cc84b6e15935dcec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 11:36:36 +01:00
hjk
46e5998081 ToolChainManager: Return ToolChainManager * from instance()
To make it usable with Qt5-style connect().

Change-Id: Ie83f7242bfc3592c8f2ab7333a99885ba1ae83f5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-07 11:14:57 +01:00
Leena Miettinen
48cfedf438 Doc: fix a broken link
A section title changed.

Change-Id: I514a7dd3d89cf0d042d10acc027edbbcc94859c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-07 10:37:46 +01:00
Raphael Kubo da Costa
6ff6edf8d7 Abi: Correctly set ABI information for the BSDs in hostAbi().
Add another #ifdef block for BSD operating systems so that qtcreator
stops complaining that it does not have enough information about the
host's ABI.

Change-Id: I5841e162eda7f34fa4a962ab1c035d1727613f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-07 10:22:33 +01:00
Leena Miettinen
3b86184d12 Doc: adding JSON-based custom wizards
Task-number: QTCREATORBUG-13642
Change-Id: Ie3af0d4bdef33364cc442449ccfb5e770c0c3a99
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-07 10:21:07 +01:00
Tobias Hunger
0902d36cb9 Vcs: Update connect syntax to Qt 5 style
... and remove noise.

Change-Id: Ie1c473e6fd08f671ba98796c810a3465d473b286
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-07 10:16:32 +01:00
Tobias Hunger
5afcf89a3c BareMetal: Fix warning
The this pointer was converted to a bool and clang complains that this
is always true (and most likely not what was intended in this code in
the first place:-).

Change-Id: I187fe8523d8fa2a61de7cc19cfabad589a613473
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-07 10:16:16 +01:00
Robert Loehning
77fa568870 ++year in copyright template
Change-Id: I0f2ae9d25a964c2feb9762fcd8ceca72a5f42d7e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-07 10:02:45 +01:00