Commit Graph

44349 Commits

Author SHA1 Message Date
Tobias Hunger
2e45906b42 Python: Use helpers in FolderNode to set up project tree
Change-Id: If0f25b4b16e8fbdcb6c769de8c625bd256b4e465
Reviewed-by: hjk <hjk@qt.io>
2016-10-05 15:43:17 +00:00
Tobias Hunger
e2fef2d37b Nim: Use helpers from FolderNode
Clean up a bit.

Change-Id: Icff71c84ab23dba96b572cad00362bffcbec3270
Reviewed-by: hjk <hjk@qt.io>
2016-10-05 15:43:08 +00:00
Tobias Hunger
27a2ebb0d7 Autotools: Use foldernode helpers to construct project tree
Change-Id: Id0eaebb4035e8bd2fb29cc4f0317151ab00dcce6
Reviewed-by: hjk <hjk@qt.io>
2016-10-05 15:42:55 +00:00
Tobias Hunger
69627e494b Add helper code to generate trees of project nodes
Add helper code to FolderNode that enables the creation of a tree
of File- and FolderNodes from a FolderNode and a list of FileNodes.

Change-Id: Iba4b6a768fc3d0501851f141372e7e34913ba518
Reviewed-by: hjk <hjk@qt.io>
2016-10-05 15:42:47 +00:00
Eike Ziller
90cf4487a5 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	src/plugins/autotest/qtest/qttestoutputreader.cpp

Change-Id: I4b323f2f3041d015fa04b9a25ec925f3b3e2411f
2016-10-05 15:28:04 +02:00
Tim Jenssen
c27c9a3123 QmlDesigner: fix gotoCode in error/warning case
The QmlDesignerPlugin::hideDesigner() jumped again to selected node,
which came after the DocumentWarningWidget already set it.

Change-Id: I6e84342208c6405e8b25b516cd411b30bc48fcdb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-05 11:49:44 +00:00
Thomas Hartmann
9a9c29dd82 QmlJS: Extending QmlJSSimpleReader
With this patch bindings are parsed as strings.

Change-Id: I92014052947c595b220640d827dd77ee2db8f655
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-05 10:52:11 +00:00
Tim Jenssen
038f18ea9c QmlJS: add import name to the missing error message
Change-Id: Id973d442e1770f453b16723f9cf75ee2169b33ad
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-05 10:42:11 +00:00
Alessandro Portale
a2fd536846 ScxmlEditor: Inline the OutputPane ui creation
Change-Id: Ied1a671f8939c828461486bed020b992792c9819
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-05 09:17:46 +00:00
Leena Miettinen
131659d096 Text editor: Fix typo in UI text: Backgound > Background
This typo also exists in a couple of places in code:
FormEditorWidget::changeBackgound(const QColor &color)

Change-Id: Ie3f0d349b734369814c29ac56d190578052450a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-05 08:38:41 +00:00
Christian Kandeler
1dcd199c97 Update qbs submodule
To HEAD of master branch.

Change-Id: I19f4f28968655797e5aa11ff0f9489f337080f04
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-10-05 08:22:05 +00:00
Nikolai Kosjar
ae92b68154 Clang: Remove some needless bools
Change-Id: Ia845c803fce85ad0e29e2cf6b64820b86599bac6
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-05 07:25:45 +00:00
Alessandro Portale
9ff15c1a8e ScxmlEditor: Fix swapped info and error icons
Change-Id: I1ba91c8bad533eb601e4e58e729fbcdb4b862a51
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 20:59:17 +00:00
Arnold Dumas
44ea2fb9e6 ScxmlEditor: Fix compilation
Change-Id: I8810a4e820abdee3983925bb9cd4685c6b14fbd0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 19:10:01 +00:00
Alessandro Portale
b53d3c6e31 ScxmlEditor: Fix compilation
Change-Id: I3baf3c8190c9b6047e3f9b324a7d4dfe8a1b06f1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 17:08:41 +00:00
Alessandro Portale
9d32a7de56 ScxmlEditor: Inline the StateProperties ui creation
Change-Id: Idaf89aaf2472e41d429181b2472035a4167f463b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 16:45:25 +00:00
Alessandro Portale
386925b4e8 ScxmlEditor: Inline the Structure ui creation
Change-Id: If6c2380ea503202842fd0b1b067e85d9c1915958
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 16:45:09 +00:00
Alessandro Portale
e2dcdae89a ScxmlEditor: Inline the ErrorWidget ui creation
Change-Id: I39e1890673aa38ec1671d3cf57aad04a28e886a6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-04 16:44:56 +00:00
Christian Kandeler
a500af0738 QmlDesigner: Fix qbs build
Change-Id: I768b233f23b836bb235931b1384d829d63a86f6f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-10-04 15:54:35 +00:00
hjk
0906c62b70 ProjectExplorer: Remove PropertiesPanel struct
Parameter structs are convenient if they get passed around
a lot or are regularly changed. This isn't the case here,
so make the user code more compact instead.

Change-Id: Idd5e5cc1f70b1547607532cd3e6515c27983c169
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-04 12:54:02 +00:00
Kai Koehne
8902fbc62c Remove 'What's this?' icon from "Waiting for applications" dialog
Change-Id: I6c603cd540d8c688fc6302380ea4e8c716ed8ef4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-04 12:34:37 +00:00
Jarek Kobus
0b58d7435e Fix AddLibraryDialog when selecting the lib from different drive
Omit PWD when trying to generate it for absolute path.

Task-number: QTCREATORBUG-16688
Task-number: QTCREATORBUG-8413
Task-number: QTCREATORBUG-15732
Change-Id: Ief318db1249662f4c9e69a8f8c401543a8f3120a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-10-04 10:04:35 +00:00
Jarek Kobus
02937fdc4b Make lib path chooser case-insensitive on Windows
Clear the old maemo stuff.

Task-number: QTCREATORBUG-16057
Change-Id: Ib349683e979a202c2244d6cdeec18a20517be4f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-04 10:03:33 +00:00
Thomas Hartmann
b4ca04346e QmlDesigner: Setting import paths for fallback puppet
Setting the import paths from the code model for the fallback puppet
is complicated, since we have to remove the path to the Qt plugins
in e.g. qtbase/qml and we have to set the correct path
for the Qt plugins of Qt Creator.

Change-Id: I45cb8616566bb3db51c2c70d6dc418c7a2ab4dd1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-04 09:00:51 +00:00
Thomas Hartmann
d3b4acfae2 QmlDesigner: Allow qml2puppet to mockup C++ types
This allows Qt Quick Designer to register a component that can serve
as a mockup for known C++ components registered in e.g. main.cpp.

In many cases those components are the interface to the C++ backend.
While the C++ components itself are not relevant for the gui designer,
the user has to be able to instantiate gui components that use such C++
components.

We use the CreateSceneCommand to forward a list of C++ types to
qml2puppet.
Those types are then registered so that the imports and object institation
works.

Change-Id: I1543912f233f9a783998f3c6a1b48981b342ee80
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-04 08:59:24 +00:00
Thomas Hartmann
5a3aa3fc3e QmlDesigner: Allow .ui.qml file in component creation
Change-Id: I3ae5822820c365d0cbc7d679c6365a25f34b1637
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-04 08:59:13 +00:00
Daniel Langner
920386220b FakeVim: make cursor navigation via arrow keys more like vim's
Change-Id: I2da45281e0f8d2e3a0460a8631241e09aa67b869
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>
2016-10-04 08:56:50 +00:00
Ulf Hermann
b604b8fc2b FancyMainWindow: Add an option to hide the central widget
This way the debugger views can take up the whole window, which is
useful for the QML and perf profilers.

Change-Id: Ia4d236e8738a666d2316c05edaf4cf48ac46ffdb
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-10-04 08:29:05 +00:00
Nikolai Kosjar
9cde684eea ClangStaticAnalyzer: Tests: Fix switching startup project
Change-Id: Ia29a8082a7c7764e7a426ce121c17c80b334d84d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-04 08:20:21 +00:00
Christian Stenger
d4024642fe CMakeProjectManager: Fix compile with Qt5.6 / gcc 4.8
Broke with b3b6cfb5ef.

Change-Id: I0a105c16168a7b6652b8880c190dad309979ffff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-04 07:40:09 +00:00
Daniel Langner
137a34b9ca FakeVim: don't ignore ESC while holding SHIFT
Change-Id: Iddd843353e582607d6acd0cddf0df6930f09f4b9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Lukas Holecek <hluk@email.cz>
2016-10-04 07:17:21 +00:00
Tobias Hunger
a223e59d85 CMake: Polish cmakelocatorfilter
Change-Id: I02566f27c57c2531c4c6085dc9c703f379a194f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-30 17:59:21 +00:00
Tobias Hunger
87f7ec4ec9 CMake: Clean up CMakeProject
Some polish for the CMakeProject. Remove unnecessary includes, etc.

Change-Id: I3a73aac79b2177adc613f31865074f778ef21360
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-30 17:59:15 +00:00
Tobias Hunger
01903c8c72 CMake: Switch generator/extraGenerator
Swapped that around in the last commit:-/

Change-Id: I2d31af86aecd8e9e6469c9fd573f4dea809fca2a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 12:34:23 +00:00
Tobias Hunger
bb8cd10a04 CMake: Rename method
Change-Id: I6d30bdd7cf6d290f33601c766049e48c3def393a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-30 10:54:09 +00:00
Tobias Hunger
0b1f6d83c3 CMake: Fix possible crash
Change-Id: Id33b51b8ea2d84a51f328adfed052322634c297e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-30 10:33:01 +00:00
hjk
e9fab5896f CMakeProjectManager: Compile fix for gcc 5.4
Change-Id: I8afc2cb29088ff9296959d870473c09a749d78d7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 09:31:06 +00:00
Christian Kandeler
10ab104820 QmakeProjectManager: Fix build
std::function requires <functional>.

Change-Id: I71e116a02aeab0c015ee41515196642c91047bfd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 09:30:41 +00:00
Christian Kandeler
fd5f3073ec Update qbs submodule
To HEAD of 1.6 branch.

Change-Id: I159f839b3f0203b7adfec9b49ab019e6f4243849
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-30 09:15:11 +00:00
hjk
a5e26753bf ProjectWindow: Make switched-to project active again
This fixes a regression introduced in the recent ProjectWindow
reorganization and keeps the active project, the target selector
and the active item in the project combobox synchronized again.

Change-Id: If2baf4336d5da5d74f1cbf8ddc4e8cb056d49369
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-30 09:07:00 +00:00
Eike Ziller
0935d14f16 Fix Open with Designer / Linguist in case of mobile or embedded Qt
They do not come with these Applications, so we look in other
kits of the project, the default kit, all other kits, and
then fall back to PATH.

Task-number: QTCREATORBUG-16558
Change-Id: I3b1b92dc221ba3de8f36a31be4945c448944f3e9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:22:20 +00:00
Eike Ziller
94a58b4653 File > New: Bring existing dialog to foreground
Task-number: QTCREATORBUG-16932
Change-Id: I1a90ab01825b5cd2f439395cbdf4400075943dc4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:55 +00:00
Eike Ziller
79be19a8a0 ICore: Make sure main window is initialized
Initialize main window even if no ICore instance is created, so in that
case methods like raiseWindow and dialogParent will still work.

Change-Id: I7b435dedac574bcc120e996c198c413fd5ccfe6f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:47 +00:00
Eike Ziller
9c9485e15b ICore: Remove unused methods
Some didn't even have implementations anymore

Change-Id: I376cb12006c9b3ec8f6b2a75c38275cd92d2bbf6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:41 +00:00
Eike Ziller
a6264dfd94 Wizards: Remove 'virtual' from method that should not be implemented
runWizard was the entry point for wizards once, but nowadays you should
implement runWizardImpl in subclasses.

Change-Id: If7cc501a64b366306f60c9d30e0d9052660e6c30
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:35 +00:00
Tobias Hunger
d2d86bf9eb Qmldesigner: Fix warning
Change-Id: Icdfe9b7102c865e7a24d8dbed741f42e701ede77
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:12:27 +00:00
Eike Ziller
2cb3beab42 Simplify Qt external editors (Linguist, Designer)
Remove unneeded extra classes, and unneeded parameters.

Change-Id: Ib4ceccd7d92bd8ca5de122e174f2579a2a8a9390
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:07:59 +00:00
Eike Ziller
2f9a721fbf Recent Sessions/Projects/Files: Clean up accelerators
Don't show them for sessions on macOS, don't show any numbers > 9, and
don't use colons.

Change-Id: I34a60631e5d11a98f22cfcf374f8cec1a2964658
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-30 07:31:20 +00:00
Tobias Hunger
ea0643c3ab CMake: Hint at Qt version to be used
Set variables to hint at the Qt version being used.
QT_QMAKE_EXECUTABLE is used to point to qmake (only relevant for Qt4),
and CMAKE_PREFIX_PATH is set to point to the QT_INSTALL_LIBS directory
which should hold a cmake folder with all the information on the
Qt5 version being used.

Update the warnings on the kit based on whether a Qt4 or a Qt5 is used
in the kit.

Change-Id: I77f95febd4c42c15568ebaf3f82bf82464058f61
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Gunnar Roth <gunnar.roth@gmx.net>
2016-09-30 07:28:07 +00:00
Tobias Hunger
de664161a2 CMake: Warn on kits using unsupported cmake versions
Change-Id: I6a3a940280baab78e9f56352008452f694534e76
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 07:27:58 +00:00