Commit Graph

34796 Commits

Author SHA1 Message Date
Christian Stenger 79497e7fae Squish: Fix Qt Quick 1 related tests
qrc files are now used in Qt Quick 1 template as well.

Change-Id: I7b7541d16100285893587605bb1b4130277b72e4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-21 12:56:18 +01:00
Jarek Kobus 7e8de984b2 Update Polish translations
Change-Id: Ib18ac6e8847d4d47477523165616b1c51ed39d0d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-21 12:04:15 +01:00
Thomas Hartmann 4997122048 WelcomePage: Fix for invisible buttons
Opacity 0 does not imply visible false anymore.

Task-number: QTCREATORBUG-11790
Change-Id: Ie5b0786d7e82399164e0b89cfeaf65f97ab357c3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-21 11:34:56 +01:00
El Mehdi Fekari cc4a4deda4 Qnx: Update the deployment steps for BlackBerry 10
Change-Id: I7e6d4d295ec994255cb91bfd43d268809e39bcf0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-21 10:59:50 +01:00
Daniel Teske 7c706b7820 ProjectExplorerTree: Fix node not being selected
Task-number: QTCREATORBUG-11782
Change-Id: Ib37a4801b15a7420dedbb3e504fa1d25adc75912
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-21 10:37:08 +01:00
Jarek Kobus a6f12b3555 Replace qtquick 1.1's deployment with qrc file.
Don't generate Qt icons for Qt Quick App projects anymore.

Change-Id: Ic0fc43235a5b8da6696d5eb8d4a765d49b03dfd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-20 19:59:46 +01:00
Marco Bubke d59f5c1955 QmlDesigner: Don't instance MediaPlayer
Task-number: QTCREATORBUG-11323
Change-Id: I37629f9d6cdcb1ff12bc86ed9296e8d5af744ac4
Hotfix: 3.1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-20 18:28:02 +01:00
Marco Bubke 8fd5f15e83 QmlDesigner: Use modelNode instead of componentId in crumble bar
Task-number: QTCREATORBUG-11780
Change-Id: Ida85d3884529fe31b65fa676bdc830eb1dafc568
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-20 17:14:19 +01:00
hjk f7a05780d2 Debugger: Fix QObject property dumper for Qt4
Change-Id: I5aa28a3c1fb5847b758f5f1a27359cab3e38ff5c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-20 15:44:49 +01:00
Christian Stenger 1b6b0b9506 Squish: Stabilize tst_default_settings on Mac
This also reverts 1605b788e6.

Change-Id: I45b1b856eb6bd0acba43a10866faf2a9726aaa54
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-20 15:43:10 +01:00
hjk 06fbcde58b Debugger: Add offset test for QObjectPrivate::extraData
Change-Id: Ie1adc3d1d1c60b6f08b734cbe85455f1ba10de89
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-20 15:01:25 +01:00
Christian Stenger 8a6b6c7cba Squish: Avoid AUT crash in tst_qml_outline
Change-Id: I93e8c0050dba4f0acb7b02eeeb5a0dfdddf9d02d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-20 13:05:54 +01:00
Christian Stenger 6ca680ac1f Squish: Fix tst_git_clone
Some objectNames had been removed.

Change-Id: I5c3d405a623cbd894c7df79ce44ac05013049d3d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-20 13:05:22 +01:00
Kai Koehne a6e65e25ed Deploy Qt platformthemes plugins with Qt Creator
Makes sure Qt Creator integrates nicely e.g. with gtk.

Task-number: QTCREATORBUG-11406
Change-Id: I4da11b42e9d407ee8456c6d43479839667ee13c1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-20 12:32:48 +01:00
Thomas Hartmann 9e466fe958 QmlDesigner.PropertyEditor: Refactor LayoutSection
Avoiding duplication of code and giving the label more space.

Change-Id: Id0988fda89b7a671be5f57e511650bd7c73c2d84
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-20 12:24:00 +01:00
Fawzi Mohamed ffdfe3dacd iossim: flush stdout (fix regression)
Change-Id: I3deb9ca4c015a1fc15c73a727c8f1ab78638ca7d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-20 09:59:56 +01:00
Fawzi Mohamed a534e9889a iossim: remove Objective-C 2.0 literals
gcc does not support them

Change-Id: I86726429f299b4e8ac545c4db7cef81c4f091851
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-03-19 22:24:13 +01:00
hjk 4999da41f5 Debugger: Fix Qt 4 Variant dumper for extended core types
Change-Id: I5532453e0d2568b3c3d24a645b7a05aa4b579fb3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 20:32:58 +01:00
hjk e9a2e4569b Debugger: Fix QXmlAttributes dumper for LLDB
Change-Id: I456424161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 19:01:02 +01:00
hjk 41e47513b8 Debugger: Disable QStandardItemModel dumper test for LLDB
The dumper is far from portable, make the test pass for now.

Change-Id: I52cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 18:48:38 +01:00
hjk d343641b9a Debugger: UseDebugImage for QDir dumper test
Should work without, but doesnt with LLDB.

Change-Id: I32cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 18:48:20 +01:00
Marco Bubke f286f2107f QmlDesigner: Don't change x or y if vertical anchors are set
Task-number: QTCREATORBUG-11783
Change-Id: I81f64afc3308e2e1b66dea5540704767d30e29d2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-03-19 17:51:36 +01:00
Friedemann Kleint 819413fc23 QML Designer: Fix build on Windows/MSVC.
Variable names should be different.

Change-Id: Ibf7c8dd95ffc59d0c02341dffa107f0a0441beaa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-19 17:48:26 +01:00
Robert Loehning b442a02602 Squish: Generalize stabilization of tst_CSUP04
Change-Id: Id56420161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 17:20:48 +01:00
Christian Stenger edf7557749 Squish: Fix and improve __selectQtVersionDesktop__
Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-19 17:19:12 +01:00
hjk 484bacdd51 Debugger: Robustify QMetaObject extraction.
LLDB manages to extract a QAction metaobject from any
plain int and classes without any bases.

Change-Id: I22cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 17:07:32 +01:00
Christian Stenger d1b412ced2 Squish: Add workaround for tst_HELP02
Change-Id: I61307ccd86246cdbe131f89e13521be8942c22a1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-19 17:05:07 +01:00
Daniel Teske 3d8000a926 Android: Add Libraries: Disable library model while parse is in progress
Change-Id: I314e7db6178d6d6863b3f99a0bf1f0eec0956303
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-19 16:38:17 +01:00
Daniel Teske c577906823 Android: Add Libraries: Open file dialog in project's directory
Change-Id: Id7a71f3c1f41f2d650e5f98b8bb35bfa5a68fd98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-03-19 16:22:58 +01:00
Kai Koehne 9a8ec083d5 Do not warn for combined engine if QML debugging has not been enabled
Do not bring up a message box when connecting to the QML debugging port,
but rather just log, and continue C++ debugging.

This mitigates the issue that, in some configurations, QML debugging is
enabled by default although the application might not be set up properly.

Change-Id: I29e89ada4bf14f57589c8c671452572b689cdbdb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-19 15:37:20 +01:00
Friedemann Kleint 6e2de168a1 Reduce duplication in messages for QML Puppet checks.
Change-Id: I490c89f854465baf160bc55a65f3c3e24490a947
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-03-19 15:34:08 +01:00
Marco Bubke 2f0642f997 QmlDesigner: Hide states editor for full screen
Task-number: QTCREATORBUG-6266
Change-Id: Ib71d65a7abcdc482acf0cba770f250220b071c5d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-19 15:20:57 +01:00
Tobias Hunger 0e67b293b7 Qnx: Fix lifecycle of the BlackBerryConfigurationManager
This fixes a crash when this class tries to show a UI while it is
destructed.

Task-number: QTCREATORBUG-11712
Change-Id: If4aca14a3ca4792bec1a45903a1f38287d16dbc4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-19 14:31:09 +01:00
Tobias Hunger bfd6040224 DeviceManager: Fix lifecycle
This prevents a crash when the DeviceManager tries to bring up a UI during
its destruction.

This happens in the same situation as described in QTCREATORBUG-11712,
which actually describes the same problem in BlackBerryConfigurationManager.

Change-Id: I06f134ffa282a281c81fd022c5a2f52fb5dddb56
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-03-19 14:30:28 +01:00
Orgad Shaneh 99c38093de VCS: Use OutputFormatter for output window
Change-Id: I62cdd8e5c73d21d837772be83087dc065698db30
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-19 13:33:46 +01:00
Orgad Shaneh 0960127ece Utils: Support \r handling in OutputFormatter
Change-Id: Iae7ddc376cff86eef9d6873bdb6a6ed3f5f7022f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-19 13:33:32 +01:00
Orgad Shaneh 1c953f0ac0 VCS: Inline CheckoutProgressWizardPage UI file
Change-Id: Ibc6be53693a6ae3499d6d24cc3aeeeef2ca12225
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-19 13:32:21 +01:00
hjk f9a7bb7bcf Debugger: More robust Qt namespace extraction for LLDB
Change-Id: I3964f15cb4295a64f91e0eb6035d365ee2b9f9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:12:11 +01:00
hjk 358500e7fc Debugger: Move LLDB state reporting to separate function
Change-Id: I4e250173efc1c0df002d2ce94f7e8df57339544b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 13:05:38 +01:00
hjk 05d7dd1bb9 Debugger: Synchronize LLDB bridge output
Output coming from spontaneous events should not interfere
with output produces by lengthy display generation.

Change-Id: I2a9e4fa93db131cfdac4cb0eb613c0159214d8be
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 12:57:07 +01:00
Ulf Hermann 1111c06aac Android: notify qml profiler when app is stopped
As we cannot determine reliably what happened to the app we drop the
"success" parameter to notifyRemoteFinished(). It was almost always
true before and where it wasn't it didn't do anything useful. The
transition from AppRunning to AppKilled without AppDying in between
was invalid and would have triggered an assertion when it happened.

Task-number: QTCREATORBUG-11760
Change-Id: Iebf4ca9bddbcc7b152131f9574bc5f2c0a8ba44f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-19 12:29:49 +01:00
Friedemann Kleint 9c180ffded Improve translated messages in Android device dialog.
Reduce duplication, remove some HTML formatting.

Change-Id: Ia419a5c9a5bbeefca2863acd5d893f13acb34866
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-19 11:14:13 +01:00
hjk bf593e3f04 Debugger: Adjust a few autotests to work with LLDB
LLDB doesn't find const[] in the function, since this
is not what the tests are supposed to check, dropping
the const is simpler than using backend specific checks.

Change-Id: Ifad1a57a3112b7cc5e86865e0035bab35cf5523d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-03-19 09:36:21 +01:00
Lorenz Haas b8080429fc Beautifier: Replace $HOME with it's actual value
Instead of having options texts like "Use file $HOME/abc", $HOME is
eliminated in favor of the actual value of QDir::home().

Change-Id: I9ffe27d73e54a9d30e1f0d4a277fbfbb7969ed45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-03-19 05:13:54 +01:00
Alessandro Portale 6e6599e0b0 TargetSetupWidget: Do not always pre-expand selected kits
Does not add much value (anymore), except in the import case.
Expanded targets take away a lot of space, pushing other targets
or potential kits out of the visible area

Change-Id: Iff0c46643b0fccef7e272a036d0c9c3a099ccc1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-18 18:11:20 +01:00
Daniel Teske 41d3f0f2f2 AndroidSettingsDialog: Warn the user that spaces in the ndk path are bad
Task-number: QTCREATORBUG-11629
Change-Id: I576940fa5ac3fd47376cf3fc700689e1046387b0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:11:01 +01:00
Daniel Teske c751e2d685 AndroidSettingsDialog: Fix kitWarning icon showing up wrongly
Change-Id: I619c858d9a379ee8b1463c048a8c34950ac25bc7
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-18 17:10:56 +01:00
Christian Kandeler f9d3729a3c Update qbs submodule to head of 1.2 branch.
Change-Id: Ia33c3479aa5e6f5fd6c9dc82c72e4a45e0e89204
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-18 14:49:12 +01:00
Daniel Teske 93184f7959 Fix compile
Change-Id: I4ea7d0f8c8809496c04f1bbe266eb722f999209e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-18 14:41:46 +01:00
Orgad Shaneh d72b4851b4 Git: Avoid QByteArray -> QString -> QByteArray conversions for encoding
Change-Id: Ib2eb3000a08021336c9071d35d499371c9b88976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-18 14:30:09 +01:00