Commit Graph

46254 Commits

Author SHA1 Message Date
Alessandro Portale
fd68fcf30b Center the application icons, add pro/pri document type icons #3
Change-Id: Ia58c1dd147d9b6fe0dc566788d90601d3f9279d0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-29 18:53:04 +00:00
Alessandro Portale
92f57a5b7f Center the application icons, add pro/pri document type icons #2
Change-Id: I656ae574b3cc24c89647d3623de2f5437c4cea3b
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-29 18:51:51 +00:00
Alessandro Portale
280be825bd Center the application icons, add pro/pri document type icons
And fix the export script

Change-Id: I3a06895e3aa23896ef9144f6a8ab32f77904df72
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-29 18:49:00 +00:00
hjk
6b2d2160a7 Android/Debugger: Use -exec-continue instead of -exec-run
... and use the symbol file similarly to the other remote
setups. This makes it work with NDK r10e at least.

Change-Id: I4264d6201d1fb9dd0fed71168ee4155dde53265c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-29 15:00:51 +00:00
Thomas Hartmann
a62777df35 QmlDesigner: Improve naming of constant
This is a display name and should not be confused with the
function pointer.

Change-Id: Id91ed4c0adb26cf91d39be73689aec4f340342b8
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 15:00:43 +00:00
Thomas Hartmann
48177755a0 QmlDesigner: Adding watcher
This watcher checks the directory for the QML file
and triggers an item library update if e.g. a component is added.

Change-Id: Ic130c73d70d328482543cd981f8fba9566d3ab4b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 15:00:36 +00:00
Leena Miettinen
73127a12f2 Doc: "Process data only when process ends" check box
Update screenshot.

Change-Id: I94a9afb9522ebbaad549a8f5f1aaf8adb1247902
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-04-29 14:10:22 +00:00
Ulf Hermann
e76685107a QmlProfiler: Remove timeline model factory
Change-Id: I173f23730f3b6c6b7fb41bb3810f2f21ae6b0acb
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-29 13:58:26 +00:00
hjk
aba988cb81 Debugger: One more safety belt
Task-number: QTCREATORBUG-16179
Change-Id: I661669cd6bf0cf8945c198c9c8d113b7a81c3073
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-04-29 13:37:12 +00:00
BogDan Vatra
e26bbc8459 Fix warnings
Don't try to write from another thread into a process stdin. Fixes
"QSocketNotifier: Socket notifiers cannot be enabled or disabled from
another thread" warnings.

Change-Id: Id93a40a6bee6d4042cf600c8fabb06bf965d8ccc
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-04-29 13:35:40 +00:00
Ulf Hermann
a01dccb426 QmlProfiler: Remove QmlProfilerStatisticsView::getStatisticsInRange()
Change-Id: I49afff5b522fe51651b65046dc560aeb8217e23c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-29 13:32:50 +00:00
Ulf Hermann
09908655e1 QmlProfiler: Remove acceptedEventTypes property from flame graph model
It is unused.

Change-Id: I4c2cb02f21ca564d5b783c46b6cce7c4ac8223e5
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-04-29 13:03:47 +00:00
Vikas Pachdha
794165d5db Ignoring wifi interfaces as debugging over wifi is not supported
Task-number: QTCREATORBUG-16061
Change-Id: Id7ee6e81246cd5e811a01ff787d73018970ce272
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 13:01:04 +00:00
Vikas Pachdha
a2e2db0051 Use secure apis and mount developer disk image on device
Add code to find the developer disk image in xcode installation
based on the device version and build number

Change-Id: Ic05795ad9411ef0f3713c58dc9d286bf6ad1fa19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 13:00:53 +00:00
Alessandro Portale
cb6acf32f9 Bookmarks: Fix a HighDPI off-by-1 issue in the Bookmarks view
Change-Id: I172d887234ac60ef8eba6c695582cfe41a45d9e9
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 12:57:34 +00:00
Alessandro Portale
d7f8af9392 FancyLineEdit: Visualize the disabled state
The painting code path for flat themes did not handle the disabled
state. This change catches up on that, and also suppresses the painting
of the hover border in disabled state.

Change-Id: I29d50be4549c81a25f976c61f6d4541862d2925e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 12:57:23 +00:00
Takumi ASAKI
15543d5957 TextEditor: Add missing message
Change-Id: I208e53aac3f897789fafdce0d71bcb40e0e8664c
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-29 12:32:16 +00:00
Takumi ASAKI
d59c17b098 OS X: SpotlightLocatorFilter: Fix message
lupdate doesn't parse .mm file.

Change-Id: If969452bd1700757ed82db4d9ca53e62ea95d866
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 12:32:03 +00:00
hjk
5f53b95636 Android: Avoid endless loop in the presence of crashed process
while (!proc.waitForFinished(200)) { ... } effectively behaves as
endless loop if proc is already crashed at that time.

Change-Id: Ia2228ceddc9c45a37816209deb7e4fd69c7ab7b9
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-04-29 12:18:55 +00:00
Christian Kandeler
49ffbb041a Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: I6bfcad705ef4af7d832ab5be4ae29947d7e3230a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-29 11:56:11 +00:00
David Schulz
705b89530c CodeAssist: Replace unneded code branching by a simple assignment.
Change-Id: Ia536166d36e4c10f93a54c5927adcfde226d52c4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-04-29 11:08:37 +00:00
Tim Jenssen
af11c6f0c2 QmlDesigner: build fix
Change-Id: I7c25ebb25a561ac47464d2cedb69e4fc70d1a704
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 10:06:30 +00:00
Eike Ziller
26e4943f72 GenericHighlighter: Use new Utils::map for downloading definitions
Gets rid of the dummy callable object for QtConcurrent::map.

Change-Id: I306b238ed72f798b88c859e76def3f97c8ee1582
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-29 09:46:38 +00:00
Eike Ziller
65ce4d61bc TextEditor/Replace: Keep selection even when replacing at front
QTextCursor::insertText removes the selected text and then inserts the
new text, which moves all text cursors that are at the selection start,
so manually first insert behind the selection and then remove.

Task-number: QTCREATORBUG-15623
Change-Id: I8e6e88876c59a82c50ba379506f49ceeaef38e52
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-29 09:45:10 +00:00
Tobias Hunger
955d8e4013 SelectableFilesModel: Check files in the show filter
This is similar to what we did in Qt Creator 3.6.

Task-number: QTCREATORBUG-16138
Change-Id: I557ecb4b853ca25497e720fc30bbbbc160e36a70
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 09:21:27 +00:00
Tobias Hunger
6db6870bdd SelectableFilesModel: Apply filters before parsing
Doing this afterwards will create a tree with all files and then iterate
that tree and filter nodes.

Doing this before parsing the tree will be created with the filters applied.

Change-Id: Iabd20774ab164a159890a5213855f5cc8aa93477
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 09:21:23 +00:00
Tobias Hunger
81ce0b055d SelectableFilesModel: Avoid unnecessary re-filtering
Change-Id: Iedb6d9faa9d71491985ba15c8da9530c7df85590
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 09:21:20 +00:00
Tobias Hunger
4f76fdaded QMake: Fix crash when canceling qmake run
Change-Id: I24d286210086bd85825b8fd300a69b4bb8778367
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 09:20:58 +00:00
Friedemann Kleint
71dd7102f8 TestEditor/ModelAdapter: Fix model to pass the model test.
Check for invalid (top level) or valid indexes in the overridden
functions. This prevents crashes due to accessibility traversing
the model.

Task-number: QTCREATORBUG-13142
Change-Id: I22d0831338436479e6ec3b215514bbb9513dffc7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-29 09:13:03 +00:00
Wolfgang Bremer
2f301bc45b CMake: Update qmljs codemodel
With this patch it is possible to specify QML_IMPORT_PATH in
CMake projects and QtCreator will scan those paths.
One only has to make sure that the variable which is set in the
CMakeLists.txt is also added to the CMakeCache.txt

Task-number: QTCREATORBUG-11328
Change-Id: I11c7694806664d3203d855983e7db4a89fac267d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-04-29 09:08:05 +00:00
Tim Jenssen
c90a356be6 QMLJS: update to qmljsparser from Qt 5.6
Change-Id: I29a8e07b0b34aa5e8466021cbb71450687f7e11c
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 09:07:58 +00:00
Thomas Hartmann
5c45e9ec34 QmlJSEditor: Improving ComponentFromObjectDef
Now the use can choose which properties are defined
inside the component and which properties are kept in the
original file. To make the concept clear the dialog contains
a snippet of the generated code.

Change-Id: I92f9f241c9780345dd03b991232c4a811356c266
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 08:43:31 +00:00
Takumi ASAKI
89aa06e37d QbsProjectManager: Modify QbsBuildStepConfigWidget layout
Old layout was too tight for translated messages.

Change-Id: I98ffeb5bc6c9ac565edafdf5412e27db818b4052
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-04-29 08:26:43 +00:00
Leena Miettinen
29f569831a Doc: Update screenshots related to editors
Change-Id: I32dead1c1dfe4f736c97ba9ff1af477ee2359c3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 08:17:48 +00:00
Thomas Hartmann
1ba0e5cdf9 QmlJS.PropertyReader: Allow access to raw ast value
Change-Id: I92f9f241c9780345dd03b931232c4a811356c216
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-04-29 08:15:36 +00:00
hjk
d69bec2dcd Debugger: Avoid multiple inheritance in ThreadHandler
Using it implies dynamic_cast in treeitems, and we want to avoid that
across library boundaries.

Change-Id: Id2e624b770cd559ef9e8b25366734f2dd92658c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-04-29 08:14:07 +00:00
Eike Ziller
c75c54e930 Generic Highlighter: Use dialogParent for error dialog.
Change-Id: I58c8326cef7b26e433cd259d457fed6eb7dd59c0
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-04-29 08:11:19 +00:00
Ulf Hermann
9092a9e9b8 QmlProfiler: Remove unused QmlProfilerEventsViewFactory
Change-Id: I813e1a7df32085f26dfdff8ae06f864c29903f20
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-29 08:08:30 +00:00
Ulf Hermann
95ccc23ada QmlDebug: Properly set the debug messages feature
We get notified about debug messages, after all.

Change-Id: Ie6fcdfa68b36969c264ebc6e54e6359c8d723584
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-04-29 08:08:20 +00:00
Tim Jenssen
93b25618cc QmlDesigner: modernize and beautify code
Change-Id: I937ce76ca96f4d2f3af2febd9448749f69513b02
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:07:28 +00:00
Tim Jenssen
55c951e4a7 QmlDesigner: move DocumentWarningWidget to extra file
Change-Id: I6ea87a224565b77ff42f187461094ca258dcdb01
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:07:15 +00:00
Tim Jenssen
a29dcac4cf QmlDesigner: modernize code style
- no behavior changes
 - using nullptr
 - renaming data -> d
 - transform single used small slot function to lambdas

Change-Id: Ifae389b8a865b0b6a501b6f3d60597a66d9febe8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:07:09 +00:00
Tim Jenssen
61bafe3407 QmlDesigner: keep warnings for later showing
Change-Id: I5f9c51480a1d0276a356737ab1f91a8f76443c5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:06:54 +00:00
Tim Jenssen
bc08c10764 QmlDesigner: do no refresh if there is no parent
Change-Id: I2299437ea97e884f4b7734129eec8246c87208ab
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-04-29 08:06:40 +00:00
Ulf Hermann
8e058ee338 Doc: The perf profiler can now unwind JavaScript
... with certain quirks.

Change-Id: I3192853caf978a50cbf05adc039b5704a955f05c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-04-29 07:51:06 +00:00
hjk
a246e43220 Debugger: Make safety check safer
This amends change ad55631c.

Change-Id: If0679ee2f3559fd3d1b2ef57e7456a159dd25b3b
Task-number: QTCREATORBUG-16180
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-04-29 05:30:46 +00:00
Alessandro Portale
626ca46844 applicationicons.svg: Tweaks
Change-Id: I2d44eada71278375f1c3df864c6d6ac5351af437
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-04-28 17:49:41 +00:00
Leena Miettinen
384d66613d Doc: Update info about Qt Quick debugging
Update, add, and remove screenshots.

Change-Id: Id5e77b1ebba4306f28e2d6d20e6ed5ffac0d2e52
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-04-28 15:03:02 +00:00
Christian Stenger
43f245bda3 Tests: Fix missing return
Change-Id: I78fdad351d7389f2d046c2cf1793cdca2d972815
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-04-28 13:55:33 +00:00
hjk
238d045b87 Debugger: Show (qmake's) ProKey type as ProString
Saves one level of expansion when looking at containers.

Change-Id: I4d43af2fb0dd0e9d493a12335d6b8b541e741ecf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-04-28 13:24:09 +00:00