Commit Graph

47012 Commits

Author SHA1 Message Date
Christian Kandeler
f634141010 Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: Ia7c21675bbdde16e4d1131b98d02b05d8f5b2340
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-08-01 07:22:54 +00:00
Christian Stenger
18ac6b8be1 AutoTest: Minor fix for initial test scan
If parsing the project is not finished we get an empty list of
files to be scanned.
Just trigger another full scan for such a case.

Change-Id: I84b275f76bc98c8f0ef544fc27d30ebd6f8b43d1
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2016-08-01 07:21:48 +00:00
Leena Miettinen
d1a5d164b1 Doc: Add QML JS static analysis message M128
"Error: A state cannot have the specified child item"

Change-Id: I83b4916126e0abe6b3b5ab5c6ccfc171e82fde4e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-01 07:17:45 +00:00
Lorenz Haas
69143bc3a9 Wizards: Fix list model wizard's rowCount()
rowCount() must return 0 when the parent is valid: this indicates that
the list's items has no children and thus it is no tree model. The
list's size has to be returned for an invalid parent (== the invisible
root node).

Change-Id: Ieaa884958ea0094aca2232160b6f769bf90514c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-31 09:23:38 +00:00
Alessandro Portale
f41e1d3a31 QmlDesigner: Fix Flat Dark QmlDesigner_HighlightColor
Selected items in the navigator tree are hard to read. This patch turns
the highlight slightly darker, which makes the light gray navigator item
text easier to read.

Change-Id: Ibe1de477f44ad8dfd7b53c3d7bd92b39ad0ed1a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 12:12:28 +00:00
Alessandro Portale
5e93c5efa9 creator-dark scheme: Make selection behave with the other colors #2
Set the selection color back to the previous one.

Task-number: QTCREATORBUG-16682
Change-Id: I13a00bde7fcceda5d911802e65afd3593b1630f5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:59:20 +00:00
Alessandro Portale
39ddd353e4 creator-dark scheme: Make selection behave with the other colors
Selected preprocessor code was unreadble: unsaturated red on turquese.
The selection color now defines a foreground color (the same as the
line number color).

Task-number: QTCREATORBUG-16682
Change-Id: Ibb213010557da5bd68fb5a22822cad467fd03092
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-30 11:52:04 +00:00
hjk
80b402403a CppEditor: Rework CppIncludeHierarchy model
Use a Utils::TreeModel as base for the model. Avoid excessive
expansion of items during incremental search.

Change-Id: Ic2f51c7e467ea127ccf69ef7d122cec4a63be2f5
Task-number: QTCREATORBUG-15834
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-29 13:13:02 +00:00
Thomas Hartmann
5c5197d19d QmlDesigner: Adding debugging operator to BindingProperty
This is required to output the expression in the DebugView.

Change-Id: I3ce0bf4a916e30e8c86c224e305fa1c4af337489
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:11:47 +00:00
Thomas Hartmann
7c3f61f819 QmlDesigner: Fix regular expression
We have to use a non capturing group for the optional 'Id'.

Change-Id: I59431d78908a16f571febdf14c57bfe079ca6817
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:11:38 +00:00
Leena Miettinen
ecbd1fa408 Doc: Update creating components and screens with Qt Quick Designer
Add dependency to the Qt Quick Controls 2 docs

Change-Id: Idcbb856cf38d8867dc781ade572cf18f87983912
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:10:13 +00:00
Leena Miettinen
dfd3568a70 Doc: Update screenshots of Qt Quick Designer Connections pane
Change-Id: Icb85ac30145b2897b4a9c9e83e476337bae3f8f2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:10:02 +00:00
Thomas Hartmann
3bd9dbf5b2 QmlDesigner: Adding testproject for directory imports
Change-Id: Ib9f4feb745722dc1e43c6651ed1cfc4a017818e7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:04:17 +00:00
Nikolai Kosjar
ad49e64ff0 CppTools: Cancel parsing if editor is closed
The m_parserFuture.cancel() in ~BuiltinEditorDocumentProcessor() did not
cancel anything. Thus, closing a document while the parser was running
led to a blocking UI thread.

Now it cancels at the next include directive it encounters.

Change-Id: I092fddbbd747e0bc95265b6e9b4fcc26b3f76cb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:03:07 +00:00
Nazar Gerasymchuk
c8020af997 ProjectExplorer: Fix tab order in projectwizardpage.ui
For unknown reasons tab order in projectwizardpage.ui was set
incorrectly and behave unexpectedly. Now tab order behave naturally.

Change-Id: I56dd70234b6ebd734b5893f50d4f7255c23639d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:01:34 +00:00
Nazar Gerasymchuk
09cbe5621d ProjectExplorer: Fix tab order in CustomParserConfigDialog
For unknown reasons tab order in customparserconfigdialog.ui
was set incorrectly and behave unexpectedly. Now tab order
behave naturally.

Change-Id: Ife117dd0dfd8c583e4bfe6b1191bdcae65bad05b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-29 12:01:25 +00:00
Tim Jenssen
a13875daf5 QmlDesigner: disable validator for source property column
The source column can have contain real code so disable the
validator and trimm the expression because it is compared
with the  already trimmed source in the rewriter.

Change-Id: I0cc684f8446799e3bd4ee77a8a9bb8077164f3b9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 09:52:14 +00:00
Tim Jenssen
1d61239bb9 QmlDesigner: readd the flag to fix a crash
Also this is necessary to be at the right middle
position of QtCreator.

Change-Id: I691002b7ed5a29a1ea2094f62aba121b2a2e458e
Task-number: QTCREATORBUG-16673
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 08:25:11 +00:00
Leena Miettinen
7ad279e99d Doc: Update Qt Quick Designer connection editor docs
- Update the screenshot
- Use "select" instead of "specify", because items and
  properties can be selected from lists.

Change-Id: I292f7900d956c682e3f4b6071bbef9a6362cc6be
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:34:25 +00:00
Leena Miettinen
55466483cb Doc: Update descriptions of Qt Quick Application wizards
Some fields are only available in some wizards.

Change-Id: Ibecca943fcd5ce8bdc131896762093c1918d56cd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:34:11 +00:00
Leena Miettinen
412c221ddc Doc: Describe Qt item model wizard
Change-Id: I22256c3060623a8350a96a56274d5cb2fc2504bb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-29 07:32:18 +00:00
Leena Miettinen
efe1e70ea2 Doc: Update info about QML file wizards
Change-Id: I71a6f068c1b310bf2038379afde63c1ad32652a6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-29 07:32:06 +00:00
Leena Miettinen
659950e95d Doc: Using Ctrl+N and Ctrl+P shortcuts to navigate in locator
Change-Id: I290f148e5a7ceba42d3fe17a70ec59efcb774aef
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-29 07:31:17 +00:00
Thomas Hartmann
bc6faeade2 QmlDesigner: Use proper icons for Controls 1.0
* Using proper icons
* Removing unused images

Change-Id: I0b4ba6d33f14950fef28f9546aa39b7f5d5a38dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 15:30:52 +00:00
Alessandro Portale
9f53b0e13c ProjectExplorer: Themable miniprojecttargetselector.cpp
Replace some hard-coded colors with theme colors. That is required for
the Flat Light theme.

Change-Id: I2ce289fce8c2e6437148eb691484e0441975979f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 15:30:17 +00:00
Christian Kandeler
b1477190de Fix qbs build on macOS
"osx" -> "macos"

Change-Id: Ie25e096b2759cf8f96411560fcca337169d80b08
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-07-28 14:45:12 +00:00
Thomas Hartmann
ccf040239f QmlDesigner.PropertyEditor: Improve binding editor
The binding editor now behaves like a modal dialog in the
property editor.

Change-Id: I9b1a0635dbe5cc0b055225411af653dd8bf6b735
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 14:42:35 +00:00
Nikolai Kosjar
14428c1586 Clang: Decrease order of snippets
The order is 0 by default and thus the snippet items were at the very
top, e.g.:

  enum EnumType { EnumValue };

  void f()
  {
      EnumType et = // Complete here and see snippet items at top
  }

Change-Id: I70a160d102b91a2589972354c50aa5f0b29323e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-28 14:42:30 +00:00
Christian Stenger
80352d703c Tests: Disable QTest crashhandler for plugin unit tests
Temporary workaround to avoid dead lock when executing
plugin unit test.

Change-Id: Ie6c3673d756ff3b67320bcc75d590933e58a5276
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-28 13:30:01 +00:00
Thomas Hartmann
5303a9b485 QmlDesigner.PropertyEditor: Show border between buttons
without this it is not 100% clear that we have separated buttons.

Change-Id: I2d8ee228a0104d68e381d23c5435a1b9cb7cf4cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 13:29:03 +00:00
Orgad Shaneh
f398e7d22a TextEditor: Use initial palette for default colors
The theme might be incompatible with the text style settings, especially
those that rely on the default palette (and were designed before themes
were implemented).

Task-number: QTCREATORBUG-16482
Change-Id: I8f63460ad250a494dcafd11366d7bacdbb71c142
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 13:21:49 +00:00
Thomas Hartmann
589aef89e0 QmlDesigner: Remove lines/borders from scrollbars
Change-Id: Iefc1d6a42df2aa858b68d4ce25840c766a8c86cb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 13:16:42 +00:00
Leena Miettinen
735bf2cf09 Doc: Fix capitalization of "Editor settings" label in docs
Change-Id: I3ee24f7eb52c71057ee88004d98acd977dbd2841
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-28 13:05:06 +00:00
Alessandro Portale
dbe42bf040 QmlDesigner: Avoid double borders between items in the item library
Change-Id: I09ecba996d269a63ab24668f7f8a1c0669d9a2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 11:28:41 +00:00
Thomas Hartmann
638279cc98 QmlDesigner.PropertyEditor: Unify size of controls
Change-Id: I375396ada5f394247346c3a66319796295894641
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 11:07:43 +00:00
Thomas Hartmann
c7ba291c68 QmlDesigner.ItemLibrary: Adding logging category
This makes it possible to debug the .metainfo files in
a release build/package.

Change-Id: Iceae98b0e00b9d4deba0ae3f31b1f55fca2c5cf2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 11:02:54 +00:00
Thomas Hartmann
dd2d17ed36 QmlDesigner.FormEditor: Do not overwrite auxiliaryData width/height
We using F2/goto into component the auxiliaryData is typically
already set.

Change-Id: Ib201198f5fcd7a716fb416b54537488cc5b68afc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 11:01:57 +00:00
Thomas Hartmann
b8a22a5ec1 QmlDesigner: Rework of theming colors
* Use the original fancy toolbar colors by removing the
  Alpha channel.

* Use the splitter colors for borders to avoid white borders
  in light themes.

* Use the FancyToolButtonHoverColor for buttons and combo boxes.

Change-Id: Id636e0713c8e2769c5eb03a115a60ccad8226f23
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 10:59:58 +00:00
Thomas Hartmann
876ec5996c QmlDesigner.FormEditor: Adjust CSS for LineEdit
Change-Id: I7d4fbb3c16747f6d2b290db18b7c48b63a23bdd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 09:36:34 +00:00
Christian Stenger
8c42cd9e23 AutoTest: Fix retrieval of executable
Respect different location if tests are installed
before executing.

Task-number: QTCREATORBUG-16638
Change-Id: I2d154e26cdd0f28bd51e7a885c5486d36af38a68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-28 09:21:41 +00:00
Thomas Hartmann
80ca67e43f StyleHelper: Fixing alphaBlendedColors
Change-Id: Ib2f5e37e213e221ecfcce876ed2f44013815ca46
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-28 09:00:08 +00:00
Alessandro Portale
4bdd1ffbf7 Themes: Enable using the original Window color for toolbars
This patch adds a flag which enables the "fancy" side/tool/status bars
to use the original Window color from the application palette.

The flag is disabled for all themes by default.

Task-number: QTCREATORBUG-16331
Change-Id: I1433e865e1903012d521a2cdb7083f110086e455
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-28 08:58:47 +00:00
Ulf Hermann
659b0b4788 Android: Add context objects for QObject::connect with functors
If several threads can be involved in the signal/slot exchange we need
to show the receiver objects to connect() so that the signals can be
queued when necessary.

Change-Id: I24b4fe90095ce10eeeff9618faff97bd9d05c6eb
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2016-07-28 07:20:44 +00:00
Leena Miettinen
bce5aca625 Doc: Update Git docs
- Fix paths to functions
- Describe Reset button in Branches dialog
- Update screenshot

Change-Id: I873921a8ee0d4ec6e3572be01e5c59e51adb7a0a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-27 14:51:00 +00:00
Leena Miettinen
2ab466ea04 Doc: Describe model and state chart wizards
Add the Qt SCXML index file to be able to link to the module
docs.

Change-Id: Ibd28071cdc3c98c07fb91c73732d809ffed5333b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-27 14:21:04 +00:00
Thomas Hartmann
fc792d0218 QmlDesigner.PropertyEditor: Align reset button
Change-Id: I05fd4f6a2cc668a5ec65919b1ef83bea117a7789
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-27 14:20:34 +00:00
Nikolai Kosjar
351919a1bf ClangStaticAnalyzer: Do not try to determine version of clang-cl.exe
It does not understand "--version". Use clang.exe for the version check.

Change-Id: I64a46e8e2e5be47ad6f13c9c5497264e1128a22a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-27 14:19:17 +00:00
Thomas Hartmann
66c589f9ca QmlDesigner.ItemLibrary: Adding support for StackLayout
The StackLayout is working and it makes sense to add it to the
item library.

Change-Id: I732398a25091f2a33f38c42f5bf1c55ef9dac237
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-27 14:19:16 +00:00
Oswald Buddenhagen
034cff4693 Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
2016-07-27 12:45:54 +02:00
Alessandro Portale
b4bb1e97b8 QmlDesigner.StatesEditor: Themed borders
Use the typical theme color role for border.color in the state items and
"+" button.

Change-Id: Id87180deeff8c69da2bacf541484482a2cd4d380
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-27 10:22:33 +00:00