Commit Graph

27386 Commits

Author SHA1 Message Date
Przemyslaw Gorszkowski
7fcc52bf47 C++ editor: Highlighting static variables
Fix highlighting, find usages, marking for static variables.

Task-number: QTCREATORBUG-6822
Change-Id: I0c97c93c6c1024550907eec3820496df22a94e85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 14:01:11 +01:00
Friedemann Kleint
8bb0134c50 tr()-Fixes: Fix translation contexts.
Change-Id: Ic043a097947a80e2fb5cb381c585375c4e5f5eef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 13:58:36 +01:00
Friedemann Kleint
757fd039e6 Do not use tr() in cpaster-frontend.
The command-line tool does not load any translations.
Prevent the messages from showing up in Qt Creator's ts-files.

Change-Id: I25e9cffb6fcd35fae7b021c2eb7ec60480db868d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-29 11:13:41 +01:00
Nikolai Kosjar
370acaf502 C++: Tests: Add basic tests for CheckSymbols
CheckSymbols is the "data provider" for the semantic highlighter which
does not have any tests yet.

Change-Id: I868aca32d44570457a984b8ce74695c381c58bed
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-29 09:09:15 +01:00
hjk
986ff71642 Debugger: re-enable more tests
Change-Id: Iec02192477cebabd50da0f07b32e95b78eeb0078
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 18:16:30 +01:00
hjk
6d31f0b870 ActionManager: Require a valid context for shortcuts
All callers provide one, and the fall-back construction from 0
has not been appropriate for a while.

Change-Id: I8bc5d094b70aac251fff1a7d34f1fad876cbdee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 17:48:44 +01:00
hjk
167316d7da Debugger: Work on auto tests
Change-Id: I21e783407a904de3501d0ac89d5f6f497ae4b1fe
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 17:17:25 +01:00
Thomas Hartmann
96d5322560 QmlDesigner: crash fix
Task-number: QTCREATORBUG-8628
Change-Id: Id1e0984794b9ce590cfd5789c1cde6de7dc7bd1f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-28 16:28:36 +01:00
Tobias Hunger
7a70b4f135 LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp)
I ran once too often into them being called applicationrunconfiguration.(h|cpp)!

Change-Id: I280a3280173b80d4d955faddedf11688786eee14
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 14:46:47 +01:00
Tobias Hunger
3e7d00749f Core::Id: Do not warn when reading invalid ids from settings
Change-Id: Ic2fc0df7f3ac5e8006123bf94c4e55a3a7d86593
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-28 13:08:19 +01:00
Friedemann Kleint
cc9848f1c7 ProjectExplorer: Fix valgrind warnings uninitialized value.
Change-Id: I7abd80ace8396933cb08b4ac2a36dec0a7691aa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 12:36:25 +01:00
hjk
45683d2242 Core: Fix use of removed Context constructor overload
Change-Id: I7da39d7cad4a562c8dfe882fbd300be1db323380
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 11:50:22 +01:00
Friedemann Kleint
39bc4243fa QmlDesigner: Do not translate warnings, fix spelling.
Change-Id: Ic919ea4fe50ab3a9d70d935aaa6a3ed77ebb3b92
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-01-28 09:25:25 +01:00
hjk
189adcc379 CustomToolChain: Fix make command
Change-Id: I11da49b9bb1fe0f5a71f0a1ea684fce486074f21
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-27 21:44:22 +01:00
hjk
d0cf3b8f1c Debugger: Make some of the semi-automated test real auto tests
Change-Id: Id52cce742fc9fc3467f47e05a94777234aaa2372
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:40 +01:00
hjk
b73849f82e Debugger: Add ability to check multiple results in one sub-test
Change-Id: Icb78a0a7127d06c1b3a2b4ba63fb83bf49cfe044
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:27 +01:00
hjk
3f44b6c4e5 Debugger: Work on dumper auto tests
Change-Id: Ied98a6e9191f39bb223d9f8ab07d44ee103b643d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-25 22:05:02 +01:00
hjk
b6f187d0f2 Debugger: split editor related code off watchutils.{h,cpp}
This is now in sourceutils.{h,cpp} to make watchutils.{h,cpp}
better acessible to the debugger auto-tests.

Change-Id: Ie87e715bc7018ca190a460c37dfd19bc897059f0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-25 13:54:34 +01:00
Friedemann Kleint
fb50278521 Fix wording in BlackBerry Wizards.
Change-Id: I333bd4e4fa60bd46d9be499502ccf9d9b92ed2e5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-01-25 10:12:34 +01:00
Friedemann Kleint
b45ade7d09 tr-fixes in QtOptionsPage.
- Message box title capitalization
- Fix some wordings

Change-Id: Ia1dd92ba8fd4ec4f287ad33401a765aacadd19db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-25 09:55:26 +01:00
Thorbjørn Lindeijer
c08fd3a2ec Fixed typo 'mimeDatase' -> 'mimeDatabase'
Change-Id: Id2ff2fb1e5e009fd267c7fcacf59e9a4ad6f2364
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
2013-01-24 18:08:24 +01:00
Marco Bubke
a39f140ea6 QmlDesigner: Fix crash for closing widget designer
Qml Designer should only react to qml files.

Change-Id: If79f4e96fddc0eba9ea52a28705ff1f9f528200f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 16:58:05 +01:00
Nikolai Kosjar
849f8e2d5e CppEditor: Fix qbs build
Change-Id: If50910f03f37fb91a1d885d53aa9de7899ac4305
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 16:48:59 +01:00
Erik Verbruggen
72db7a8f52 CppEditor: quick fix to generate getters and setters
This does not take namespaces on the implementation side
into account and does not properly position/indent things.

Task-number: QTCREATORBUG-1890
Change-Id: I779d12fefc79521bce38361729d4f66dada71147
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-24 16:18:16 +01:00
hjk
794b41581b Debugger: remove isEditorDebuggable
It was returning 'true' unconditionally for a while.

Change-Id: Ia99bdb3c525641f757dacbba148b68d677f4d632
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 16:10:10 +01:00
David Schulz
2f9574582d Editor: Disable adding UTF-8 BOM for qmake project files
Removes the "Add/Remove UTF-8 BOM" entry in the context menu
of the project file editor. Also ignores the setting
"Add If Encoding Is UTF-8" under
Options -> Text Editor -> Behavior -> File Encodings.

Task-number: QTCREATORBUG-8501

Change-Id: I368966b5235ee60011f2051ebdb82f9fe09bc4cc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-24 15:44:05 +01:00
Marco Bubke
8d4618e43d QmlDesigner: Start logger only if designer is started
Task-number: QTCREATORBUG-8618

Change-Id: I73c2256893029a4a1a0725c14df432a87ee7e827
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-24 15:25:29 +01:00
Marco Bubke
497b7fa444 QmlDesigner: Remove qDebug
Change-Id: I7f24ba832175a40dfd34ae8e792519dd8adbcf30
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-24 15:25:15 +01:00
Marco Bubke
1fda571654 QmlDesigner: Remvoe qDebug
Change-Id: Ie3803b6ea73fa41a4737987851fd5b695f5fe92a
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-24 15:24:59 +01:00
Daniel Teske
dc40099d0b Android: Make local deployment smart
On deploying, first check the timestamps of the files on the device,
and then only copy+strip+deploy the files that are newer.
Add a button for cleaning /data/local/tmp/qt as that is no longer
done on each deployment.

Task-number: QTCREATORBUG-8538
Change-Id: I93c4e6266d7d748b0a4735e00806282315227d4b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 15:07:07 +01:00
Fawzi Mohamed
259145f080 qmljs/parser: update to latest qt5 parser
fix error semicolon insertion of loops, strict mode

Change-Id: Ic67d6b1fff6f476ea7eb64ae0ee43515d29654a5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 15:06:41 +01:00
Orgad Shaneh
6c1094aef5 CppTools: Fix qbs build
Global include is wrong

Change-Id: I34848ba4b92cfa047854abd476ed983f205bdf72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-24 14:21:19 +01:00
Orgad Shaneh
c57e6029c6 Gerrit: Use GitClient functions for checkout and cherry-pick
This is cleaner, and for cherry-pick also handles conflicts

Change-Id: I50a7035c532a2cfa07fdd960e70ffb4af666a80e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 13:47:57 +01:00
Orgad Shaneh
cf5f109b68 Git: Remove "Branch" from synchronousCheckoutBranch
Other refs can also be checked out using this function

Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 13:25:06 +01:00
Daniel Teske
a85c32cb4a ProcessStep: Remove unused ctor
It was probably meant for deriving from ProcessStep. Noone does that,
and AbstractProcessStep would be a better base class anyway.

Change-Id: I95374677c00a502f2ece4eaa71f7f9a8df2ecf2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 13:06:56 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
Nikolai Kosjar
ed93b998dd Plugin tests: code cosmetics
Change-Id: I789dac25d978535457e62702ce3fc9912cf7282f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:39:35 +01:00
Nikolai Kosjar
8a1aa5dcf2 Plugin tests: Allow to specify which test functions to run
This simplifies debugging single test functions.

Test data can be specified the same way as for QTest executables.

New syntax for the -test option:
    -test <plugin> [testfunction[:testdata]]...

Examples:
    ./qtcreator -test Git testDiffFileResolving
    ./qtcreator -test Git testDiffFileResolving testStatusParsing:"DU"

Change-Id: Ifea6b114bfc0fabe3e9ddffcc2fd90af157052ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:39:28 +01:00
Orgad Shaneh
120f03061d Git: Remove unused functions
Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 12:32:52 +01:00
Orgad Shaneh
177f774036 Git: Use StashGuard for merge and rebase
Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-01-24 12:32:40 +01:00
Orgad Shaneh
5551c1e906 Git: Introduce StashGuard
Offers the user to stash changes (if relevant), stores
the results and pops the stash when it goes out of scope
(unless disabled)

Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 12:32:26 +01:00
Orgad Shaneh
c670a66fe1 Git: Explicitly pop stored stashes
If the user created another stashed between save and
pop, this stash will be restored instead of the intended
one.

Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 12:32:17 +01:00
hjk
63439a5f21 Debugger: move MI decoding to debuggerprotocol.{h,cpp}
Change-Id: I9d2eaf43b66f0db74ba2584157d6df8280d76652
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 12:22:31 +01:00
BogDan Vatra
b57e37243d Fix AndroidRunner stop action.
When the stop button was pressed nothing happened

Change-Id: I58a05aa3a4ea990595298cde0a330b382b65b035
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:20:30 +01:00
Ray Donnelly
6fc9c0732b Android: also adb pull /system/bin/linker
This is so that gdb can find the address of rtld_db_dlactivity
 to enable breakpoints pending on shared libraries to be set.

Several fixes were needed so this can be used both in Jellybean
 as well as older versions of Android. Credit for these
 improvements goes to Ryan Bissell:

  https://android-review.googlesource.com/#/c/39180/
  https://android-review.googlesource.com/#/c/42611/
  https://android-review.googlesource.com/#/c/42612/

Change-Id: Ibfb6335ab256df58b407e1661e1f04070fc3ecb6
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-24 12:05:13 +01:00
Nikolai Kosjar
632eaf06a9 C++: Add Quickfix for fixing pointer types/declarations
Task-number: QTCREATORBUG-6169

Change-Id: I718dc071b1904d5cbf575c8f379e5ed08522d51f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 12:00:45 +01:00
Nikolai Kosjar
8fe25d0a4a C++: Add settings dialog for pointer declaration formatting
The dialog is at Tools > Options > C++ > Code Style > Edit... > Pointers
and References.

Currently the settings are referenced when applying the following
QuickFixes:
 - Adapting function signature in declaration/definition
   (FunctionDeclDefLink)
 - Inserting declaration from definition (InsertDeclOperation)
 - Inserting definition from declaration (InsertDefOperation)
 - Extracting a function (ExtractFunctionOperation)
 - Add Local Declaration (AddLocalDeclarationOp::Operation)

In these cases the code style of the current project is used. If there
is no current project open, the current global code style is used.

Task-number: QTCREATORBUG-6169

Change-Id: I3e4e502b3103f7f754ac9b39594ad461d89d9304
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:59:40 +01:00
Nikolai Kosjar
138066792e C++: Introduce PointerDeclarationFormatter
For a given AST, CppRefactoringFile and Overview this will create a
ChangeSet for rewriting the pointer or reference declaration according
to the Overview.

Task-number: QTCREATORBUG-6169

Change-Id: If6f824c1ea5e9f53a11a58ec8b6d696d01f0723e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:59:14 +01:00
Erik Verbruggen
fa7ab13f30 C++: test for walking includes in frameworks.
Change-Id: Id31ce6b40d72351cfaefa5035469b87662526853
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:36:22 +01:00
Orgad Shaneh
fcf586974f InfoBar: Suppress warning on close
Change-Id: Ie8c19db3e7569c20c1f8d5c6651f1b9b0f7db9dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 11:32:50 +01:00