Commit Graph

31174 Commits

Author SHA1 Message Date
Erik Verbruggen
033ad8875b C++: handle file type changes for choosing highlighters.
If the file type (mime type) of an editor changes, it might need a
different kind of highlighter/highlighting-support.

Change-Id: I470dbf69e71856c9593d201416c4d4bd2958aaec
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-15 15:05:58 +02:00
Daniel Teske
dc4822d123 Qt Quick Wizards: Prefer mobile to desktop kits
This also affects the Html5Wizard. Compare to code in
BaseQt4ProjectWizardDialog::addTargetSetupPage

Note: The selected platform refers to the "filter" combobox in the top
right of the new project wizard.

Change-Id: I0d7d5162a2693ea0ced03f928fa7c4d67a4ac164
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-15 15:01:03 +02:00
Daniel Teske
67e91ce3d9 TextEditorActionHandler: Remove virtual keywords
No class derives from this, so the virtuals are not needed.

Change-Id: I251abc32cef6f4aacf39f31af1106eeebd8fe31e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-15 14:58:25 +02:00
Daniel Teske
386923faf8 Remove glsleditoractionhandler
The class is used nowhere.

Change-Id: I6676208aa3bc0e212d18ed71ec858e8969cf0832
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-15 14:23:10 +02:00
Daniel Teske
cb9c6c9fee QmlJsEditor: Remove qmljseditoractionhandler
The class is not used anywhere.

Change-Id: I9bce8416ee24d8b3d1d9696ce2dd894100ba04df
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-15 14:22:44 +02:00
David Schulz
70336e3080 Debugger: Add CDB symbol cache option.
Change-Id: I9c4ec9bbcc0216271d6e4d10e9f6e925d3569cea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-15 14:02:17 +02:00
Oswald Buddenhagen
1bf0343acc export includepaths needed by the existing includepaths
some really nasty interdependencies here ...

Change-Id: Ifa3eee67b174b7481ae777b6b3b8b9a54440fa4c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-15 14:00:25 +02:00
Tobias Hunger
572045324b CustomExecutableRC: s/Command/Executable/
A custom executable RC should have an executable to set up, not
a command. That is more consistent with the other RCs, too.

Change-Id: I7d71f9f93cd8294132a65fadf2e7a8885143c19d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-15 13:39:57 +02:00
Lorenz Haas
d25c5f35ca CppEditor: InsertDefFromDecl: Hide when definition already exists
"Add Definition Inside/Outside Class" was wrongly shown when there was
already an definition outside the class.

Change-Id: I6409080c6a1a3abdd4511f7db14ecb4f63458411
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-15 13:39:32 +02:00
Lorenz Haas
17a81ae106 CppTools: findMatchingDefinition handles const and volatile
Strict set to true, SymbolFinder::findMatchingDefinition will now also
check, if const and volatile matches.

Changed return type from 'Symbol *' to 'Function *' since only functions
are returned.

Change-Id: Ib55cb12b6c404e94fcefd0613b964e8caa425690
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-15 13:36:13 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-15 13:35:01 +02:00
Erik Verbruggen
aa3aa7c455 C++: Fix unused field warnings in test.
Change-Id: I898668a91eb7d3fa18c0a8d3e7e7507f0fb5a917
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-15 12:35:59 +02:00
Leena Miettinen
9c23900f55 UI text: fix debugger related strings
Fix capitalization and punctuation. Make some strings shorter.

Change-Id: Ic018d9905d855c6694d3d63e703e772d63d75c71
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 12:31:27 +02:00
Robert Loehning
bbee7310c1 Squish: Remove workaround
Change-Id: I8c42ae2d67a2eac292c4c1ca4de75ec59b060ec3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-15 12:22:20 +02:00
Joerg Bornemann
6901f678b2 set Qt.core.frameworkBuild only if needed
Change-Id: Iceddd57c82269f4bde1643c6c2f9a3aab164fd47
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-15 11:45:19 +02:00
Thomas Hartmann
7d25b90908 TypeDescriptionReader: Check for files that are not UTF8 encoded
We had a qmltypes file that was encoded in UTF16 and did not work.
We should at least warn about it.

Change-Id: I42555782ee16ddd25552f919845aa85ff1f3f636
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-05-15 11:21:44 +02:00
Joerg Bornemann
3604bdbad2 qbsprojectmanager: fix mkspecPath in profile
qbs.mkspecPath contains the full path to the mkspec,
not the directory containing all mkspecs.

Change-Id: I9407057eff0c587bcc44d393bf4eede1d4263d65
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-15 10:35:03 +02:00
hjk
4ec7c2ea6e Debugger: Start using the LLDB script approach in auto test
Currently non-functional on Linux as break-on-function + up crashes LLDB

Change-Id: Id573dc2ace319d986493dbc637fb73092ed26284
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 10:23:33 +02:00
hjk
2da28cea46 Debugger: Remove plugin dependency from dumper autotest
Change-Id: Id6d3cf6299af53cbf6910f545dee3820e90a7746
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 10:23:08 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Friedemann Kleint
c6bee7e20e Debugger/GDB: Use short paths for breakpoints on UNIX.
Breakpoints by path are not hit if the path traverses
symbolic links.

Change-Id: I3ab5d1bead8333986444aec709c940840dfddbb4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-15 10:20:33 +02:00
Robert Loehning
3cafcba19a Squish: Updated progressBarWait()
Change-Id: I81381dba6b0653a550a7362743939e7b943a9f00
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-15 10:12:02 +02:00
David Schulz
7bace63bde Debugger: Remove unneeded function from CdbOptions.
Change-Id: If9c6dd0f2fc53b7f5c7e5868bd57d01c9fc84d24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-15 10:02:48 +02:00
Christian Stenger
8ca5b55a0b Squish: Prepare re-usage of batch editing...
...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-15 08:59:16 +02:00
Friedemann Kleint
b3c8dec943 Fix single-character strings in QNX-plugin.
Change-Id: I5a4780fe4fcd285df9f8cbae712e12bff2d2bdda
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-14 20:17:51 +02:00
Friedemann Kleint
6c636ef2f7 tr()-fixes in QNX-plugin.
Change-Id: I950a351d5912a93acdd29581eaf87440149c8df5
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-14 20:17:35 +02:00
Oswald Buddenhagen
a4e593c910 make phony_target hack work on mac even with qt 5.1
Change-Id: I4198b090840d287c0f8f1655447cdfaa98992c17
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-14 19:16:22 +02:00
Eike Ziller
9292955f8a Fix the main window raise workaround for Qt5.1
Change-Id: I17d09c70053661166784657954929ccf3b5366ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:08:11 +02:00
hjk
116219f370 Qnx: Un-break build.
Change-Id: I840aaa330e826416b0ba81a008871957ebeed7be
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:07:48 +02:00
hjk
d0db6b2013 Help: Un-break build
Change-Id: I7911f57d7a9ba53b6055149eef3a48c2a0a5697d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:07:07 +02:00
hjk
7fd586d791 Debugger: Avoid Linux/LLDB crash when looking up "void"
Change-Id: Idd719906263e6bb72b0d72308ed37c34c657c876
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 19:05:15 +02:00
hjk
3d183d95f7 Debugger: Make some helper header stand-alone
Include <QtGlobal> to get access to QT_VERSION.

Change-Id: Id1e6b108e9b2e98015c434796bef37262e4da126
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 18:19:44 +02:00
Marco Bubke
fc6d51aff1 QmlDesigner: Support anchoring at snapping
Change-Id: I3ec504e931ee63761538acb4666a3c8ce1a592e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-14 18:07:15 +02:00
Joerg Bornemann
81cbe76c85 fix build with namespaced Qt
Change-Id: I1100a4e5bf2a87c2e6175704cdfac0e2b1d382ac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 18:05:52 +02:00
Kai Koehne
9d0965b6de Help: Remove outdated loading of qml.qch
This still stems from times where we bundled qmlviewer with Qt Creator.

Change-Id: I741ef9c098ed413b473560f5e60c8d35415f8d7c
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-05-14 17:18:40 +02:00
Kai Koehne
8765ca6818 Bump version
Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-14 17:15:40 +02:00
hluk
4481a19905 FakeVim: Don't use scroll bar to scroll to line or get first line
Possible scroll bar values (range from minimum to maximum) cannot -- in
some cases -- be linearly mapped to line numbers.

Change-Id: I8833dae057e2be39295f3aae906bb79e16269db7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 16:42:48 +02:00
Sergey Shambir
7688754b37 Autotools: added parsing defines and C/C++ flags from Makefile
Change-Id: I7443ba3ada97e4abac5560bb5399ec96e065acee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 16:39:22 +02:00
Thomas Hartmann
5be738e56a QmlDesigner.ItemLibrary: Allow non qrc source files
Source files can also be local files relative to the
.metainfo file.

Change-Id: I8b5519a1bf42808a1bfa744b7520fc910eb2aeac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-14 15:46:22 +02:00
Leena Miettinen
d07d683691 UI text: make descriptive text shorter.
Fix capitalization.

Change-Id: I89c216e07f42c359cd11207d1702efc612db79bd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-14 15:45:17 +02:00
Leena Miettinen
2f2a0bbf38 UI text: fix Qbs strings
Change-Id: Ie4920c52994ec74e5a44244a0710de31fd6e18ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-14 13:35:06 +02:00
Leena Miettinen
c32fe654fa UI text: fix capitalization of refactoring action
Words longer than 5 characters are always capitalized when
book-style caps are used.

Change-Id: I61d34aab74eb2fa3028681ef36b553347a0c34b1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-14 13:02:27 +02:00
hjk
e2d7fbc1c8 Debugger: Fix autotests
Change-Id: I8eda5a5c4db7f198a51cb09293abedd1edcfb664
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 12:37:51 +02:00
hjk
9d1de91db7 Debugger: Make manual test more flexible for SSE types
Change-Id: I12346d0aa29d7ad7e3c54ff6ba5e2d405c1fdaa8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 12:37:40 +02:00
hjk
8053debad6 Debugger: Make our std::vector and QList dumper work with LLDB
Change-Id: If6e182c32874f7a5234bede59eb8d7dd3ab7f711
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-14 12:37:32 +02:00
David Schulz
18dff5392c Debugger: Add wow64 support to the cdbengine.
Change-Id: I1819c42438609553ce277e01b7c8a2d4fffbfb1b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-14 11:30:49 +02:00
Nikolai Kosjar
4fb5277834 Fix warning about unused variable
Change-Id: I2699fdab3b8a586e61270d4853121c131b2a0ebf
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-14 11:05:00 +02:00
Nikolai Kosjar
11f1e365f0 CppEditor: Tests: Remove superfluous output
Change-Id: Ia1d9d04f5417c4816c07f3e60ab4be237d27e0d4
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-05-14 09:34:06 +02:00
Lorenz Haas
d288e3999b CppEditor: Quick fix "Insert (Pure) Virtual Methods"
This quick fix inserts (pure) virtual functions of base classes to the
current class. For selecting the functions which should be inserted and
for choosing the insertion mode (only declarations or with definitions
inside, outside or in the implementation file) a dialog is shown.

Task-number: QTCREATORBUG-2210
Task-number: QTCREATORBUG-2692
Task-number: QTCREATORBUG-3908
Task-number: QTCREATORBUG-5868
Task-number: QTCREATORBUG-7982
Change-Id: I8e94905afcae4778986f4c3925a494e0c6b3b8ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-14 09:14:25 +02:00
Lorenz Haas
7ef611047f CppEditor: Improve insert position for AddIncludeForUndefinedIdentifier
Includes of moc files are not considered while determining the new
include's position. Further the new include is inserted at its
"alphabeticaly sorted" position.

Task-number: QTCREATORBUG-8871
Change-Id: I67b40a6f538112753298b960da488e24f4643808
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-05-14 08:51:30 +02:00