Commit Graph

44349 Commits

Author SHA1 Message Date
Thomas Hartmann
5ead71bf81 QmlDesigner: Proper styling for TabWidget buttons
Change-Id: I25c325920ed9a7ced87cbc1d01ad73c9e745ac71
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-10 07:13:09 +00:00
Thomas Hartmann
fafb99d910 QmlDesigner: Reformat .ui.qml files when saving
The feature can be turned off using a setting,
if there are serious issues with the reformating.

Change-Id: If90475af2db8aaade8bc52af0fb7cd14bfa1c121
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-10 07:13:03 +00:00
hjk
bcdc41b42b Debugger: Update L&E view when toggling dumper use through CDB
Change-Id: Ic227009a83197ca25d95acee494372bb53833a96
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-10 07:12:26 +00:00
Christian Stenger
4048403ae7 AutoTest: Separate settings pages
Change-Id: Ib7fedbd5c3bfdc793e1ef203a3ad808c55ac1a70
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-10 06:34:55 +00:00
Christian Stenger
18dc7a5de9 AutoTest: Move framework settings into framework manager
Change-Id: I9914291adb102de5136802eb3b6d12afb6276538
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-10 06:34:28 +00:00
hjk
a6032652ef ProjectWindow: More tree polish
- Remove 'panel memory effect' when switching kits

  Previously, each target entry memorized when its Build or
  Run page was used, and when switching to the target, that
  page came up.

  Now, don't use that when switching targets, but instead
  take the same page as is selected on the target we are
  switching from.

- Disable selection of the Build&Run and Project Settings
  "group entries"

Change-Id: I2214f8edc38be2e76a50f8984aa75d8f78b62026
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-10 06:15:38 +00:00
Tobias Hunger
e3b40fa687 PathChooser: Consistently put "" around file names
This makes it a bit simpler to spot leading and trailing whitespaces.
Maybe that could help with problems like QTCREATORBUG-16805, but even
if not it makes our strings more consistent.

Change-Id: I65c486721967d9d3e17020641a1144d593f9bde1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-09 10:00:33 +00:00
Daniel Trevitz
966623d64b Refactor the incremental deployment to a separate class
Extract incremental deployment caching to a new class.
Remove the extra Kit pointer and use target directly.
Add incremental deployment class to deploy service private data member.

Change-Id: I1e2e0829b9413f647ccfa3a4af23260a54895d83
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-08 22:53:53 +00:00
Thomas Hartmann
979b034dbe QmlDesigner: PuppetBuildProgressDialog has to be modal
Otherwise the application state can get seriously messed up,
when a user e.g. changes to editor mode.

Task-number: QTCREATORBUG-16722
Change-Id: I752eeb788ccb3b5458afe82496a68ddecf6e6579
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 19:53:25 +00:00
Thomas Hartmann
2e81a39b7c QmlDesigner: Remove transparency from DocumentWarningWidget
The ToolTipBase has alpha in some themes (e.g. Flat Dark).
If the background of the DocumentWarningWidget is transparent,
this looks buggy. We remove the transparency by blending
the color against the background color.

Change-Id: I4a25a30700b3ee1e9e8d23d0b0bad09f297f0605
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 19:53:17 +00:00
Christian Kandeler
572b5447ff SynchronousProcess: Turn assertion into regular check
It is not an impossible condition that a process keeps hanging.

Change-Id: I87cfdb72ff8528c71b2add09e41bdf742cdfc8b6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 14:30:20 +00:00
Tobias Hunger
219b2ce490 Qmake: Fix Makefile tests
Task-number: QTCREATORBUG-16981
Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 13:58:24 +00:00
Tobias Hunger
fd1c290a48 Qmake: Add tests for MakefileParser
Change-Id: I6206faad1e98f0867aba67b05b64916deb77b9f8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 13:58:21 +00:00
hjk
b83837de47 ProjectWindow: Some code cosmetics
Mainly remove unneeded stuff from the header. No functional changes,

Change-Id: I1dfcc97a0aeeca46a3b8891a97a805efea6cb349
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 13:28:07 +00:00
Alessandro Portale
6526e28bd0 Core: Fix some Classic theme regressions
Commit 15fbfaf2e9 moved many images into
utils, but some paths in the source were not adjusted accordingly.

Change-Id: I6d32754c41455271c0bfcedf0777a38fbeca67ab
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
2016-10-07 13:20:25 +00:00
Arnold Dumas
9d7b562f48 ProjectExplorer: Fix project name when selecting kit for new C/C++ project using CMake
Don't base on the build system file name to get the name of the project,
but rather use the name of the parent directory.

Task-number: QTCREATORBUG-16987
Change-Id: Ib55f5cf783ffef5d5d12a03ed8368e04e2fa9381
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 12:53:21 +00:00
Nikolai Kosjar
9730513698 Clang: Stop sending data to backend on disconnect
This addresses

    SOFT ASSERT made fatal: "m_connection.isConnected()" in file
      src/plugins/clangcodemodel/clangbackendipcintegration.cpp, line 230

I could not reproduce the issue locally, so I'm leaving the soft asserts
untouched for now.

Change-Id: If1d55ba7bc7e2d1ac20ad992c6d0d43ceb0f5d73
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-10-07 12:48:43 +00:00
Jarek Kobus
52faf32770 Drop unneeded override
Change-Id: Ia29517a56f23472d7015130abc8c8753b40afe33
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 12:11:26 +00:00
Tobias Hunger
88bcd6a304 Windows: Do not try to save files with reserved names
Do not try to save files with reserved names on windows. Doing so triggers
an assert in Qt.

Provide a nice warning instead.

Task-number: QTCREATORBUG-16984
Change-Id: I12be704f0aec0ab19b7f9f7023e9d28087dc30b1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 11:57:03 +00:00
Thomas Hartmann
c1e3fd9f3e QmlDesigner: Implementing NodeHints
This class evaluates expressions from .metainfo files.
Those expressions can script and control the behavior of
items in the designer.

Change-Id: I9f1ec7dd70f1124a684afe6620de5b81c8cc5a30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 11:53:00 +00:00
Ulf Hermann
11eb66643c Timeline: Allow setting orientation lines in the timeline
It can be hard to figure out how events in different categories relate
to each other chronologically. This change allows you to insert
vertical orientation lines by clicking the time labels at the top of
the timeline.

Change-Id: I4fcac032988b2d523a8cd25fda17820c54e4b493
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-10-07 10:29:59 +00:00
Tobias Hunger
b17c98ad6f CMake: Trigger cmake run *before* build when files changed
Make sure to run cmake *before* cmake --build when cmake files just
got saved. This helps e.g. when editing CMakeLists.txt files and the
hitting "Built" and "Save all" (or "Always save before build").

Task-number: QTCREATORBUG-16187
Change-Id: I16b1d02eb342a447003380946ce7a9d785476a0e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 08:47:02 +00:00
Tobias Hunger
4d7420fe49 CMake: Fix warning
Change-Id: Ibfa8e5a9df03c9249f0feb6a8133dc222d57743d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-07 08:36:26 +00:00
Alessandro Portale
ce308c1091 ProjectExplorer: Show kit warnings and errors as overlay
Instead of having kits just a big warning or error icon

Change-Id: I5b1c72c3c6ddd4cb646125c70d979431166d31f2
Reviewed-by: hjk <hjk@qt.io>
2016-10-07 08:21:59 +00:00
Christian Kandeler
81eacefa52 qml2puppet: Fix qbs build
Change-Id: Id89119554b6934f419361735e3540248944416a7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-07 08:12:30 +00:00
Christian Kandeler
313c0b1b3b QbsProjectManager: Fix displaying generated files
We did not update the project tree after building, so newly generated
files would not appear there right away.

Change-Id: I76ebc213ef43833203013186b0f0b38597cb1834
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-07 07:30:47 +00:00
Christian Kandeler
8281e55804 QbsProjectManager: Remove dead code
Change-Id: I71a740d5a97a7d5e493bb6fa6afe124b73753e52
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-07 07:30:17 +00:00
Jarek Kobus
a2ec71b30a Remove some ancient, dead, test code
Change-Id: Id252fbddd90c2ca3658318c3f256d3a7a0016cef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-07 07:15:42 +00:00
David Schulz
a83d539551 Cdb: Introduce interface for python dumpers
Change-Id: I0ef2fd8a44232d65b0d772fd6c65230266d586a8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-07 06:40:20 +00:00
Christian Stenger
ad615ece16 DiffEditor: Fix compile with gcc 4.8 / Qt5.6
Broke with ee095ef5d5.

Change-Id: Ib8cc5a0b8d79cf6ca542eb2fc9c0a4f06e885d88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-07 05:31:58 +00:00
hjk
c05fd099e9 ProjectWindow: Fix display of kit list after loading new projects
It is still unclear what the original problem was. setRootIndex()
on changing model contents seems to be involved.

This patch works around the issue by splitting the original big tree
containing all projects into separate per-project trees.

Change-Id: I13295fc827d750d11300313ffb19cc085837f5bd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-06 20:38:32 +00:00
Alessandro Portale
eacee5bb4a iOS: Use the new iOS device icon also for the simulator
Change-Id: Ica8fce4eee4e55e6ec9bc95997c6448d34b8bc23
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-06 17:38:03 +00:00
Risto Avila
8579e684df Fix behavior with no_plugin_name_prefix in CONFIG
If both plugin and no_plugin_name_prefix are defined in CONFIG, QtCreator
would not assemble the file name correctly.

Change-Id: Iebfc0402ff7c89f2a964cfcee77dfc77a6e5b0db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-10-06 15:05:16 +00:00
Jarek Kobus
ee095ef5d5 Implement diff for unsaved changes
Task-number: QTCREATORBUG-9732
Change-Id: I7e0f1d18046451ac1bc84b8c28113d72f63642a8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-06 14:14:03 +00:00
Thomas Hartmann
10ca871681 QmlDesigner: Read hints for item handling
This patch allows an arbitrary hints
section section for each item in the .metainfo file.

Change-Id: I85d7171d1aaacd96a327df3e350978b859913d00
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 13:10:09 +00:00
Tobias Hunger
683b965297 CMake: Encapsulate BuildDirManager in CMakeBC
This will make it easier to introduce a new type of BuildDirManager
to accommodate cmake server-mode.

Change-Id: I989aab9df44dff1cfdff226ef97bb30bb092ffdd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:59 +00:00
Tobias Hunger
5481ca6edb CMake: Properly split QML_IMPORT_PATH
Change-Id: I0626da3a08e0e190757900a2df312ab0cee948d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:47 +00:00
Tobias Hunger
653f60ae33 CMake: De-noise CMakeProject
Change-Id: I9d5df01d0d4699df30c1f01c0cfe7f3da310457a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:39 +00:00
Tobias Hunger
01149ad955 CMake: Remove unnecessary members from CMakeTargets
Change-Id: I6428496f4eab0d42f44525477c716f74714f8824
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:31 +00:00
Tobias Hunger
d41e10a595 CMake: Keep buildTargets private
Nobody needs those, so do not export them.

Change-Id: Ia8866ea2a514855c029974645d9b3f3dbcaa14ed
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:22 +00:00
Tobias Hunger
9b40c1fc04 CMake: Move code from CMakeProject into BuildDirManager
This is in preparation for having support for cmake's server
mode.

Change-Id: I6cc04fe7c5132c491c3f3c0f46560b8ad88808e8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 10:03:16 +00:00
Tobias Hunger
414b816b0c QmlProject: Use helpers in FolderNode to create project tree
Change-Id: I28301e16ce15b06e86cfa909174921b03f9208b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 09:54:06 +00:00
Tobias Hunger
655496bc4a GenericProject: Use helpers from FolderNode to generate project tree
Change-Id: Ie9b3c9381cc59c7e1c1b32d9c63c46db0aaa7984
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-06 09:51:47 +00:00
hjk
440112964d PythonEditor: Code cosmetics
Namespace, unused members.

Change-Id: I5cad3a42843c716c5f06bd481c1a1b7b8a2cf29d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-06 05:51:06 +00:00
Alessandro Portale
1fc01ac1c7 ScxmlEditor: Inline the ShapeGroupWidget ui creation
Change-Id: I519716e73a5d2c0c50642d65f8312e671a0e1595
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-05 20:09:08 +00:00
Alessandro Portale
d4238ed1c4 ScxmlEditor: Inline the Navigator ui creation
Change-Id: I53cee0abd948cb2739815d0d7e13330fe22a900e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-05 20:07:35 +00:00
hjk
33c732c60c ProjectWindow: Fix crash in TargetSetupPage
Move ownership of the ProjectImporter to the Project.

Task-number: QTCREATORBUG-16744
Change-Id: I7fc217ce8058287c5435b259bdc5300a926f8098
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-05 16:14:42 +00:00
hjk
b9a8ed31ae QMakeProjectManager: Remove BaseQmakeProjectWizardDialog::setupProject()
This function was not used anymore.

Change-Id: Ia25ac2ba098b0db18fa61c29c79ba30ac9e40725
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-05 16:09:22 +00:00
hjk
e9c4d4a56b Debugger: Make icons in breakpoint view smaller again
Change-Id: I05e68f5ab7004f063ba8577a78bad23a51a06330
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-05 16:09:10 +00:00
Orgad Shaneh
7f0b371c11 Git: Fix initially disabled OK button in Push to Gerrit
Change-Id: I7223ef113781eb9adae59dba58036c19a96a11b0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-05 16:04:14 +00:00