Commit Graph

28968 Commits

Author SHA1 Message Date
hjk
a1c7c47cc0 C++: Simplify Lexer::yyinp()
... by assuming we operate on NUL-terminated data, which is
(in theory) guaranteed by (non-raw) QByteArray which we have.

Change-Id: I855d01ea0dee5328ec737fbabee1086d7a28aa5a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-16 11:26:30 +02:00
Christian Kandeler
c95d1705aa Qbs: Improve build and clean step widget layout for full-screen view.
Change-Id: I0bc3c205f5f48fc0651629aecb3f46c106a858fd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-16 10:56:21 +02:00
Friedemann Kleint
a0696ada0d Fix texts in QtQuick-Extension plugins.
The text needs to be one line for the translation transformation
to work.

Change-Id: Ia1c4ab02a0774bebbc6b0f59f2a9682d0a751e6a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:28:04 +02:00
jkobus
186c457d6c Implement expanding / shrinking skipped lines
Change-Id: I6921b7a39288f6a9747574b1a8e75d571f4723ce
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-15 18:09:35 +02:00
Nikolai Kosjar
0cbcd365e5 C++: Fix warning about comparing unsigned vs. int
Change-Id: Icd72f6358a5e90a292178b1d78f80d42da2ab846
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-15 17:21:54 +02:00
Lorenz Haas
6f3b41214b CppEditor: Add refactoring operation to move definition of a function
With this new operation it is possible to move a function definition
from a cpp file to the header file or vice versa. One can also move a
function definition outside the class body.

Task-number: QTCREATORBUG-516
Task-number: QTCREATORBUG-5364
Change-Id: Id3daefe79284bd9086282369c9d251e003951c11
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-15 17:03:49 +02:00
Alessandro Portale
bf4c236531 More native dir separators in ProjectConfigWidget
Change-Id: Ia5da9d9a27fe3d2d67b9e7bb49d36e68923425a0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-15 16:34:25 +02:00
hjk
61059f8432 C++: Inline often used member functions of TranslationUnit
As indicated by profiling.

Change-Id: I92d79b52d2d56540da39559fe4db3c22ab53a73a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-15 16:22:28 +02:00
hjk
90b4f5c95e C++: Reduce calls to translationUnit->tokenCount()
Change-Id: I59527ded34873286072be51c6a141dffcbf93406
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-15 16:21:37 +02:00
Friedemann Kleint
ad9081e3d8 tr()-Fixes in git/gerrit.
Introduce common message for "Cannot run", remove exclamation
marks.

Change-Id: Ib3f36e95c67136041cde56e697ec4ba0a3b9549e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-15 15:04:05 +02:00
Friedemann Kleint
d1bf51161d tr()-Fixes for ReadOnlyFilesDialog.
Fix contexts, remove exclamation mark.

Change-Id: Icfd698e10d7e9e8c949919a102c7a482f007f91a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-15 15:03:57 +02:00
Friedemann Kleint
d684c6779d Fix wording in settingsaccessor.cpp.
Change-Id: I4ba4ddf17bdc44f6b6ba5b9814909d70dd619dd0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-15 15:03:51 +02:00
Rafael Roquetto
da4f3bd22c BlackBerry: Fix certificate marshalling on new NDKs
Newer BB NDKs use a different format for blackberry-keytool. This patch
fixes QtC to support this new format.

Change-Id: Ie80c722b0d14f1ce9132d7e1b4dc66ef8edd422e
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-04-15 14:52:38 +02:00
Tobias Hunger
618f737302 Qbs: Clean up clean step ui
Change-Id: Ic4ba17239d8910f5141eceed3f50d713ac3906cd
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-15 14:49:04 +02:00
Tobias Hunger
e4873318a2 Qbs: Clean up build step ui
Change-Id: I2a5eb015ae3d20bda25c8c632363b8205417cfab
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-15 14:48:22 +02:00
Nikolai Kosjar
7cc8314425 CppEditor: Fix compilation for Mac OS X.
Change-Id: Iae7ddf066de86f12b9e01af48374c1589afe1388
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-15 14:23:05 +02:00
Tobias Hunger
14970ea627 Qbs: String fixes
Change-Id: Ie1546afe92964b21d7ccb433f1841f3a81ec9c4c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-15 14:15:02 +02:00
Friedemann Kleint
69e68b92a3 Remove translation of newline character.
Change-Id: I1f2f7b4f36bee817975a4c2641cc5d7e6fbcadc2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-15 13:52:25 +02:00
Lorenz Haas
61ddf16689 CppEditor: Rearrange quick fix files
Moved content of cppinsertdecldef.(cpp|h) cppcompleteswitch.(cpp|h)
cppinsertqtpropertymembers.(cpp|h) and ApplyDeclDefLinkChanges to
cppquickfixes.(cpp|h).

Made msgQtStringLiteralDescription private member function of
WrapStringLiteral, added anonymous namespace, "extracted" useful
functions to the top of cppquickfixes.cpp.

Change-Id: I4f82a005a62be3c29d4b96902667bd3a2b9397cc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-15 13:32:42 +02:00
David Schulz
38531a781e cdbext: Adjusted dump of QChar
... to be consistent with gdb.

Change-Id: I0bfbf9b14ee884acd762434b67cce6794380aac7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-15 10:59:30 +02:00
Aaron McCarthy
2586fc5479 Suggest updating boiler plate code in subprojects.
Check if boiler plate code exists in all application pro files within
a project and prompt user whether to update for each project.

Change-Id: Ib4575be58a669193813036c4c8f4f48cc3d358e7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-04-14 14:43:35 +02:00
hjk
2e9b8406da Debugger: Claim a few more capabilities for LLDB engine
This will need further fine tuning.

Change-Id: Ia8926a73adfdf3de313cd379c4d6452b0af56ca0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 17:46:23 +02:00
Tobias Hunger
f4efd3f64f RC EnvironmentAspect: Add kit environment changes
If used in a project without a buildconfiguration, e.g. a qmlproject

Task-number: QTCREATORBUG-9114
Change-Id: I919a7a36b784c1956f1233adc7c5b69d531544aa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-12 17:29:51 +02:00
hjk
1fd4b8788d Debugger: Adjust autotest to bridge changes
Change-Id: I7fc1db372509c3b7d0d57d5d587df0bfa80afb16
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 15:29:27 +02:00
hjk
2efdca1e12 Debugger: Use 'thread step-out' instead of LLDB function call
Seems not to be implemented or working on LLDB/Linux right now

Change-Id: I04a98d038eb2d7a7a5fbe1d713351d392aff8047
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 15:29:11 +02:00
hjk
4269ce4e38 Debugger: Progress on LLDB state handling
Change-Id: Iadf9c7026a3da0adeec8340729a303bbbee57c24
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 14:56:48 +02:00
jkobus
77abd02787 Get rid of QChar::LineSeparator
It was causing troubles while scrolling. Replace it with
\n and hack selection. Simplify the code. Now every line
is a separate block. Prepare for expanding skipped lines.

Change-Id: I8d305681c575abdaaf9cdbf26de864dd3a906d3a
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 14:55:08 +02:00
Nikolai Kosjar
7051f49a6e CppEditor: Tests: Auto configure projects for file/token tests.
Change-Id: Ic781fcbd3bdc1619db38e282ec7d4b9aecdb5bbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-04-12 13:25:49 +02:00
Friedemann Kleint
98a58c9d1f Fix documentation of the acceptRichText attribute in custom wizard.
Change-Id: Id37e8e0444124f8863c67d584a46937d7ad0af53
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-12 10:51:01 +02:00
hluk
b9cc16e405 FakeVim: Use QTextDocument::revision() for undo/redo
Using QTextDocument::availableUndoSteps() to get revision of document is
very bad because it undo/redo stack starts to break when maximal number
of undo is reached.

On the other hand QTextDocument::revision() number is always increased,
even on QTextDocument::redo(), so external undo/redo can still break
undo/redo commands in FakeVim.

Change-Id: If1698df8f43a878295eebddd59aebe304cdf3081
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 10:29:19 +02:00
hluk
42c6f7cffd FakeVim: Break edit block by editing cursor line
Break edit block at current line so that other line is not marked as
changed.

Change-Id: Iea1c3615899fdd3558861e7f3a319f796c5f247b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-12 10:26:23 +02:00
Friedemann Kleint
a6112ffc4e Custom wizard: Introduce acceptRichText-property for QTextEdit.
Defaults to false (as opposed to QTextEdit's default) to
suppress formatting when pasting code from bugtrackers, etc.

Change-Id: Ib3dddd1424e56edef48bc63fb13d6c22e18a815c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-12 10:21:07 +02:00
Eike Ziller
e3fde349ad Merge branch 'master' of ssh://codereview.qt-project.org:29418/qt-creator/qt-creator 2013-04-11 18:28:07 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
2013-04-11 18:27:52 +02:00
hjk
5b98167ebd Debugger: Remove common bridge.py
The engines know what they want, no need to guess again.

Change-Id: Ie21b0e08eff8b81b217a08d4c47c35c35ae831d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:17:21 +02:00
Fawzi Mohamed
e6eb061293 cpp/fileandtokenactions: fix qt4 compilation
Change-Id: Ic55e5e79c5707aa8e19be32f282d679e4e9be627
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-11 18:01:21 +02:00
hjk
4284693cd2 Debugger: Fix regression introduced in 1d580bcf9f
Change-Id: Ia4a88aaae1e3b3e1a9c7ec3cd5b8a52d36edac4f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 18:00:51 +02:00
hjk
13090b21d1 Debugger: Simplify LLDB backend message passing
Change-Id: I3a95d6a21d1da1f0c3df743e6743d3d8e558e967
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-04-11 17:46:15 +02:00
Petar Perisin
7c6bb25248 Git: Also show tags in the branches dialog
Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-11 17:06:24 +02:00
Christian Stenger
2cb6b27de2 Fix valgrind tests
Change-Id: I71bd88fb5a2041aacc3fa2e0de17820ee1db6c69
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-04-11 17:02:05 +02:00
Knut Petter Svendsen
567098f210 ClearCase: Fixed get active VOBs
The correct way to check if a VOB is active (mounted) is to check for
a "*" in the output of "cleartool lsvob". On windows a directory for
each active VOB exists under topLevel, but this is not true for unix
where directories (mount points) for all VOBs exists always.

Change-Id: Iccb0e38a39dfcae72326d68b9ff43b2555187f6c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-11 16:52:38 +02:00
Joerg Bornemann
6d3e0fbd04 QmlDesigner: Fix compilation with namespaced Qt.
Change-Id: I38613edf14cf72d38a7c7ca631f4d7f82c112288
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-04-11 16:47:27 +02:00
Daniel Teske
dc0c47c7fd CMakeProjectManager: Make shadow build support not depend on qt version
If a qt version does not support shadow building, this just means that
the qmake for that qt is broken. That has no bearing on whether cmake
could shadow build.

Change-Id: If2b69b42094d87cd0c3be26d043e344aa8b370da
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 16:38:16 +02:00
hjk
b06fa40149 Link fix
Change-Id: I630502e491d2a9f97bf6e074ff3820a9d8d2e0a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 16:25:39 +02:00
Tobias Hunger
4d023aa5af Fix connection to slot
Change-Id: Icdd982e84ec452077c987f9ee15e49f8c5ccc3a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 16:12:25 +02:00
Tobias Hunger
41804ac884 Remove environmentinformation from the runconfigurations
It is no longer used.

Change-Id: Ie99af7b432bba07f8e334c99817bd535828ade8b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 15:15:18 +02:00
Tobias Hunger
87347bb064 Move settings over from the runconfigurations into the environmentaspect
Change-Id: I97ecc00b53d4c6f8f36c1f5f3178712f689747d9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 15:15:12 +02:00
Tobias Hunger
47abeac15b Use EnvironmentAspect to retrieve the environment
Change-Id: If878e22cc2715d05bb3e65ad908cd4fb5e21b03b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-11 15:15:08 +02:00
Tobias Hunger
e837b48465 Specialize environmentaspect for remote linux
... and attach it to remote linux runconfigurations

Change-Id: I5596b7a237ac6ef4a834324f95f462adbe28e722
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-11 15:15:03 +02:00
Tobias Hunger
6d165c500a Specialize environmentaspect for qml projects
... and attach that to qml project runconfigurations

Change-Id: I841b72cc279495ee8f3ff31af59bf006f13a1056
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-11 15:14:59 +02:00