Commit Graph

43591 Commits

Author SHA1 Message Date
Thomas Hartmann
ced554aaab Qml2Puppet: Use helper functions from Qt 5.6
In Qt 5.6 we do not need to access the private API directly.
QmlPrivateGate is forwarded to the helper functions in Qt.

This removes direct dependencies to QML internals in qml2puppet.

Change-Id: I274cb306815824c988b6d79966f007298f6d1e60
(cherry picked from commit d6d0bd60357a41cd6c83b511fd30ab12157ed95d)
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-08-26 12:31:51 +00:00
Leena Miettinen
78d304674f Doc: developing for embedded devices
Add information about Qt for Device Creation
integration with Qt Creator. Add links to the
Qt for Device Creation documentation where
appropriate.

Change-Id: Ie9be5a65697681590e2131407432f826a5ab4f2e
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2015-08-26 11:24:24 +00:00
hjk
fdbee2783a QmlInspector: Fix crash on engine ramp down
Task-number: QTCREATORBUG-14972
Change-Id: Ia2a508fab872ac4496c2cb3fa932186e8e29278d
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-26 10:44:59 +00:00
Friedemann Kleint
474ef4b4ef README.md: Fix instructions on deployment on Windows.
The option -quick needs to passed to windeployqt to actually scan
the .qml files.

Change-Id: Ifeb6eee4a5e16f25196721906632914eb4568081
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-08-26 08:07:11 +00:00
Friedemann Kleint
85e1b4d089 Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6.
Amends de3b2b6493 to set the
variable.

Change-Id: I305e0d911e42f76ee6f93406c012000a63bf7bc5
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
2015-08-26 07:52:15 +00:00
Viktor Ostashevskyi
52ebfb0fa2 Ukrainian translation update for 3.5
Change-Id: I14a5fb48668c4a7a02edc6887ef901a2e5c0e870
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-08-25 16:40:10 +00:00
Ulf Hermann
7dd898a1b1 QmlJSTools: Fix glitches in QML console
Half of the widget height is a particularly bad estimate for the
default height of a console item. Focusing editable items should be
done by explicitly transferring focus. Also, this only "worked" if
an editable or formerly editable row was the very first line in the
view, which rarely happens.

By default, if no settings are present, all log categories are enabled
now. Otherwise we might miss the error messages resulting from failed
evaluations.

Repeatedly setting the filter regexp to the same thing doesn't signal
a filter change, which is what we actually want when changing the
filter.

Change-Id: Ibe33b0438d92e777bdceaf9af032fc5117ba4041
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-25 14:59:17 +00:00
Ulf Hermann
b5717a5315 QmlJS: Lazy-load console items to allow for recursion
Using Utils:TreeView automatically gives us the capability for loading
item as they are expanded. This way we can show recursive structure in
the console as well as load data from the debug server on demand.

Also, properly print error messages received from unsuccessful
command evaluations.

Task-number: QTCREATORBUG-14931
Change-Id: I66d440eedd9723b04670169b27db1ee18f3f2891
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-25 14:42:22 +00:00
Marco Bubke
0b32832812 Clang: Fix move assignment in ClangString
Don't move if you assign to yourself.

Change-Id: I33977fe34cc89849337c17c1ff418ff48d68e708
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 12:54:52 +00:00
Marco Bubke
f2e8abfe67 Sqlite: Add equal operator for QString to Utf8String
Change-Id: I60993e2a140445468b6fe98604cb19329dc35b1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 12:54:45 +00:00
Marco Bubke
8e2bb1048d Sqlite: Add endsWith to UtfString
Change-Id: I82ea54a1e23625690192a967b5f33451cdc199af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 12:54:38 +00:00
Marco Bubke
26cfe2446f Clang: Reset pointer to null in unsaved files
Change-Id: I85243b6b041e639fb6313e2fb794a658ca456ea3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 12:54:32 +00:00
Marco Bubke
ec4d002857 Clang: Rename command in message
Change-Id: I1e2671d15b0db3c670b86dd0d4bed5ee09e866f1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 12:54:27 +00:00
David Schulz
66df65b2dd Cdb: Unify the cdb builtin and extension command reply.
Change-Id: Icaee4aee4fbb22b2a55f64cc43effdaebbe63a55
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-25 11:27:35 +00:00
David Schulz
d26fe608de Cdb: Unify posting commands to the cdb process.
Change-Id: I8e3bd400efa6fd12fd098a53d9e991aea658a743
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-25 11:27:31 +00:00
David Schulz
90b0d561b6 Cdb: Remove unused CdbCommand member.
Change-Id: I716cd00b47b8ae52d497817f0849f608222bfd33
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-25 11:27:26 +00:00
David Schulz
c02d9c9253 Cdb: Print output of user commands to the debugger log.
Change-Id: I48a1beb6c47758dafa3629c8c8b770417b823a4e
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-25 11:27:19 +00:00
David Schulz
56a46bbcda Cdb: Print out user debugger commands to the log.
This also removes the need for a command flag.

Change-Id: I6ad8a2c5d49673783cf06a2612c33e0cd5555706
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-08-25 11:27:15 +00:00
Christian Kandeler
c5875d0bdd NavigationWidget: Add missing return statement.
The activateSubWidget() function recently got a return type.

Change-Id: I3fe5434bc891c31b6d8a9e07a903eb959316b0a2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 10:26:11 +00:00
Orgad Shaneh
d243999be0 ProjectExplorer: Do not reject user file on target absence
Use-case:
pro.user has 5 targets, while pro.shared has 6.

It is better to have only 5 targets than not opening the project at all.

Change-Id: Ic169a2180aafd0b1ed60a7f6d8903b47e7f1c34e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-25 10:26:07 +00:00
Christian Kandeler
edb880429e SSH: Remove bogus compatibility check.
All host keys can be used with all HMACs.

Change-Id: I71055d3085d13683e53491ac9a9d98734dd6e7e5
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
(cherry picked from commit 0aadfbd453)
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 09:37:47 +00:00
Christian Stenger
a40646fd73 Don't treat pdbbridge.py as argument
Change-Id: I004dd5eab6733efaca4032e4fdb432f54c5f7114
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-25 09:16:35 +00:00
Christian Kandeler
6c1458234b Utils: Make the meaning of PathChooser::changed() consistent.
This signal was emitted from two places. In one of them, the argument
was the pure string from the line edit, and in the other one the "raw
path", that is, the aforementioned string processed by cleanPath() and
fromNativeSeparators().
We now use the latter in both contexts. A look at the slots does not
suggest anyone is interested in the other value rather than this one.

Change-Id: Iacb6e0815004b2ef0107bfef03b97b46015da989
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 09:12:56 +00:00
hjk
c760cbd2f9 Debugger: Do not merge pdb arguments into a single one
Change-Id: I998d663e1fced1da10e7b3d4489db26eb244fe2b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-25 08:51:38 +00:00
Christian Kandeler
6406fd3645 Analyzer: Re-design the diagnostics view.
The old one had a number of problems, mainly due to the awkward
delegate that was used for presenting the data. For instance:
    - Only one diagnostic at a time could be looked at
      in detail.
    - Once it had been opened, it was not possible to close
      such a detailed view again, other than by opening a new one.
We now use a tree view for showing the diagnostics, so users
can show and hide details about as many diagnostics as they
wish. That also gets us sensible item selection capabilities,
so features like suppressing several diagnostics at once can
be implemented in the future.

Change-Id: I840fdbfeca4d936ce600c8f6dde58b2ab93b0d00
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-08-25 08:42:40 +00:00
Orgad Shaneh
b3f9207ea9 Installer: Fix syntax for Python 3
Change-Id: I09a08f032b2cb774c0cf7d7290b9ab7e886137a2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 08:22:21 +00:00
Eike Ziller
4575ffd9e9 Fix size of fading indicator
In some situations text could be cut off.

Change-Id: Ib7499e679a9a9e048d217306c525b04eaf330967
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-25 08:21:51 +00:00
Friedemann Kleint
e603cafbe5 qmlpuppet: Fix build against Qt 5.6
Change-Id: Ia8417541888fa6a9b282db39f906024e83fee196
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-08-25 08:15:10 +00:00
Orgad Shaneh
d618c05e3a DiffEditor: Support mode change in Git diff
Task-number: QTCREATORBUG-14963
Change-Id: I5d26ae810add657a94fb40a5d4437e2d17a1625a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-08-25 06:48:49 +00:00
Orgad Shaneh
48b4509c70 TextEditor: Show fading indicator on zoom change
Change-Id: I3bf772ec09f08a3a9cb9652ca9718585beed9a2e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-25 05:31:45 +00:00
Orgad Shaneh
66447e5e43 TextEditor: Increase zoom limit to 3000%
Zooming using the mouse wheel has no upper bound.

Change-Id: I7ff680c7b48fb4d01773a3479bf17e3d81da7de7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 12:50:37 +00:00
Christian Kandeler
5f3b9dd89c QbsProjectManager: Fix working directory handling.
Commit 2dbc5b1032 introduced usage of WorkingDirectoryAspect into the
qbs run configurations for Desktop targets. However, the design of that
class was not suitable for the way our working directory logic works:
There typically is a user-provided value and, as a fallback if the user
does not provide anything, a default value managed by (build system
specific) code. The WorkingDirectoryAspect class could not differentiate
between these two values and so the value stayed forever at the initial
default if the user did not override it, instead of adapting to the
location of the executable.
This patch makes the necessary changes to the WorkingDirectoryAspect
class so that it matches the actual use case.

Task-number: QTCREATORBUG-14891
Change-Id: I7555d0a9cb4b04b75c9215a988278db32eb1ca10
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-08-24 12:42:42 +00:00
hjk
d0655e5cf2 Debugger: Remove unused code from pdbbridge.py
Starting from unused command line commands like
'up' and 'down' up to the (Pdb) prompt handling.

Change-Id: I93ab5025a52b259e3f9d80f3251e88bdb18a3467
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-08-24 12:28:08 +00:00
Daniel Teske
b82311024d Open Project: Don't show a error dialog for duplicated projects
Instead, switch to edit mode, show sidebar, scroll to project,
and show a tooltip next to the project.

The tooltip is somewhat easy to miss, but this is a clear improvement
in most cases.

Change-Id: Icd27f76e7d434f33e731b6fd56473ff913986a89
Task-number: QTCREATORBUG-8422
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 11:29:09 +00:00
Daniel Teske
bce3335365 SessionManager: Be smarter about loading/unloading projects
On switching sessions don't unload projects that are in both
sessions.

Change-Id: Iceceea262677ab523f8c3c9d2dda64faa34d6e0d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-24 11:02:09 +00:00
hjk
9bd066cb94 Debugger: Always disable wait indicator when switching engines
The spinning wait indicator in the Locals view could go on infinitely
when the running debugger engine did not get a 'notifyUpdateFinished'
signal (e.g. if the engine quits between beginning and ending an update
cycle).

Change-Id: Ib3d7a88d3b89ed423b2d41e85a632ff01f91c155
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 10:21:32 +00:00
Christian Kandeler
8bef635980 QbsProjectManager: Update the run config widget after a build.
The "executable" field in the local run configuration widget stayed at
"unknown" directly after a build, because the widget was not informed of
that information being available now.

Change-Id: Iadd86ad3d36250f5a54277707fbf1d8bd2df1232
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-08-24 09:37:32 +00:00
Eike Ziller
7ea6b21b6d Unbreak user-installed plugin loading on non-Linux
There is no "data" subdirectory on Windows and OS X.

Broke in 1d5091e48f

Change-Id: I1c5e5b60847028c9f3d734eeb6995e99013162b1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-24 09:11:07 +00:00
David Schulz
de1d48e4de Editor: Fix potential null pointer dereference in proposal widget.
Task-number: QTCREATORBUG-14875
Change-Id: I08dc2f2be9795bb4addcca1907cf13c30ebe6d9c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 09:00:12 +00:00
Christian Kandeler
acb36c2c6a QmlProfiler: Add missing override modifiers.
Change-Id: Ib8e8e84d82aa65a8e0f48f4479cbbc6ec9bb18c7
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-08-24 08:56:28 +00:00
Eike Ziller
08f12ed431 Version bump
Change-Id: I6f47ca6b9cd2058b3ad3fd1a815a296461777808
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-24 08:23:18 +00:00
Christian Kandeler
e92b6ab888 PythonEditor: Remove unused variable.
Change-Id: I7800612940a85e3c3d547d2586ec3d158e63b14f
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-08-24 07:59:29 +00:00
Eike Ziller
ba895b8ef0 Do not show detailed progress information by default.
The transition phase from having it in the mode bar is long over, so
people that were used to always seeing the detailed view it will either
have adapted, or have it set in their settings.
Not showing the details is the saner default setting, since the popup
does and will always hide other UI like the editor scrollbar, buttons in
find tool bar, content of output panes, etc etc.

Change-Id: Ib34dee976c46b5d19b81cebcca416612b673fb29
Task-number: QTCREATORBUG-9837
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-24 07:25:07 +00:00
Jake Petroules
d60e3010e8 Qbs: Adapt rpath handling to how it is normally implemented on OS X.
When using rpaths on OS X, the install name prefix should always be set
to "@rpath" and the rpaths should be appropriately set to the locations
in which that binary looks for its dependencies.

While this change is behaviorally identical, it brings the project
setup in line with how developers expect these properties to be set, and
thus reduces confusion.

As an aside, it now correctly follows the principle of relocatability
(install name prefixes like @rpath/Frameworks are only partially
relocatable as opposed to @rpath alone which is fully relocatable).

Change-Id: I7b5cc7a316d2608037ea9ab087029baa85aee2ba
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:53:31 +00:00
Jake Petroules
46910b46c3 Adapt Qbs code to latest changes.
type: application actually does nothing now, as the application type is
used for both bundled and unbundled products on Apple platforms.
Instead, consoleApplication being set to true influences Qbs not to use
a bundle.

cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4.

Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:51:12 +00:00
Thiago Macieira
a421538414 Fix bad use of port numbers.
-1 is not a valid quint16 number. It gets converted to 65535, which is
a valid port number. So, instead, use port number 0 which isn't valid
(if you try to bind to it, the OS chooses a port for you).

Found by ICC
src/plugins/android/androidrunner.cpp(150): warning #68: integer conversion resulted in a change of sign

Change-Id: I7de033f80b0e4431b7f1ffff13fc4e4f0f7af445
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-08-21 16:33:44 +00:00
Daniel Teske
e1d407b460 Current Project FindFilter: Show the project displayname
Change-Id: I91b083a91ff782fed1e8514a3690965708eff4dd
Task-number: QTCREATORBUG-14932
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-21 13:13:51 +00:00
Christian Kandeler
b0c66889e7 Qnx: Add missing override modifier.
Change-Id: Ia68b484f8949390c9390c93049eb21d61506a37b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-21 13:05:39 +00:00
Christian Kandeler
2b7c5b5160 GenericProjectManager: Add missing override modifier.
Change-Id: I0c99a18ff08d80279e72973eb2eb58d524751a70
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-08-21 12:02:10 +00:00
Christian Kandeler
7ce2e9a888 Valgrind: Add missing override modifiers.
Change-Id: Ief9f3f00678b73770dc7bbc431a9ddacf5f9b0f7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-08-21 12:01:59 +00:00