Commit Graph

50929 Commits

Author SHA1 Message Date
David Schulz
7c64799ae3 Debugger: Fix QDateTime dumper for pointer values
Change-Id: Idda3a7853e430e937ce6a99c9d4f0ab63403cb07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-06 09:40:14 +00:00
David Schulz
bf210436eb Debugger: Do not add pointer suffix to encoded output
Change-Id: Ib02629825785b2589d641ea3268665b70a1acde8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-06 09:40:05 +00:00
Tim Jenssen
2a7e336cf6 QmlDesigner: kill delayed property reset timer
Fix fast drag items to the formeditor ui blocking.

Change-Id: Ib395ca86efddcce7cfa031a0f09d71ab6bd15d41
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-03-06 09:34:46 +00:00
Tim Jenssen
681daa0d69 UnitTest: fix no "-fno-omit-frame-pointer" argument
Change-Id: I356fee73b2b50301d4cc857704a90c6dd2eddc18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-06 09:34:29 +00:00
Serhii Moroz
f5f21da69d Find: Assign button shortcuts
Change-Id: I955799cd9bad0531bcc863ed65658a7380672fe9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-06 09:23:22 +00:00
Tim Jenssen
dc155d0834 UnitTest: adjust to new addMimeTypes API
Change-Id: Ib1735e56ec7f56b8792dd462b88882b0324ac08b
Reviewed-by: hjk <hjk@qt.io>
2017-03-06 08:40:45 +00:00
Eike Ziller
461a7483e3 Doc: Remove unused QTC_LICENSE_TYPE define
Change-Id: Iba49e6fc6b1d857cc0f87b5bf833f42a4a8a976f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2017-03-06 07:46:13 +00:00
Andre Hartmann
4ce5964422 Gerrit: Improve button enabling in AuthenticationDialog
* If the text was obviously pasted from the clipboard,
  check instantly
* Otherwise, check two seconds after the last keystroke

Change-Id: I639e2f5dea596afdbb917cf0cffd0cf574d0032f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-04 21:15:54 +00:00
Andre Hartmann
2f51a42461 Git: Convert BranchNameValidator to QRegularExpression
Change-Id: I496d427b4cba65a2aa9ba9b3de84c92f568414f7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-04 21:03:29 +00:00
Andre Hartmann
910c384766 Git: Forbid adding empty branch names
Change-Id: I4f9d65b8293198f409078e739bf047faed544dd6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-04 21:03:06 +00:00
Orgad Shaneh
8d5e8f6874 Git: Do not reuse RemoteAdditionDialog
There's no reason.

Move it to the cpp file while at it.

Change-Id: I365443fa58db278777ec2f06ea172e9f91992287
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-04 20:44:15 +00:00
Andre Hartmann
861d30cf68 Gerrit: Set focus to password in AuthenticationDialog
... if the user name is already filled.

Change-Id: I4ba72d8a74e583bd280b2fe3715bed81a78c516f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-04 20:40:19 +00:00
Robert Loehning
ade7393ec9 Squish: Fix kit selection
Fixes f78327a571

Change-Id: I7e9ea53c96a8382db27213a1d6e182fa865723ee
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-03 18:26:03 +00:00
Robert Loehning
785a982a64 Squish: Protect ALL_TARGETS against accidental changes
Change-Id: I45efe55b87fb1e02e1b4016c9d94353c1823604a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 15:19:16 +00:00
hjk
f6715fe52b Utils: Add a ObjectPool convenience class template
The ObjectPool class template provides parts of the functionality
of the global PluginManager object pool but is intented to be
used with smaller set objects, typically with same base type (e.g.
factories) only.

The ObjectPool takes ownership of add items if and only if the item does
not have a QObject parent.

Items owned by the Object pool are destructed when the pool is
destructed, the other items are taken care of by their QObject parent
according to the usual parent/child behavior.

Change-Id: I60886095c8b04eae017e1fb56774b1bf66dbefa1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-03 14:59:44 +00:00
hjk
e9cdc807e7 ProjectExplorer: Use a local object pool for IProjectManagers
Change-Id: I94ada96da2bf7ce4c95c0ae8f393e6303e79ff60
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 14:49:49 +00:00
hjk
d2b82c6cf1 Switch order of DeviceApplicationRunner::start() parameters
In preparation of merging the class with LocalApplicationLauncher.

Change-Id: I190f8da34a2420061f05ccf4a9fdd428c2a2c57b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 14:49:33 +00:00
David Schulz
51d14393c4 Debugger: Fix double and (unsigned) long long alignment
Change-Id: Ia1ee70a047b3e659730e5a19b874f1f2e567d8ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 12:57:28 +00:00
Christian Stenger
d301824886 Squish: Adjust tests that use Qt Quick UI wizards
Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

Change-Id: I990af2bc83513ad8d85838b037e79dc88bbfdb73
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-03 12:40:38 +00:00
Christian Stenger
27789d2715 Squish: Add minimal test for custom wizards
Change-Id: I4de8c92ad8b40d2a8e275a53763b17b953ef69dc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-03-03 12:40:26 +00:00
Robert Loehning
77cf864e89 Squish: Test removing of kits
Task-number: QTCREATORBUG-17702
Change-Id: I545e9f30dd61eae5a49ff0c56a63dc89f92ce6de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 12:33:11 +00:00
Robert Loehning
9c118fb8f2 Squish: Add function returning all available kits
Change-Id: I6699ad5c869dbbd413d0b1d113a169c2ec06511c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 12:32:51 +00:00
Robert Loehning
f78327a571 Squish: Use list instead of bitfield for kits
Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 12:32:36 +00:00
Vikas Pachdha
350db24891 iOS: Fix developer disk mount fail error
Task-number: QTCREATORBUG-17818
Change-Id: I172a3bc326ea777bed38e467c8a725acc68d13cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 12:04:29 +00:00
Christian Kandeler
3ebde9902a Update qbs submodule
To HEAD of master branch.

Change-Id: Id93d46cef4bbe6df3dca564330f7e1dc1b20d8fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-03-03 12:03:36 +00:00
hjk
d5c8db67ab ProjectExplorer: Hide ApplicationLauncher private functions in pimpl
In preparation of the merge with DeviceApplicationRunner.

Change-Id: I455e7aba255fe760e3186225cc97ccd9214b1164
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 12:03:04 +00:00
Orgad Shaneh
e575a60508 Git: Do not re-use diff controller
When the controller is re-used, the file list is not refreshed.

This doesn't cause a leak, since DiffEditorDocument::setController
deletes the previous controller if already set.

Task-number: QTCREATORBUG-17815
Change-Id: Ic30ef15f9df4fa1cc196dcd175e2df44a88b2f89
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 11:48:39 +00:00
Robert Loehning
57abac6a86 ScxmlEditor: Write real value into real variable
Change-Id: Ie5bc7e0026b7a81b2d6357f44dab69aafae3ef34
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-03 10:20:32 +00:00
hjk
3f5caf4cdc Utils: Wrap MimeDatabase into static functions
To avoid repeating the 'MimeDatabase mdb; mdb.something(); ' mantra
all over the place.

Change-Id: I4bfef62e73275a991455141671d6071162788e9d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-03 07:57:54 +00:00
David Schulz
2cd8378148 Debugger: Adjust offset in QGraphicsPolygonItem dumper
...for windows targets.

Change-Id: Ib3068f470c16141fa1bbd0455aa3805aa084fe65
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 07:57:06 +00:00
David Schulz
37dea3d7a6 Debugger: Fallback to read raw memory
...if native debugger value for an integral typed value can not be
interpreted as an integer.

Change-Id: Ic9753dd56f5d1854dc0765d5de2a0258a38615d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-03 07:56:47 +00:00
Andre Hartmann
9a977a23dd Gerrit: Assure trailing newline when saving .netrc
Change-Id: I919868c0d58f1ac14c1ae15479b11ce15043e042
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-03 05:59:47 +00:00
Andre Hartmann
1c36a6b274 Gerrit: Fix writing .netrc configuration file
The file is expected in the home directory, but was
written in the current working directory.

Change-Id: I4c91f8d706a26331c6b6c878d38ac3556f3ca9b7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-03 05:58:54 +00:00
Orgad Shaneh
45a84ea6b5 Gerrit: Replace bool argument with an enum, and merge url getters
Change-Id: I82035b37de31830f26297944ea0fce8b898201a4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-03 05:43:01 +00:00
Vikas Pachdha
13492fea66 Android: Fix app waiting for qml engine connection
android app in mixed mode debugging sometimes keeps waiting for the
qml engine connection.

Task-number: QTCREATORBUG-17718
Change-Id: Iee87cd0a6d67babaf08e62a6e106ec22fda430cd
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-03-02 15:52:15 +00:00
Tobias Hunger
45ffa75054 Qbs: Move root project setup into QbsNodeTreeBuilder
Change-Id: If8ba7fc6e4edf1346e0636d0bbc78efb27cb433e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:21 +00:00
Tobias Hunger
8cb57c734e Qbs: Move setup code for QbsProjectNodes into QbsNodeTreeBuilder
Change-Id: Ice5b445db916648bb8fb0d0f31bafe1d53e11182
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:14 +00:00
Tobias Hunger
5ed7728d46 Qbs: Simplify QbsProjectNode
Change-Id: I463407a38ed9acfc1332cbeb7cdc37f709c724d9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:08 +00:00
Tobias Hunger
b6b7605357 Qbs: Move ProductNode setup into QbsNodeTreeBuilder
Move closer to a setup where the project tree API can change.

This patch also makes sure "Generated files" will be below the
product file of each product and above any Groups/folders/files.

Change-Id: I728289372d40b809105f55adbe50fd424b19e0a0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:07:03 +00:00
Tobias Hunger
7b3db8ee1d qbs: Move setup of Group node tree into QbsNodeTreeBuilder
Move code to set up the tree of project nodes out of the project
nodes themselves. This makes them easier to manage and will enable
creator to change to a less update-intense project tree.

Change-Id: I2d0702d257e87543f47ebfb456344423ebe4f871
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-03-02 15:06:59 +00:00
Robert Loehning
4427a2525c Android: Add missing comma
Change-Id: I4dd0ef0918a9bab5bbdb89aeb43a45eac360537c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-03-02 13:28:06 +00:00
Tobias Hunger
8b403bb8eb ProjectExplorer: Set Alt-Backspace as default key sequence for Cancel Build
Change-Id: I6cfcaaab00c092373f71aa84a7e92ed1615fb082
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-02 13:19:03 +00:00
Tobias Hunger
7f49457e9d ProjectExplorer: Set a description for the "Stop" action
"Stop" in the Keyboard Setup Dialog is not really helpful. Say
"Stop Running Program" instead.

Change-Id: I23f590b6faf64a9a680295c3ccf77231b4f5cd21
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-02 13:18:44 +00:00
Tobias Hunger
113134b3b6 RunControl: Make sure to reset the outputformater
Make sure to reset the outputformater in the RunControl's Application
Output Tab when the runControl finishes.

Change-Id: I7014727580f56f3769f1308da53a1e37231fba22
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-03-02 13:18:33 +00:00
Orgad Shaneh
cecaa6fbe7 Gerrit: Initialize pointers in AuthenticationDialog
They are initialized in the ctor, but be on the safe side.

Change-Id: I59ac141ecbaaefe08821f7a43cfcfb09233d54aa
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-02 10:45:58 +00:00
Orgad Shaneh
d32f53e176 Gerrit: De-duplicate regular expression matching
Change-Id: I2bc3b2d5261153231204550634ece45d1038e5d9
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-02 10:45:53 +00:00
Tim Jenssen
f2b8e9acd1 SessionManager: Clean up methods around projects
Clean up methods around projects() and update its usages to modern
language standards.

Change-Id: Ia0a4574d014ce41e0d511a392e4eed4680981d0e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-02 09:31:23 +00:00
Tobias Hunger
0a09ba7319 CMake: Make sure BuildConfiguration enabled state is accurate
Make sure the buildconfiguration is disabled while parsing and that
it becomes enabled again after an error in CMake is fixed.

Change-Id: Iec919e3c74c465a14ebb87adb9af142537823f00
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-03-02 09:31:08 +00:00
Christian Stenger
605a581712 Wizards: Fix location of git ignore file
Change-Id: I14a914a53f511353d8d24f8236d7c434ce54dea6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-03-02 09:26:39 +00:00
hjk
aabdc242d5 ProjectTree: Use signals to communicate change from FlatModel to view
Better encapsulation and potentially more than one view on the model.

Change-Id: I45657484a68eba61b3987d324cf1542704ffd61c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-03-02 07:45:48 +00:00