Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
35690ab66e Core: Change default build directory
Use %{JS: Util.asciify(...)} around the configurable parts of the
default build directory. This prevents encoding issues with the build
directory name that can break the build.

Note: You need to go to Tools>Options>Build & Run>General and Reset
  the default build directory for this to take effect for future
  projects!

Task-number: QTCREATORBUG-16380
Change-Id: Id4855e2c488aab0c0919af2dc9f0ef89b130fbf7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-23 10:56:06 +00:00
Tobias Hunger
b5730af461 Marcos: Make Utils.asciify(...) avialable to MarcoExpander
The Util.asciify(...) method takes a string and returns an
ASCII only string for the input. All ASCII characters are kept as
is, anything non-ASCII is replaced by 'u' followed by the hex
encoded unicode value of the character.

Change-Id: I90b0adeb809bc2f6eb4374ce48851396861d4673
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-23 10:56:00 +00:00
Thomas Hartmann
5762182e23 Wizards: Increase QtQuick.Layouts version for controls 2 wizard
Qt Quick Controls 2 came with Qt 5.7, so it is save to use
1.3 for layouts.

Change-Id: Idb500154800312de0c1b2664f44113026525581d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-23 10:22:15 +00:00
Christian Kandeler
014167c8e8 QbsProjectManager: Remove duplicate include paths for the code model
Task-number: QTCREATORBUG-17381
Change-Id: Iabf1cdfe7988181e0e20396c5a5ec02e51e27f44
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-20 16:48:38 +00:00
James McDonnell
9fda4907f2 Remove BlackBerry terminology and code
Remove a bunch of BlackBerry specific code blocks and functions.

Change most instances of NDK/SDK (the BlackBerry terms) to SDP (the QNX
term).  To maintain backward compatibility, some instances of NDK/SDK
that end up in external files have been left as is.

Change-Id: I8f589601542983323e41e7b2dd7822914d971623
Reviewed-by: hjk <hjk@qt.io>
2017-01-20 16:31:52 +00:00
Tobias Hunger
5d213cc5da Debugger: Add missing #include <utils/temporarydirectory.h>
Change-Id: I45f104511f4ae840b42d4e1f7808953860c039a9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 15:01:52 +00:00
Thomas Hartmann
f6e026d519 QmlDesigner: Refine selection indicator
The highlighted bounding rectangle has now the size of the
selection rectangle.
Because both rectangles do not have to match we draw both.

Change-Id: I0d4260e446c552622626153774a2cff489ebf584
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 13:13:30 +00:00
Thomas Hartmann
f9f74566a7 QmlDesigner: Do not escape "\" for unicode chars
Task-number: QTCREATORBUG-12616
Change-Id: If8cac8d35cb97f59e12d1609f808dd639f93f315
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 13:12:07 +00:00
Thomas Hartmann
09b176040d QmlDesigner: Fixing tests
In the tests we have to react synchronous without using a timer
to QML text changes.

Change-Id: I235a847f47992908aae1ed4b471701e779d434da
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 13:11:33 +00:00
Thomas Hartmann
6cc7362db2 QmlDesigner: Removing out commented code
Change-Id: I7e3fc3fc1f7d846d64e68acd39552159e1820c70
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 13:11:26 +00:00
Tobias Hunger
b67c5736ef ProjectExplorer: Polish AbstractProcessStep
Make a bool const.

Change-Id: Icfddb851ce11e1d2149349e239dcca4b3fcbea0b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:51:40 +00:00
Tobias Hunger
087d6d7472 CMake: Mark changes to CMake configuration that contradicts a kit
Mark changes in the project that override configuration settings from the kit.

Task-number: QTCREATORBUG-17244
Change-Id: I3452116ad5f4626ffcd85dfcc86715b6946d6572
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:48:22 +00:00
Tobias Hunger
fb55efd9e2 CMake: Make the project override the kit, not the other way around
Change-Id: I26fbe90f9c5f9f46bf7a3be2e4a23c6e02a6eead
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:47:34 +00:00
Tobias Hunger
01e80b264b CMake: Put cmake server-mode socket into a temporary directory
Do not put the cmake server-mode socket into the build directory, but
put it into a temporary directory instead.

This makes sure it will not stick around and also avoids polluting the
build directory with Qt Creator specific files.

Task-number: QTCREATORBUG-17320
Change-Id: Id849b1a80d7cba07c026cc2ecd7030435c401884
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:21:20 +00:00
Tobias Hunger
c6f90e575e Utils: Introduce a TemporaryDirectory and TemporaryFile class
Both wrap the corresponding Qt class, but make sure all temporary files
or directories are created inside a "master temporary directory".

Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:17:10 +00:00
Tobias Hunger
68e5691047 BaseQtVersion: Fix Qt build string parsing
This fixes Qt build string parsing based on feedback from Thiago.

Also adds unit test for the code that parses the build string so that
we can be more sure that it actually works as expected.

Change-Id: I23cff7125be4c7c87d5eba4b1db7cb47c2479b66
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:16:07 +00:00
Friedemann Kleint
e6017c40fc QtOptionsPageWidget::validInformation(): Use ToolChainManager::toolChain()
Use a predicate to check whether any toolchain can be found instead
of searching through all of them.

Change-Id: I6d4417c548b37629dc43c11e313250c24777a5ca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-20 11:33:52 +00:00
Christian Kandeler
3df1d5ef39 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I19362ac6ae99dcf3c8a00c3ccd187a2173652633
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-01-20 10:00:57 +00:00
David Schulz
99dff90bfa Debugger: Fix crash in memory agent
Change-Id: I553858650102a93a90ebeae7ce3b5a29e973ace7
Reviewed-by: hjk <hjk@qt.io>
2017-01-20 08:51:48 +00:00
Thomas Hartmann
6eb89ad2ed Possible build fix
This should fix:
"defaulted on its first declaration with an
exception-specification that differs from the
implicit declaration"

Change-Id: I10a18a68543894a4ca81f99dab2cdd0ddc6aad07
Reviewed-by: hjk <hjk@qt.io>
2017-01-20 08:43:26 +00:00
Orgad Shaneh
585ef766cc Android: Use correct form of error message
Change-Id: Ie2756514d68fb02e15fbe97216bbf3c56ddfe77a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-20 08:15:37 +00:00
Orgad Shaneh
5f3442d25e Android: Fix compilation
Change-Id: I72be1ccb8afc235441c9c1ba65d3cef4fc6e6779
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-01-20 06:39:53 +00:00
Christian Kandeler
c05a3fdb3d Give the values of BuildStep::OutputFormat better names
The old ones did not convey their meaning very well. In particular,
NormalOutput and MessageOutput were easily confused.

Change-Id: Ia0a8c1b1c366ab3f5c59f751b37b8b1f68f6831d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 16:08:57 +00:00
Tobias Hunger
0e874ba599 QtSupport: Fix warning
Do not forward declare a class and then make that a struct.

Change-Id: I5767e73d115574c2eab305fb26feeac3704a9a01
Reviewed-by: hjk <hjk@qt.io>
2017-01-19 16:05:25 +00:00
Tobias Hunger
df62701801 CMake: Mark configuration items that were taken from the CMakeCache.txt file
Change-Id: Id9e707d7b07d35ade44959955db61810e34f7b30
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 16:05:11 +00:00
Tobias Hunger
0f7d75ccf5 CMake server-mode: Keep settings
Keep settings when switching from the temporary build directory to the
real one using cmake with server-mode.

Task-number: QTCREATORBUG-17360
Change-Id: If36489cb2584dc5e0b021430e5d860e146fd8a86
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 16:04:19 +00:00
Thomas Hartmann
f581ad7ded QmlDesigner: Override shortcuts in text editor
There are a couple of known shortcuts that we have to override
in the text editor. We install an event filter and handle
the shortcut override event for the keys in question.

Change-Id: Icb5483b19e2202d85e99d24c20d05097aaa33da6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 15:59:34 +00:00
Thomas Hartmann
64b8bd0924 QmlDesigner: Fixing context in TextEditorView
The context of the text editor is not automatically set
on the widget. This is usually handled by the editor manager.

Unfortunately the completion action is handled using the editor
manager. This means the completion assist widget position depends
on the cursor position in the original text editor managed by the
editor manager.
To fix this we have to register our own action that overrides the default
completion action and triggers the completion on the correct text editor
widget.

Change-Id: I4d7524f2d5ad2374af23f886d7fd08505a3c857f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 15:59:27 +00:00
Ulf Hermann
7a432a68c1 QmlDebugger: Always show a sensible context for the console
If the engine is running and no specific context is selected, then it's
the global QML context. The same holds if the engine is running, but
the server doesn't support contextual evaluation. If the engine is
stopped, then it's a frame in the stack trace. Otherwise we don't have
a context and clear the label.

Change-Id: I5a322098f3297895e07bcc96ee4a5f351423c206
Reviewed-by: hjk <hjk@qt.io>
2017-01-19 15:30:23 +00:00
James McDonnell
06a11c56b4 Make the QNX environment script required
Remove the code that supported "no environment script".  Less code to
update for 7.0.0.  No script is unlikely and a pseudo-script/SDP can be
created easily enough if a script isn't provided for an SDP.

Change-Id: I3e9cc9eb71d52c7662434bd8441eefa40956176a
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 15:05:19 +00:00
Eike Ziller
7071b61e02 More change log
Change-Id: I418bfad8e5a38be395018aed799d7b74dd43d6e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v4.2.1
2017-01-19 15:04:00 +00:00
Thomas Hartmann
3e90447c9b QmlDesigner: Update connect syntax
Change-Id: If19e7483f86e0a92dae2bf1d4eb92387235a1cae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-19 13:17:44 +00:00
Thomas Hartmann
be8b69e6ef QmlDesigner: Adding Q_OBJECT to context classes
This helps with debugging.

Change-Id: Ia12c29b4111cd469986bb9495f2cf67928f9d5de
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:16:39 +00:00
Thomas Hartmann
426c9f9bf0 QmlDesigner: Store expanded state of state editor in settings
Change-Id: Icfd10e2a63a84a14b3e4d171de6c09a48ef779c2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:16:28 +00:00
Thomas Hartmann
00d53966ec QmlDesigner: Simplify writing a setting
Change-Id: I4e9589622f40a5ac14b88f0914f4f6819259d4a6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:16:09 +00:00
Thomas Hartmann
f23c0db1a2 QmlDesigner: Simplify reading a setting
Change-Id: I754b3ac1635699e5d9ceab376ae70752a966082f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:16:02 +00:00
Thomas Hartmann
7eda9ecb56 QmlDesigner: Remove superfluous deleteLater calls
All those QObjects are part of the parent child hierarchy
and do not have to be deleted manually.
This slicences two QCoreApplication::postEvent: Unexpected null receiver,
because the graphics scene is now created lazily.

Change-Id: Ibfe4aaed2173f591e90186b570f8c8bb9e708494
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 13:07:00 +00:00
Thomas Hartmann
cba001eff8 QmlDesigner: Do not move cursor when reformating
When saving a .ui.qml file the complete file is reformated.
Without this patch the cursor is moved to the bottom.

The cursor is still moved, but they line is kept.
Since we reformat the complete file this should be fine.

Change-Id: Ia1ef003e2e6ca7497dcad7e0e8044ffb99c80ea3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 12:34:49 +00:00
Robert Loehning
eeb0b8fd21 Revert "Revert "Utils: Remove old compiler support code""
Thomas provided a smaller fix.
This reverts commit 78fb7f44bf.

Change-Id: I1edff6477526fe4ce29df38852f47fe49117561e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-19 12:21:43 +00:00
Thomas Hartmann
5dc8e9a743 Fixing the compile
* noexcept at wrong postition
* alignment cannot be guaranteed when copying the argument

Change-Id: Ib68788a3fb781e913bd347e6b7932d3280ba9e67
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 11:52:44 +00:00
Alessandro Portale
78fb7f44bf Revert "Utils: Remove old compiler support code"
This reverts commit 8a32bcc5e7.

Broke build with MSVC 2015, update 3

Change-Id: Icb59b70fb00ea2a2ecc8d26c8177d21d82aaccf2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-19 11:47:26 +00:00
Marco Bubke
8a32bcc5e7 Utils: Remove old compiler support code
We now support constexpr, noexcept and alignas on all compilers. Next will
be C++ 14 constexpr support.

Change-Id: I254049c60dcd82fc373ec907cbb5702a4b344978
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 10:59:40 +00:00
hjk
89a3dbb546 QtSupport: Fix and simplify ExampleListModel
This mainly removes no more needed glue code and fixes a recent
regression where the example set picker combobox on the Examples welcome
page always displayed the name of the first item, no matter which set
was displayed on the main canvas

Task-number: QTCREATORBUG-15727
Change-Id: I15b4c97f2e079a7470f6f63cde587dd4be58c40e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-19 10:54:50 +00:00
Thomas Hartmann
d5ac800b90 QmlDesigner: Hook up states editor expanded state to command
The expanded/collpased state of the states editor is now hooked up to
a Qt Creator command. This means there is a configurable shortcurt
and an entry in the menu under Windows/Views.

Change-Id: Ied993870fe605cfd6651b203986b009620c98f1b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-19 10:26:21 +00:00
David Schulz
58e7554f3d Debugger: Cache qtNamespace also if qstrdup wasn't resolved
Otherwise it will be looked up for every value in a none Qt build.

Change-Id: Id5d82333b6fb93242d06c5d7e9fdf8ffa2ce6b38
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-19 10:03:34 +00:00
Christian Stenger
0af0d715b8 QmlDesigner: Fix compile
Change-Id: Iec5585376078e05b131fc942605fc642fcafe05e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-19 09:52:40 +00:00
hjk
ec5a669b39 ProjectExplorer: Disable copying steps to inactive kits
This fixes a hard crash due to a Target nullptr.

Change-Id: I3065ac61bc950413d8958bcad5420f5868afd35c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 09:52:39 +00:00
Thomas Hartmann
f11ade3353 QmlDesigner: Implementing exporting QML file as image
Task-number: QTCREATORBUG-11494
Change-Id: Ifcfef6f9434637c0be0a727d9f80dfed1ef1c11b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-19 08:31:30 +00:00
David Schulz
c8bd342597 Debugger: Adjust std map test to msvc iterator dumper
Change-Id: I3c9e4138d2e0a3ec4083f01d243eb707905e9f18
Reviewed-by: hjk <hjk@qt.io>
2017-01-19 07:11:20 +00:00
Christian Stenger
1e0b7e58b8 Tests: Avoid automatic masquerading of newline characters
Change-Id: Ic18083e9b21051a03a69c6c6e10a23e7144ad647
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-18 14:50:38 +00:00