Commit Graph

41387 Commits

Author SHA1 Message Date
Tobias Hunger
435f6caa1a Wizards: Simplify code a bit
Change-Id: I3d80ca7810001cb02fe7e147fbfa013a9aaaebbf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 10:07:42 +00:00
Arnold Dumas
c95b9d1d0c Remove leftovers from Qt::escape().
Remove useless includes and comments related to the old Qt::escape().

Change-Id: Ice44317e5440c0dd41e770da6f1443ce687735f1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-06-01 09:52:09 +00:00
Leena Miettinen
87676c8285 UI text: fix capitalization
Change-Id: I1fa557f75b0a8d9ab37cdf47ed4564eca4634d8f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-01 09:24:09 +00:00
Tobias Hunger
859e842eed NewDialog: Always default to "All templates"
This is more reliable than choosing the first platform (whichever
that happens to be).

Change-Id: Ic2b33de96af295bdaa0955014853e1a5cf7605e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 09:23:27 +00:00
Tobias Hunger
5000b29543 Wizards: Do not list plugins in available feature set
This information is only available via pluginFeatures() now.

Change-Id: I4945933288e492578dafc2600eb8f77f0ee43cb3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 09:17:49 +00:00
Leena Miettinen
e2e175f092 UI text: use double quotes for emphasis
Change-Id: Ia32f968bc672c587925ebc600de06b4387966aee
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 09:11:26 +00:00
hjk
51bb52139c Utils: Remove some unused SavedAction members
Looks like the orginal users in the debugger views context menus
prefer to create their entries on the fly nowadays.

Change-Id: Ice3ba358b0d746e03e64c3c8b872c69c18bcaba3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-29 11:08:54 +00:00
Robert Loehning
c7b7fde2bf Squish: Fix verification in tst_rename_file
This doesn't change anything until we replace the used project.
main.cpp or utility.cpp may get the tempFiletype "Headers" and
then the test will crash because the file can't be opened.
In addition, only files with filetype "Headers" are included in
other files, so verifying including of other files is
pointless.

Change-Id: I30b20269a800eca5ef51de3af209e674da5189bd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-29 10:33:05 +00:00
hjk
389acf55f1 Qnx: Remove dependency on gui-private
Was used in blackberrydebugtokenreader.cpp, but is not
used anymore.

Change-Id: Ie55b2ab08773d0f541efb1a22e0c21c36f4ba7b3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-29 10:27:04 +00:00
Robert Loehning
74cbd8559f ProjectExplorer: Show file name when referring to project file
Change-Id: Ib8fd32b4134620807ca7d311d6a844175e105bd1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-29 09:56:54 +00:00
hjk
f5548f4018 Debugger: Unexport DebuggerRunControlFactory
Change-Id: I0d7c3ba312f7242d14b9c7cf4fe7174325b518ca
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-29 09:49:39 +00:00
Robert Loehning
a8cdf035ac Squish: Update to changed behavior when renaming
The bugreport I wrote about this was rated invalid
so now this is the expected behavior.

Change-Id: Ia187062552ad9d4857b5078d4c9c5dde4c8b7521
Task-number: QTCREATORBUG-14469
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-29 09:43:58 +00:00
hjk
6eada122a3 Use free Debugger::createDebuggerRunControl() function
Allows us to un-export DebuggerRunControlFactory in an attempt to
slim down the publicly visible Debugger plugin interface

Change-Id: I0c2e7351ffa7a9d16586172816635be8ff40172e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-29 09:19:16 +00:00
Christian Kandeler
0879785839 RemoteLinux: Fix upload for target file paths with spaces.
In addition to causing an unhelpful error message, we would also create
directories at unwanted places. For instance, deploying to a directory
called "/tmp/test dir" would result in this:
    mkdir -p /tmp/test dir
Which created two unwanted directories, one of them at a completely
unrelated place.

Task-number: QTCREATORBUG-14518
Change-Id: Ie1c287ca73d0815b9bed335141adb901e361e3e6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Karsten Sperling Opdal
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
v3.4.1
2015-05-29 08:23:25 +00:00
Arnold Dumas
04733e35ec SSH: SshKeyExchangeInit is a struct.
Use 'struct' keyword in forward declaration to avoid compiler warning.

Change-Id: I5a10eabea806ce138aed31e8b1a99567afe92e77
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-28 19:43:24 +00:00
Tobias Hunger
1c51de11ce Wizards: Simplify code a bit
Change-Id: Iedcb36af5a64c2ae322bb2eb7f7fa73df9426114
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-28 15:56:42 +00:00
Tobias Hunger
828b0de5db C++ class wizard: Do not add Q_OBJECT macro for non-QObjects
Task-number: QTCREATORBUG-14515
Change-Id: I02e423acc53ae23169399bc9b86b4753cb84f7a2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:20 +00:00
Tobias Hunger
c53099648a Wizards: Do not list json wizards that go with plugins that are not loaded
This needs the patch that splits features and plugins in the json wizard
and makes sure that the requiredFeatures are ignored by the "All templates"
selector in the NewDialog while the "enabled" statement of the JSON
wizard still takes effect.

Change-Id: I76fd5d72a73af064cf5047a6a43aec6598f675bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:07 +00:00
Tobias Hunger
bcc3cc992b JsonWizard: Make description on projects page default to the wizard description
Change-Id: Icb8a4856dda4298b3ee901bc7a5c22190ddca5a6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:02 +00:00
Tobias Hunger
f68704f8fd JsonWizard: Make checkbox default values true and false
That is closer to what a user expects than the "0" and "1" used
before.

Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:54 +00:00
Tobias Hunger
f76b9b549c Move plain C application wizards into one Json Wizard
Change-Id: If01fe6722c76df83015afa68b18d62ff1eaf523f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:44 +00:00
Tobias Hunger
f1f2475d3e JsonWizard: split plugins and features when considering enabled state
Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.

Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:50:24 +00:00
Tobias Hunger
bd40ef3659 JsonWizard: Make enabled state of wizard more dynamic
Now it can be toggled based on platform selected.

Change-Id: I663e8cff149da8df55baab4ab4f61c2c2e06f837
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:44:50 +00:00
Tobias Hunger
97cb82c1be Wizards: Add a method to query available features
Change-Id: I4dc03acbd2fdc040c2a49ed8923d1615489d8288
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:42:22 +00:00
Tobias Hunger
7c1b21f60f KitManager: Report all features on empty platform
The platform is empty when "all templates" is selected in the
NewDialog. In that case I expect all possible features to be
reported.

Change-Id: I2ad4ba6df217b39ffa44b7001875e46c04712bb5
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 15:34:36 +00:00
Tobias Hunger
f09a87e5ba JsonWizard: Add helper to deal with string lists
Change-Id: I5d30f22367b365a71417c473cba3ce7125567a77
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:34:30 +00:00
Eike Ziller
29d81424a2 More changes
Change-Id: I38a0c5cef0f22e1b7eda218c3992fcecfe728455
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-28 15:02:37 +00:00
Tobias Hunger
b70d63952a JsonWizard: Make enabled/disabled more consistent
Wizards have a "disabled" flag, everything else can be "enabled". Make
that more consistent by having the "enabled" for the wizard, too.
Wizards default to "enabled" now, just as they did default to "not
disabled" before.

Change-Id: Ic91f60196137daf353f7995b10ade19673d66f4e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:00:49 +00:00
Eike Ziller
154b3e52b2 AndroidManifestEditor: Initialize SDK versions when setting up UI
Instead of initializing it when opening the file, which has nothing to do
with it.

Change-Id: I5270d424c26dde7a66c0916281f718f779b1b2ac
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:16 +00:00
Eike Ziller
ea859787ca AndroidManifestEditor: Fix handling of external changes
The editor was not updating the UI part if that is active when external
changes happen. Switching to XML Source would then overwrite the
external change.

Change-Id: Ib63257e75e065d151cb2a078443dc2afc8392ab8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:12 +00:00
Eike Ziller
ff30cf72b0 Android manifest editor: Set focus when switching tabs
Change-Id: I4fd52b852d274783f679b056842b87ba886ddf90
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:07 +00:00
Eike Ziller
5e7b17804b Fixed that saving project unrelated android manifests crashed
If it didn't find a project corresponding to an android manifest, it
crashed when trying to update that non-existing project.

Change-Id: I27ccaab14c0de8845a161d16becf73eb59c1d9c3
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-28 14:15:01 +00:00
Orgad Shaneh
d0f9ed7ea4 Utils: Consider timeout of 0 for SynchronousProcess as infinite
Makes much more sense than plain 0.

Fixes Git interactive rebase that should have no timeout.

Change-Id: I48b4d4dc35c8e5ed13e074d431d05d6795eb8797
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-28 10:35:06 +00:00
Christian Kandeler
1ca649994c Fix qbs build.
Change-Id: I3d335648bed71faf92079b08b19f11119a664a02
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-05-28 10:31:38 +00:00
Eike Ziller
cdc76fccaf Help: Fix that user registered documentation was auto-removed on windows
We may not use native path separators for internal data.

Task-number: QTCREATORBUG-14249
Change-Id: I0f00db235608e81cfefdd2359378020c7376768f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 09:22:08 +00:00
Christian Kandeler
3b8ea3fc1e SSH: Support ECDH key exchange.
As per RFC 5656.

Task-number: QTCREATORBUG-14025
Change-Id: I623c9f0808967f140cdfb40e11234c2e523484e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-28 09:07:24 +00:00
hjk
244cdb7804 Debugger: Split off runtime-only items from DebuggerStartParameters
Right now, DebuggerStartParameter is part of the debugger plugin
external interface. Better not make it fatter than necessary.

Change-Id: I3b9205089f971dd314ccba1335b5ca2d4d9fe7c6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-05-28 08:54:48 +00:00
BogDan Vatra
28d2b16165 Allow plugins to insert custom imports.
This patch allows a plugin to insert custom imports. These imports are
used by QtC for syntax highlighting and code completion. This way a
plugin can register types and objects that are available only at
runtime.

This is an example of an imports function implementation:

QList<Import> MyPlugin::imports(ValueOwner *valueOwner, const Document
*context) const
{
  // context is needed to know from which project is the opened document
  // in this example we don't care about multiple projects

  Import import;
  import.object = new QmlJS::ObjectValue(valueOwner, "<defaults>");
  import.valid = true;
  const ComponentVersion version(1, 0);
  import.info = ImportInfo::moduleImport("MyPlugin", version,
QString());
  auto myType = valueOwner->newObject(nullptr)
  myType->setMember("myProperty", valueOwner->valueOwner->intValue());
  // add more properties & methods/signals to myType

  import.object->setMember("MyType", myType);

  // in this example we return only one, but you care return more than
one
  return QList<Import>(import);
}

Change-Id: I395c273c7b15a9e4ed5a89a81d70ff92db2b7c0c
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-05-28 06:17:58 +00:00
Eike Ziller
83fc8e1fd3 Fix crash at close after editor failed to open
When a file is part of a project, but fails to open in an editor, the
editor configuration would still keep a reference to the "created" editor
that in the end was not "opened".
Remove editors from the configured editors list when they are destroyed,
instead of when they are "closed".

Change-Id: Ib9680d56b737214c09f935f0088a77959ca7e8ba
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-27 15:49:16 +00:00
Christian Kandeler
66ccbcbb37 SSH: Minor refactorings in key exchange code.
Change-Id: I107a61831ca7824c30dcc83b3a13f5765dd2da52
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-27 15:39:37 +00:00
Nikita Baryshnikov
9ec332afdd BaseFileFilter: export Iterator
and deinline dtor. It saves 1 copy.
Similar to 184695be92

Change-Id: I2a55b00aa65bc3d0ac7f45d7321ea099882c776e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-27 15:28:43 +00:00
Christian Kandeler
2ed0592dea SSH: Fix error in test.
Change-Id: Ifda41d0fdef54cbc1c5e397be6782bda7a047098
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-27 15:03:39 +00:00
Tobias Hunger
d7b70000ac JsonWizards: Move .gitignore template file
Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 14:11:35 +00:00
Tobias Hunger
dbec2d21e1 JsonFieldPage: Add conditions to combobox entries
Change-Id: I4982564fcb8160302206e12e64f2f2bba338e09f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 14:11:20 +00:00
Orgad Shaneh
e553450c1d TextEditor: Improve initial size for code style editor
It currently doesn't contain the code it displays.

Change-Id: Iae6752d4f6feed3c231dcb4529e16110defb14fc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-27 14:06:51 +00:00
Venugopal Shivashankar
ed3c8f1f76 Escaped a special character in the XML file
Without it, Qt creator complains that the XML file is invalid and
it could not be parsed. Made a language edit as well based on the
sanity bot's recommendation.

Change-Id: I04acd60d9ee4f5f29f443fa56beed6ecfbdbef64
Task-number: QTBUG-41996
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-27 13:25:01 +00:00
Ulf Hermann
7b7dddbbc5 Timeline: Adapt test case for behavior change in selection handling
Change-Id: I560cce362964baf9877d5a4833223ca0669b6d0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-27 12:10:33 +00:00
Ulf Hermann
15300d8c85 Timeline: Test that model height change signals make sense
Change-Id: I561fb90f163f3ee2bd9f8a28e839392f2501c61f
Task-number: QTCREATORBUG-14507
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-27 12:10:25 +00:00
Joerg Bornemann
2f33b50f74 QmlProfiler: remove now superfluous processingDone method
This detour existed to ensure that the V8 model and the events model are
done processing before we call complete.

Change-Id: I89b3ec7935e63e8cbcdeaff74d407064456c07be
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-27 11:55:30 +00:00
Joerg Bornemann
3e8a40c382 QmlProfiler: remove V8 tab
V8 is gone long enough to stop supporting it.

Change-Id: If086925359097a69ffab2b2eba4de6f63bd5195e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-27 11:55:26 +00:00