aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VCS: Use OutputFormatter for output windowOrgad Shaneh2014-03-193-10/+22
| | | | | Change-Id: I62cdd8e5c73d21d837772be83087dc065698db30 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Utils: Support \r handling in OutputFormatterOrgad Shaneh2014-03-195-30/+39
| | | | | Change-Id: Iae7ddc376cff86eef9d6873bdb6a6ed3f5f7022f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Inline CheckoutProgressWizardPage UI fileOrgad Shaneh2014-03-195-53/+31
| | | | | Change-Id: Ibc6be53693a6ae3499d6d24cc3aeeeef2ca12225 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: More robust Qt namespace extraction for LLDBhjk2014-03-191-5/+13
| | | | | Change-Id: I3964f15cb4295a64f91e0eb6035d365ee2b9f9bd Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Debugger: Move LLDB state reporting to separate functionhjk2014-03-191-24/+28
| | | | | Change-Id: I4e250173efc1c0df002d2ce94f7e8df57339544b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Debugger: Synchronize LLDB bridge outputhjk2014-03-191-3/+9
| | | | | | | | 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>
* Android: notify qml profiler when app is stoppedUlf Hermann2014-03-197-9/+14
| | | | | | | | | | | | 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>
* Improve translated messages in Android device dialog.Friedemann Kleint2014-03-192-13/+19
| | | | | | | | 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>
* Debugger: Adjust a few autotests to work with LLDBhjk2014-03-191-4/+4
| | | | | | | | | 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>
* Beautifier: Replace $HOME with it's actual valueLorenz Haas2014-03-194-2/+8
| | | | | | | | | 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>
* TargetSetupWidget: Do not always pre-expand selected kitsAlessandro Portale2014-03-183-2/+7
| | | | | | | | | 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>
* AndroidSettingsDialog: Warn the user that spaces in the ndk path are badDaniel Teske2014-03-182-2/+7
| | | | | | Task-number: QTCREATORBUG-11629 Change-Id: I576940fa5ac3fd47376cf3fc700689e1046387b0 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* AndroidSettingsDialog: Fix kitWarning icon showing up wronglyDaniel Teske2014-03-181-0/+2
| | | | | Change-Id: I619c858d9a379ee8b1463c048a8c34950ac25bc7 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Update qbs submodule to head of 1.2 branch.Christian Kandeler2014-03-181-0/+0
| | | | | Change-Id: Ia33c3479aa5e6f5fd6c9dc82c72e4a45e0e89204 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix compileDaniel Teske2014-03-182-0/+2
| | | | | Change-Id: I4ea7d0f8c8809496c04f1bbe266eb722f999209e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Git: Avoid QByteArray -> QString -> QByteArray conversions for encodingOrgad Shaneh2014-03-182-9/+10
| | | | | Change-Id: Ib2eb3000a08021336c9071d35d499371c9b88976 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Replace QStringList with QString in readConfigOrgad Shaneh2014-03-182-5/+4
| | | | | | | All the calls pass a single argument Change-Id: I95a7c44114ff2bb38cd65ab79a1e455dc969a62b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Consolidate codec configuration retrievalOrgad Shaneh2014-03-183-27/+17
| | | | | Change-Id: I6c099a5d0e4ffa180289bbecfe6d552b39d4aeaf Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Android: Fix compile with Qt4Christian Stenger2014-03-181-1/+1
| | | | | Change-Id: I3f1589b7ef08d288ad8b60dec29757d0c5d95e46 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectTree: Change hasBuildTargets to FolderNode::showInSimpleTreeDaniel Teske2014-03-1818-58/+75
| | | | | | | | So that the resource node can override it. Task-number: QTCREATORBUG-11678 Change-Id: Id30d1b99ee23cc18fc29fc99cf0ad7ca919ed527 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Qnx: Do not activate any API level if none is selectedEl Mehdi Fekari2014-03-181-5/+0
| | | | | | | | | | | | | The code was introducted before the "default configuration" was implemented. If the user deactivates all the BlackBerry Api levels, and restarts Qt Creator, BlackBerry kits will get generated again, unless all the API levels are completely uninstalled. Change-Id: Ie5525d3c08009fb3df986802cd25da24c290098b Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Simplify commit message codec handlingOrgad Shaneh2014-03-187-21/+19
| | | | | Change-Id: I5f90d7f5a17ccbe8585efd8ac7f731440b10db61 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Vcs: Prettify output in CheckoutProgressWizardPageTobias Hunger2014-03-183-5/+35
| | | | | | | | | | | | | | | | | Handle CR in the output of the VCS we are running in the checkout wizards. This makes sure we get proper progress information when running the checkout operation. Note that this is not a perfect implementation: It will fail when e.g. only a number at the start of the line is updated and the rest of the text in the line is reused. Task-number: QTCREATORBUG-10112 Change-Id: If742e5cb945a2fcada8319d08610d1ccc7fa2ae8 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Vcs: Leave lone CRs alone when normalizing line endingsTobias Hunger2014-03-181-15/+4
| | | | | | Change-Id: I426d850d96fff724c718471a5cab262ce0bf7d05 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Android: Add a checkbox for "Default Qt module permissions"Daniel Teske2014-03-182-4/+77
| | | | | | Task-number: QTCREATORBUG-11528 Change-Id: Id4e7f8c0ca4b060c5accf5f6f3b1ab2071ca408e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* iossim: Fix qbs build.Christian Kandeler2014-03-181-1/+1
| | | | | Change-Id: Iffd135703112b7cc5e86865e0035bab35cf5523d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlProfiler: Make sure y-offset in category labels is an integerUlf Hermann2014-03-181-1/+1
| | | | | | | | | This is only a workaround, for older versions of Qt. The real bug is that a non-integer y offset is interpreted inconsistently by QtQuick. Task-number: QTCREATORBUG-11732 Change-Id: Idcad0bf0cbef58b41c45e38aa29596717523ed0b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Squish: Handle sporadic missing visibility on MacChristian Stenger2014-03-181-1/+1
| | | | | Change-Id: I7e2694ced72ee836ad6c532f642914d802acb0c2 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Welcomepage: session list should not be flickableThomas Hartmann2014-03-181-0/+1
| | | | | Change-Id: I663c6634960ac7704648f8fd01d85b349a0ef19d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Git: Open untracked files on double-clickOrgad Shaneh2014-03-181-1/+3
| | | | | | | Task-number: QTCREATORBUG-6612 Change-Id: Ic56f4cd20063c9d4d05316607636aa3df1d1a5a3 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Use commit encoding for git show.Andre Hartmann2014-03-181-1/+2
| | | | | | | | | | At least for the Side-By-Side Diff for now. Task-number: QTCREATORBUG-11115 Change-Id: Ic7cb91f48ca810a99c39b2d00acc0cf227d051be Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* AndroidDeviceDialog: Show a hint if we found no deviceDaniel Teske2014-03-183-20/+86
| | | | | | Task-number: QTCREATORBUG-11437 Change-Id: Ib08cd6c7fd60d9973eb4022a2519a30bd0570496 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Git: Use commit encoding for interactive rebase and commit editorsOrgad Shaneh2014-03-181-3/+6
| | | | | | | | Task-number: QTCREATORBUG-11115 Change-Id: Ie922d94d66bed2882d3fc2b8b2de1bdc328d4d1c Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Git: Factor out commitEncodingOrgad Shaneh2014-03-182-6/+12
| | | | | | | | Task-number: QTCREATORBUG-11115 Change-Id: I58f3759c13d963aaf3e7891d7cc0a41c1ae14ecd Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Prevent checkout/clone over an existing non-empty directoryOrgad Shaneh2014-03-181-3/+9
| | | | | | Task-number: QTCREATORBUG-11701 Change-Id: Iee87deec59a8abed8930096c53e3c3514a208486 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExplorer: SysRoot config widget is read-only when sticky/not-mutableDavid Kaspar2014-03-181-1/+1
| | | | | | Change-Id: I39a04cc76896674e8df743cdc85a9f09c4857907 Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Kit: Save sticky kit informationEl Mehdi Fekari2014-03-181-0/+10
| | | | | | | Task-number: QTCREATORBUG-10485 Change-Id: I02081a45ce789992f22f79dc0fc3a60fe7ce439f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clang: never include a define for __cplusplus.Erik Verbruggen2014-03-181-0/+5
| | | | | | | | | | | | | | | The flags used by the project explorer to interrogate the toolchain for compiler-defined #defines always indicate a C++ file. So, this will always include a #define for __cplusplus. When editing C code with the clang code model, this results in extern "C" linkage specifications, which result in warnings or errors. The proper fix is described in QTCREATORBUG-11709, but is too big to be done within the 3.1 timeframe. Task-number: QTCREATORBUG-11501 Change-Id: Id9e261fa8d429fead4a2cd5fd7398aa6e1e8c13d Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Debugger: Be more verbose about unhandled breakpointshjk2014-03-181-11/+13
| | | | | | | | Especially for mixed debugging getting the ID explicitly gives hints which part of the combined engine fails. Change-Id: Iab4b54d6e9fb8d4afd3df0855861511bc06454c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Debugger: Add simple QV4::String dumperhjk2014-03-183-0/+45
| | | | | | Change-Id: Ide277128d30c4dcc5c396441ebd6e40aa3fc8b51 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Beautifier: Small, paranoid local caching in the hope for gaining speedLorenz Haas2014-03-181-2/+3
| | | | | | | | Avoid that QDir::home() is potentially called twice. Change-Id: I9fca53f800be74f05d941cf9baa34eecb6c899cb Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* VCS: Fix message in GitClientRobert Loehning2014-03-171-1/+1
| | | | | Change-Id: I1184b15a8b225430b59e0abb35cd9395cb7d1850 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix tooltipRobert Loehning2014-03-171-1/+1
| | | | | | | The button actually reads "Do Not Show Again". Change-Id: I9e8599d26f1fe4ce73af739833dcec1ed8cc9a07 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* QmlDesigner.PropertyEdior: Fixing ComboBoxThomas Hartmann2014-03-171-1/+4
| | | | | | | If there is no enum value fall back to the instanced value. Change-Id: Idd4654d6e9fb8d4afd3df0855861511bc06454c1 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner.PropertyEditor: Fix OriginControlThomas Hartmann2014-03-171-2/+5
| | | | | | | The control has to use the new enum api. Change-Id: I73e86ac1c4f2c3fe4373b12968ac86fbbaee64aa Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner.PropertyEditor: Fix text alignment buttonsThomas Hartmann2014-03-172-6/+6
| | | | | | | They have to use the new enum api. Change-Id: Ib4ac7d56512007cb19fd7e6a65413198a9d90719 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Qnx: Use correct mkspec in the qmake stepEl Mehdi Fekari2014-03-172-3/+10
| | | | | | | | | | | | | | | | | | | | | | | In order to use the correct mkspec in the qmake step, the qt version mkspec needs to be explicitly listed in the QnxToolChain suggested mkspec list (Otherwise the first one found in list will be used). That is currently broken due to the following issues: * The mkspec for BB armle-v7 target has been recently changed to blackberry-armle-v7-qcc, which was not listed in the QnxToolChain suggested mkspec list. * The Qt4 for BB armle-v7 uses the "default" mkspec which is a copy of the "blackberry-armv7le-qcc" mkspec. The mkspec name should be explicit in order to be found and used. Task-number: QTCREATORBUG-11674 Change-Id: Idb53d22e7c4b746b23dd3a65c42d00dca5c27d0c Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Squish: Trying to stabilize tst_CSUP04 on MacRobert Loehning2014-03-171-1/+4
| | | | | | | Looking at the screenshots, fails might be timing issues. Change-Id: Ia17b766e332370b3392161d79c774d94f3c1b790 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* QmlDesigner: Revert bumping the puppet versionThomas Hartmann2014-03-173-3/+3
| | | | | | | | | Since Qt Creator 3.1 will be released before Qt 5.3, bumping the version number and enforcing to rebuild the puppet creates a huge hurdle for end users. Change-Id: Ic85a2ed315cf67b7d47bdfa492e6c5d2adf719d9 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Hotfix for older puppetsThomas Hartmann2014-03-171-0/+3
| | | | | | | | | Older puppets crashes if we send enumerations so we convert them before. This patch has to be reverted in master. Change-Id: Id33e776616ea6e74c7b14799e3aed130c39f8fed Hotfix: 3.1 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 18:36:41 +0000