Commit Graph

42607 Commits

Author SHA1 Message Date
Tobias Hunger
dfa2bc5b71 Wizard: Do not set c++11 for the plain C project wizard
... when building with qmake. All other buildsystems do not
have that problem anyway.

Task-number: QTCREATORBUG-15064
Change-Id: Ie7d5b1b8a497db841c340229dff577de9e580171
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-17 12:44:28 +00:00
Alessandro Portale
15227b970a Analyzer: Rename mode icons
The other mode icons are named mode_foo.png. Where foo is a verb.
Renaming this icon makes it easier to quickly find all mode icons.

Change-Id: Iae7a58758c068f14e0c6887b3f18502fc3b086f2
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-17 11:36:09 +00:00
hjk
eb4d98e178 Debugger: Remove virtual layer of sendMessage() calls in QmlEngine
Change-Id: I7a5f335e8401d01bb3085b9512a878b67109feae
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-17 11:26:15 +00:00
Tobias Hunger
76ffbbd43c ActionManager: Small cleanups
No code change

Change-Id: Iaceebaa1dccbd3667f1736a7167aedecabc9d4a2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-17 10:51:33 +00:00
Orgad Shaneh
cfa69dbbcc ModelEditor: Fix MSVC compilation
QStringLiteral does not work with split string literal and MSVC.
Only the first part gets a 'L' prepended, and an
"error C2308: concatenating mismatched strings"
is generated.

Change-Id: I3edf1259103ea5168aef06c0a81aab4a381d0f83
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-17 06:37:19 +00:00
Jakub Golebiewski
0b5b7ef67a FakeVim: Fix caps lock in macros.
This fixes the bug that while recording a macrom, hitting caps lock
(scroll lock, num lock) inserts some key into the buffer (for caps '$')
so when you replay the macro you get incorrect output.

Other keys that are not in vimKeyNames may behave similarly but It is
important that macros support those three (especially caps lock).

Change-Id: I2854266f86a22e9d38fb1c6c5d923b11a56a5995
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-17 06:36:06 +00:00
Tobias Hunger
6e8a72b17f Bookmarks: Remove hack to special-case the disassembler view
Change-Id: Ifd79b44fc879be6a1451401967cb894ca03356d1
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-16 15:00:58 +00:00
Tobias Hunger
77782ce79a DisassemblerAgent: Mark document as temporary
Change-Id: Ie61f6bc281392abfa9c485f1819e903551ddc422
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-16 15:00:54 +00:00
Tobias Hunger
39490240a8 LicenseTemplate: End the license template with at least one newline
Change-Id: I9bffcdbfba3c873324e12a8104da5d277259ea31
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-16 14:48:00 +00:00
Tobias Hunger
81b4d70f1e Bookmarks: Fix connect/disconnect mismatch
This was introduced when the plugin was refactored.

Change-Id: Ieffce92a6eac55aa7932f202220d3817c59e6a1f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:47:39 +00:00
Tobias Hunger
4aa8374dde Bookmarks: Make sure we do not end up with empty filenames
... in the bookmarks. The actions should all be disabled if that
is the case, but better safe than sorry (e.g. when a temporary
document is not marked up as such).

Change-Id: I131a870dc30258a8bca3fc57edb4692292ccb2de
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:45:35 +00:00
Tobias Hunger
482b395926 Bookmarks: Do not allow setting bookmarks in temporary files
Those can never get triggered anyway as they point to a file without
any filename.

Change-Id: Id04aa2e63a7e6918269851df0cd41c7334bfc94c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:45:02 +00:00
Tobias Hunger
d2d883ce29 ActionManager: Convert to Qt5 style connects
Change-Id: I058a8530a6c329314d60d77506ca25c6c87d7b88
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-16 14:20:43 +00:00
Tobias Hunger
8380436ce5 BookmarkManager: Remove unused method
Change-Id: I2ae8764bbbbde20e027169564bebb329447f17ed
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 14:20:23 +00:00
Tobias Hunger
628a0fcaa7 VcsBase: Turn State into a class
Change-Id: I1e0a9e6f4468ad29b70dc1fd78310ccb6a2133f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-16 13:52:58 +00:00
Orgad Shaneh
41feefd670 KitManager: Cleanup
* Deduplicate call to setDefaultKit.
* Replace 2 calls to Utils::findOrDefault with list concatenation.

Change-Id: I9822d34f1eb25447b35f33aad0497756ef46d101
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 13:25:05 +00:00
Tobias Hunger
57765ceb80 GitPlugin: Coding style fixes (WS only)
Change-Id: Icb83354dca6400f81dda0a28ef26861655b7e367
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 13:23:50 +00:00
Jochen Becher
d92142f149 Add new ModelEditor plugin.
The plugin is based on the 'modelinglib' library. For features and
screenshots see https://wiki.qt.io/ModelEditor

Change-Id: I857be0652a852cc69a9729f64e67134fe630af00
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 12:13:36 +00:00
Jochen Becher
64e2ba87ef Add modeling library
Modeling library implements the entities, diagrams and widget Ui for
ModelEditor plugin and tools. This is a 3rdparty library not following
the QtCreator coding style.

Change-Id: I981e38a10fff1c1792f285d5837553aa7596cd2f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 12:13:17 +00:00
hjk
77661e378a Utils: Remove qPidToPid() adapter function
Since Qt 5.3, there's a QProcess::processId() providing direct access.

Change-Id: Ia9c143c7a92ec61d1aa36ff3f4670ba72a509634
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-16 12:08:16 +00:00
hjk
1a8faab311 ProcessExplorer: Use 64-bit PIDs in DeviceProcessSignalOperation
This is for consistency with the return value of QProcess::processId().
No platform supported by Qt uses pid values exceeding 2^32.

Change-Id: I8dcdaf9e4640f321bf66eb200aeacdc84da5153f
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-16 11:06:41 +00:00
Daniel Teske
014a7b332b CMake: Rewrite logic for kit selection
Some time ago the all the wizards for the Plain C++ were coalesced into one wizard.

Since then the wizard asks first for the targets via a targetsetuppage and then
in the CMakeOpenProjectWizard asked for the kit again.

This patch clean thats up, by always using the TargetSetupPage for kit
selection and removing code from the CMakeOpenProjectWizard for kit selection.

It also adds more types of buildconfigurations

Offer: Debug, Release, ReleaseWithDebugInfo, MinSizeRelease with the
corresponding -DCMAKE_BUILD_TYPE parameters. That argument is saved
in the build configuration and used once for the first cmake run. (Subsequent
runs of cmake don't require passing that to cmake again.)

Also do not require running cmake on creating the buildconfiguraiton, instead
postpone that until the buildconfiguration is made active. With the current
cmake wizard, selecting multiple kits would show a dialog per buildconfiguration.

Change-Id: I3bb806113f4f529f8e291830647d2515a6c4df8a
Task-number: QTCREATORBUG-12219
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 10:08:52 +00:00
Daniel Teske
798fa669bf ProjectExplorer: Check if the project can rename a specific file
before renaming the file.

This adds a new api:
FolderNode::canRename(oldFileName, newFileName) that asks the
project manager if a specific file renaming could be applied to
the project file.

Change-Id: I77bae56db06d81fd03e590285d6079abea2c514b
Task-number: QTCREATORBUG-14521
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-16 09:58:56 +00:00
Thomas Hartmann
366e89e9cf QmlDesigner: Adding helper function for icon browser
Change-Id: I6f333c897802c8bf1d93b168f5d108b77bfa33c2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-09-16 08:55:09 +00:00
Orgad Shaneh
6cac3b73ab DiffEditor: Add indication on failure
Task-number: QTCREATORBUG-15051
Change-Id: If8beef268fa6390f2ff8f36996354f9685b70d80
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-15 20:38:20 +00:00
Tobias Hunger
7adb56afde QmlPuppet: Fix warning about unused static function
Change-Id: I3a7fbc18a8fe6b208600996bfa45202389009a18
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-15 14:21:47 +00:00
Tobias Hunger
83cea95b95 QmlPuppet: Fix warning about overriding method
Change-Id: I3cee4ab6ae27c56808e69adb9da0ffed336c3ff2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-15 14:21:40 +00:00
Tobias Hunger
15614b2b7c Gdb: Fix warnings about inconsistent use of override
Change-Id: I8999f88acd30ecaa475837391ff4ba5622ae8ee4
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-15 14:21:32 +00:00
Ulf Hermann
666fd0d659 Timeline: Provide some sane defaults for all text elements
Change-Id: I40e4a777c6f485443ab142cc220ae22dab44b752
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-15 13:06:50 +00:00
Ulf Hermann
a324694671 QmlProfiler: Persist the last trace file loaded or saved
This is quite handy if you keep all your traces in one directory.

Change-Id: I09842404493c02fb0ca9c4a328950f7b6dcb5be0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-15 13:06:44 +00:00
Ulf Hermann
05388a7229 QmlProfiler: Simplify application state handling
Only half of the states are useful for anything.

Change-Id: I4591ccda6eec902e929e07947bad6c3f7b967ef9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-15 13:06:40 +00:00
Daniel Teske
bcdadbec72 ProjectNode: Provide default implementations of a few functions
Since a lot of derived classes can make use of those.

Change-Id: I051542e8d318476348d753de4d4c0a30b3a9ed62
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-15 10:46:28 +00:00
Daniel Teske
fa94ec2c3b ProjectExplorer: Simplify code for showing rename errors
Lambdas!

Change-Id: I89d381aaca07eb678d818c2be138197e25b855b1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-15 10:46:20 +00:00
Daniel Teske
8395157426 Project: Add a option to synchronize kits and build/deploy across projects
This is far from perfect but seems to work. Further work could add more
fine grained control over which projects are affected by the automatic
synchronize. Also there might be a few cases where the switching is
over zealous or missing.

Change-Id: I26ad3d59431251564917e4b408c66695dc454823
Task-number: QTCREATORBUG-5823
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-15 10:45:53 +00:00
Ulf Hermann
d5707e0e32 Debugger: Use Qt's JSON encoder for debugger protocol
The V4 debug service expects correct JSON as input and gdb, lldb, and
pdb expect Python object literals. There is a subset of JSON that is
also valid as Python object literals and we use that for the protocol
spoken with gdb, lldb, and pdb. The strings passed to CDB are tunneled
through JSON strings and converted to byte arrays before sending them.

Change-Id: I87319b5450e5c3c3b29c565b75cddaa612767611
Task-number: QTCREATORBUG-14931
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-15 08:28:14 +00:00
hjk
7d3bb6fdee Debugger: Remove some unneeded calls to resetLocation()
Since resetLocation() is called when the repective actions are
triggered immediately before the engine's executeFoo() are called
there is no need to call them in executeFoo() again.

Also, remove the unused autoContinueInferior(); function.

Change-Id: I8d2ec419c0da6efa388ce1ed317f31d24654897f
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-15 06:00:25 +00:00
hjk
7ac99044e8 Debugger: Merge watcher request creation
... of {Gdb,Lldb,Pdb}Engine. Code is the same nowadays.

Change-Id: I874b1ddfd813c15cc16c9b91bd894c7c42b56e93
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-15 06:00:14 +00:00
hjk
1cb811ebe6 Debugger: Slim down CHECK_STATE() expansion
Less generated code.

Change-Id: Iafcafc875afa3ead12e10fd5f316d9663b2f9823
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-15 05:55:29 +00:00
Eike Ziller
054ed354e0 Merge remote-tracking branch 'origin/3.5'
Change-Id: I30148c16cbb66ef670caaf1c74dccff47069bf68
2015-09-15 07:41:02 +02:00
Daniel Teske
e818a4ed90 Algorithm: Add a TODO for the future
Currently e.g. this won't compile:
Utils::equal(&Class::toString, QLatin1String("xxx"));

because eqaul_to<QLatin1String> doesn't know how to compare
QString and QLatin1String.

In C++14, equal_to<> (without any template parameter) was added,
which simply works in that case.

Change-Id: I463d01e23f9f0379fea95ef1de4305751af8f1a7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-14 10:54:52 +00:00
Daniel Teske
33d1a91c4f KitManager: Consider sdk kits for initial default kit
Change-Id: I86874f3d138f49d9962e11323364ba856b03bffd
Task-number: QTCREATORBUG-15002
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-14 10:54:35 +00:00
Daniel Teske
37a2cee1c6 GenericKit: Fail to open if the default kit is invalid.
The generic project manager does not ask for a kit on opening a new
project, but uses the default kit.

Change-Id: I33371afb386c780ec8e3e9bbc7010ccfa4733d85
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-14 10:54:25 +00:00
Tobias Hunger
d0a8f5acbf CppTools: Remove unnecessary code from abstracteditorsupport
Change-Id: Ie9032ea494d151a491d37cd5e777f3c2df40f1e2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-14 10:26:31 +00:00
hjk
04cc526630 Debugger: Remove two unused functions from cdbparsehelpers
Change-Id: I63865dd975e981c6c3ed49708e2b81e7e5b1ce0c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-14 09:25:27 +00:00
Tobias Hunger
4345b37bf1 Wizards: Rename all qml template files
The QML lint does pick up the QML template files from the wizards
directory and complains about those when opening Qt Creator. So
rename them.

Change-Id: Ifa7a6006c222bf7b30c41097b07167c845bf7a48
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-14 09:19:29 +00:00
hjk
4c0aa28ab5 iOS: Use some more Qt5-style connects
Safer to refactor.

Change-Id: Ie909b695e7d1d7a473aba6bb39e6bdf0d5d24d85
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-11 14:30:37 +00:00
Ulf Hermann
89f1c0bf53 QmlProfiler: Remove some dead code
Change-Id: I2efd48a4dc13cc3996eda994eb4a046c101ad3e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-11 12:26:53 +00:00
Ulf Hermann
fe2d9e2a3b QmlProfiler: Remove QmlProfilerClientManager::serverRecordingChanged
It doesn't do anything useful. Also the qmlDataReady member is
write-only and can be removed.

Change-Id: I667b05611cfc5960eb2fd73254a7b3c621ae98a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-11 12:26:49 +00:00
Ulf Hermann
fdbed834fa QmlProfiler: Refactor complete() methods
The complete() methods do something more specific. We should call them
by what they do. Also, we don't need to signal the finishing of data
acquisition via a signal and most of the postprocessing can happen in
the worker thread.

Change-Id: Iae986aefb8e7e7d4327c481d7a85325bbff7fa48
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-09-11 12:26:45 +00:00
Robert Loehning
73fbf3afd1 Squish: Don't check state of closed bug
The bug is fixed in master so checking for
it here in 3.5 is wrong and causes fails.

Change-Id: Idd429cf61734c869ada2728151b2bf6f82f6a240
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-11 12:15:20 +00:00