Commit Graph

27867 Commits

Author SHA1 Message Date
Yuchen Deng
a5ede0f55f Fix the wrong logic for plugin loading
Change-Id: I877102cae4a407b15ae6c41f1cf5c40ce704807a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 13:36:52 +01:00
Daniel Teske
46c4d18a46 DeviceTypeKitInformation: Prevent warning on console on initial start
Change-Id: I11cb697d5945f094c8580010d40ad5a360b27c16
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 13:36:08 +01:00
Daniel Teske
ae8fb83385 CMake MakeStep: Fix crash after building
Task-number: QTCREATORBUG-8802

Change-Id: I88253caf5f70bed95454f36794f7256a74a165a7
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 13:34:02 +01:00
Orgad Shaneh
cdcc8256a0 Git: Require 1.7.2
Remove legacy code

Change-Id: I0ce03f7a34c92b48ceb705a0feec43e0ba89ef5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-20 13:29:11 +01:00
Christiaan Janssen
0b7f80de21 QmlProfiler: avoid false positives in binding loops
It happens when anonymous bindings are involved.

Change-Id: Id0107040565351bf857bff7357a76bc82f0fd093
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-20 10:27:25 +01:00
Orgad Shaneh
8bf3647b06 QbsProjectManager: Fix infinite recursion
Change-Id: I2fbf2550ba93613c22a3a7ec17003bd3466f396b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 10:17:40 +01:00
Yuchen Deng
7d8223ee13 Fix crash if plugins list is empty
Change-Id: I8de46de3ea349fc7c16e0024eb434ffe8f586be8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-20 10:06:25 +01:00
Przemyslaw Gorszkowski
2b0e643e3d C++: fixed resolving complex typedef
Unit test describe this complex typedef. Another step to bring
code completion for stl containers.

Change-Id: I27985c4ea7c26c723d7a88ce42c5ecf164b6c903
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-20 09:58:34 +01:00
Maurice Kalinowski
c9d7b396e5 update wizard template
- on Windows the export is required, while on Unix everything
  gets exported by default.
- for Qt5 based Qt Creator we need the specification of the
  json file.

Change-Id: I1e8055fcb2b81d42369f906e1ba42a4c2b811553
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-20 09:39:58 +01:00
BogDan Vatra
88ac76fb72 Add MIPS support for Android.
Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-20 09:32:14 +01:00
Friedemann Kleint
34692eea2e tr()-Fixes in Diff-Editor: Capitalization, add comment.
Change-Id: Ib6b1c15e6a8d3452e3d9d8dd769f500965f08473
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-20 09:03:22 +01:00
El Mehdi Fekari
ef6a9d06f4 Qnx: Add BB10 style to the BB QWidget-based app templates
Change-Id: Iff25302043b4f6078f9a147e52ebde7624aa7585
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-19 20:11:08 +01:00
Thomas Hartmann
94011a12f1 QmlDesigner.NodeInstanceView: introducing delay in setPathToQt()
We have to delayed the restart, because when creating a
new project we switch to that project before we open
the new file. This means the user can get an error about
a missing puppet, because the new project is based on another Qt version.

This is a hotfix for Qt Creator 2.7.

Task-number: QTCREATORBUG-8756
Change-Id: I8c74c6334dca35ad29771339855e777d307b9e43
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-02-19 15:32:36 +01:00
Daniel Teske
d3aaa76932 PluginManager: Implement -load %plugin% option
This loads a plugin that is disabled by default.

Change-Id: Ibbc9849c417519904fe1e69a46f93a7cc1c7edc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-19 15:09:47 +01:00
Daniel Teske
16b6079895 Open project from command line: Postpone the actual opening via a timer
This feels better, should not break anything.

Change-Id: Ibd0b8c20dce346e10cb7a35d6785ea2cb29f0e51
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-19 15:08:41 +01:00
Fawzi Mohamed
3e9ed79845 qmljs/qmljshoverhandler: fix possible deref of null
Change-Id: I7fc02b4f36fd34a94344bc0956b0daf731e73d17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-19 14:57:53 +01:00
Erik Verbruggen
75e608ec2e C++: Cleanup, removed unused methods/fields.
Change-Id: I5636039c79be40505c707f775b228bc51f35c243
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-02-19 14:34:48 +01:00
Kai Koehne
bad4c388a2 Debugger: Don't tell about dbg packages on Windows
Change-Id: I66c1d8612fedaacb8f457a219f930a7ee0989c23
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-19 14:22:30 +01:00
Yuchen Deng
cf026c9f87 Fix a warning found by MSVC2010_64
Change-Id: Ie9ae9a8c8bff87a610606e3a6075987a08ed0644
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-19 14:21:28 +01:00
Nikolai Kosjar
8417c6493a Editors: Delete context menu if editor widget is deleted
...in CppEditor, QmlJSEditor and BinEditor.

Addresses second crash reported at QTCREATORBUG-8775. The first one is
already fixed.

Task-number: QTCREATORBUG-8775

Change-Id: I11c1f030ebeb2b2cbec02503e8e225fc5600a101
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-19 11:04:29 +01:00
Nikolai Kosjar
f8eb1adf0e CppEditor: Compile fix for release mode
Change-Id: Ic48ad8dc36d75a1ae7644731863ce3f8d7f242c8
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2013-02-19 10:56:01 +01:00
Nikolai Kosjar
8a0139dfcb C++: Tests: Make quick fix tests independent of config file
Change-Id: Idf064b7bc80cca5d0da8bb7c0803c9dde499d87f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-19 10:18:49 +01:00
Nikolai Kosjar
35b4420f7a Editor: Add further Use::isInvalid() guards
Task-number: QTCREATORBUG-8738

Change-Id: I297731f15bd9001f7edc83c956a15ef660929dc7
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-19 10:18:34 +01:00
Nikolai Kosjar
9f94a8b3b8 C++: Slim down SemanticInfo
Remove SemanticInfo::hasD and SemanticInfo::hasQ. They were used in
CPPEditorWidget::highlightUses() but became superfluous by filtering out
invalid Uses.

Change-Id: I08f46e55cf42fbc6088fbcb03e30822421df57d6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-19 10:18:25 +01:00
Nikolai Kosjar
c6291db9fa C++: Tests: Add basic tests for doxygen comments
Change-Id: I45e72e4d86f1cfb6798985cfddc073c524672313
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-19 10:18:11 +01:00
Nikolai Kosjar
61460951ce C++: Fix highlighting of doxygen's "///"
The color scheme changed for "///\n" lines:

 "///\n"       - "Doxygen Comment" (was "Comment")
 "/// hello\n" - "Doxygen Comment" (as before)
 "////...\n"   - "Comment" (as before)

Change-Id: I6bdaf471760bb05547385fd4821eded6cefed4d7
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-02-19 10:17:55 +01:00
Leena Miettinen
2a88db5fa8 Doc: describe Android Debug Bridge (adb)
The abbreviation appears in error messages.
Also describe using GDB to debug applications
on Android.

Change-Id: If3b44dddba94faae7b7da5e01ec57960e5326c8e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-02-19 09:10:04 +01:00
Christiaan Janssen
dac19b42b4 QmlProfiler: dealing with missing location in Creation events
Change-Id: Ia1d74c3f0c1a002956b9f60146f5eafcc15465ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-02-19 09:03:56 +01:00
Rafael Roquetto
5833433bed Fix crash when deleting certificates
The certificate delation is already handled by
BlackBerryConfiguration::syncCertificates() method.

Change-Id: Ia2f340fe4ad6d5cadbaf391430cd3ded656bbd46
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-02-19 07:45:08 +01:00
Tobias Nätterlund
e96b735e0f QNX: Remove BlackBerry specific Qt Quick wizards
As the standard Qt Quick wizards can handle BlackBerry
file paths for the QML files, and the
BlackBerryDeployConfiguration automatically sets up a
bar-descriptor.xml file for the project, we can remove
the BlackBerry specific Qt Quick wizards.

Change-Id: I8866fb92c8b1725fb4d4ba7af6bdaa2e15986eb2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-19 07:44:45 +01:00
Nikolai Kosjar
660afe2a63 Editor: Add snippet for main function
Change-Id: Iec778663351a866432a215cb9ab90d6261763141
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-19 01:25:13 +01:00
Orgad Shaneh
0c92cb015f Git: Simplify cloning of a specific branch
Delete master branch option is removed since the master branch
is not created when specifying a branch to clone

Change-Id: Ided5e28a40ad459dcfaa3ef91ffa7c24e585d0ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-18 20:18:39 +01:00
jkobus
0e91d10878 Experimental integration of DiffEditor
After enabling the plugin go to Tools|Diff...

Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-18 18:15:51 +01:00
Nikolai Kosjar
aa69b190f7 Debugger: Enable/Disable breakpoints with Space
Change-Id: I0eaee9589d9299c2238e2e29ab11a18d579de7dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-18 16:45:20 +01:00
Robert Loehning
420eefd884 Compile fix
Change-Id: I2807efd386b86247a4fbf67151cd6d3fb98c3b22
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 16:22:42 +01:00
Eskil Abrahamsen Blomfeldt
a19ed6063a Fix Android plugin to support Qt 5 style rules-files
In Qt 5 we have modularized the rules files so that each module
specifies its own rules. This patch updates the plugin to support
reading from these in addition to the rules.xml of Qt 4 so that
it should work well for both.

The "replaces" attribute of the lib element is also added in Qt 5
because the files are generated and thus the approach of rules.xml
where replaces is a separate element and where the order has
semantics was not convenient. We of course support the
Necessitas approach as well.

Change-Id: Ife21903c9faf61e1791cf8c0ea78bb61c74dcb34
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-02-18 15:04:23 +01:00
BogDan Vatra
6f1509434f Remove unused vars
Change-Id: Ib2ae2c12009ffbb7d4cb56c50dfef97e4e6c0ade
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 14:34:30 +01:00
BogDan Vatra
93447239d3 Fix Android X86ToolsPrefix
Change-Id: I4db2261625c6fbc87d1a19218ea0a095cee9986e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 14:34:11 +01:00
Daniel Teske
89126edfab Rename PluginSpec::isEnabled() into isEnabledInSettings
This is what it actually is.

Change-Id: I2ea2e77edc3fd80eb1e25156edc7a59e86dfac9a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-18 14:26:46 +01:00
Christian Stenger
80263a5221 Squish: Fix some Mac/Squish issues
Details:
* wrong shortcut usage replaced
* timing issues fixed
* re-used the editor-focus-on-mac workaround for some tests

Change-Id: Ie0d65d941c999d545bd50e1cf4794624c4110247
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-02-18 12:56:46 +01:00
Tobias Nätterlund
a8db5984be QNX: Added missing break in switch statement
Change-Id: I146c336bff445eb32f8576c7499a6b72f9a65842
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-02-18 12:48:32 +01:00
Tobias Hunger
e5431d4406 Qt: qtAbis() is now empty if no abi could be detected.
This is what some code is obviously expecting. Fix the rest to
use the same assumption.

Change-Id: Ifa8cba3f98ab4530404bafe98e280ced88bf5008
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 12:39:05 +01:00
Tobias Hunger
71f1194c9f Qbs: Add qbsstep as a base for all qbs build steps
Change-Id: Iaa3663018080fd8804649736561b1cf58097b3ef
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-18 12:35:57 +01:00
Tobias Hunger
82a1bfe29b Qbs: Add static method to retrieve preferences from QbsManager
Change-Id: Ib18c4a8cf904a998c2a76ae6a7ed10d4d968b396
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-18 12:35:52 +01:00
Tobias Hunger
d2762af2e4 Qbs: Small UI fix.
Change-Id: I3611539ea4d708b362db48bf28b6654f25dfd7f0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-02-18 12:35:35 +01:00
Tobias Hunger
07ed7ec567 Qt: Reduce size of BaseQtVersion by reordering member variables
Old size on 64bit: 176 byte, new 152 byte

Change-Id: Icfca471e921b919b88b58f3df128d025ccb76da8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-18 12:33:04 +01:00
Robert Loehning
dd32d14a55 Squish: Removed unused functions
Change-Id: Ia9b63b9d4846b425cfa52ded0a0f5f54f4c4f0ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-02-18 12:16:04 +01:00
Tobias Hunger
c1c2ceb422 Qt: Do not warn about abi mismatches if Qt abi is not known
This avoids warnings when using kits with a qmake-only Qt setup
(just qmake binary, include dir, bin dir and mkspecs directory with
contents).

Change-Id: I3e01b170fa0e1003b5e7d472c0fcc9f7a7d42f25
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 11:49:06 +01:00
Tobias Hunger
0e476316f0 CMake: Fix progress reporting on makestep
Change-Id: I0588949283f45ca46b0f52875342605659ddea89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-18 11:48:47 +01:00
Orgad Shaneh
d1e2e20f71 Vcs: Fix crash
Task-number: QTCREATORBUG-8775

Change-Id: Id17b439202f5394b1fdb7d38c28c8048dee25d71
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-18 11:08:03 +01:00