aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* CppEditor: Adjust Title in preprocessor dialog.v3.0.0-betaDavid Schulz2013-10-221-1/+1
| | | | | | | Now its more consistent with the other text in this dialog. Change-Id: I424428a6fb892a2f0be2a3c6b11ae652ea39c679 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Doc: replace Qt GUI Application with Qt Widgets ApplicationLeena Miettinen2013-10-222-2/+2
| | | | | | | | | | | Qt GUI application could also be a Qt Quick application. Update screenshots. Task-number: QTCREATORBUG-10263 Change-Id: I8c0dd34e1222c3b42fddaf3f562e402490ce1037 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* RunSettings: Do not needlessly recreate RunConfiguartionConfigWidgetsTobias Hunger2013-10-221-4/+9
| | | | | Change-Id: I0b8afe05b12123117959eec6f7465ebd4950e197 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Qbs: Fix memory leak in Qbs Project ManagerTobias Hunger2013-10-221-0/+8
| | | | | | | Make sure the root node of the project tree is actually deleted. Change-Id: Idf32460d7b5d0518da9536084cccb074638cfce3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove adb daemon logsBogDan Vatra2013-10-221-2/+13
| | | | | | | | If adb daemon is not started, adb devices command will add two lines to the output, messing up the devices list. Change-Id: I40dcf586d2661df2de0a56aaac543c3b4739ab0d Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Merge remote-tracking branch 'origin/2.8' into 3.0Eike Ziller2013-10-222-2/+15
|\
| * Git: Fix crash on show stashOrgad Shaneh2013-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * show() is called with a QString reference to the model * And editor is opened, which triggers stateChanged() * stateChanged() updates StashDialog, which refreshes the model with an empty directory (another bug) * The QString name reference is invalidated => crash on access Task-number: QTCREATORBUG-10397 Change-Id: I0c4077f8c4fc90905568f80d1cd89f61c4cd2cba Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * QmlDesigner.MetaInfo: fix handling of enum scopesThomas Hartmann2013-10-161-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The codel model does not provide enum scopes at the moment. As a fallback we use class names, but this fails if we use the original cpp class name from the <cpp> package. For this reason we always try to find an export with a package different from <cpp>. As a final solution the code model should be able to provide the enum scopes. Task-number: QTCREATORBUG-10114 Change-Id: I15396c83590426ab0b9b55c8646a89c8d5712683 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * QmlDesigner: Support for enums in alias propertiesThomas Hartmann2013-10-164-5/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enums in combination with alias properties were not supported. The QML Engine does not distinguish between bindings and enums in this case. We want to distinguish between bindings/expressions and literal enums. This is not possible with the current code model, so we use a list of hardcoded enum keys for Qt Quick. There a several issues we want to properly fix in the future. * Make the model aware of enums. Currently enums are strings (the key) in the model. This has historical reasons. Instead we should use a custom type registered to QVariant that handles the scope, key and integer value. * The code model should be fully aware of enums even in the alias case. Do not integrate this patch to 3.0 or master. Task-number: QTCREATORBUG-10114 Change-Id: I780a201202f0949b1e2eb2f2525ddb031e1cd18b Reviewed-by: Marco Bubke <marco.bubke@digia.com>
| * Revert "EditorManager: Fix crash when closing an editor upon activation"Orgad Shaneh2013-10-0810-127/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting an editor while currentEditorChanged is apparently not a good idea. Use a queued connection instead. This reverts commits 243a6259618e69b8da9ac2438480c449754f7f77 and d9602ca550c53e60a5229bfec9539e41fa5a694c. Task-number: QTCREATORBUG-10190 Task-number: QTCREATORBUG-10235 Change-Id: Iccbee25fb77714963faa6f7184d1f5f53ed348a6 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * Fix a crash on codestylesettingsjkobus2013-10-074-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-10235 Instead of rely on ICodeStylePreferences::destroyed() signal, when all other objects might be in destruction phase, clear project code style settings explicitly, when project closes. Change-Id: I0dd6675d54c5495d4006acbc9ad12c95f1d0a00c Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| * Include the correct header for std::lower_bound.Thiago Macieira2013-10-061-0/+2
| | | | | | | | | | | | | | | | That is <algorithm>. Relying on indirect includes is bad, mmkay? Change-Id: I245885672004cd406f98c82231aaa38a5cfe464c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | QmlDesigner: Remove qml2puppet test fileMarco Bubke2013-10-221-1/+3
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-10449 Change-Id: Ied72268910bc2312c3d293da0ef38c1ff8b72fc4 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | FakeVim: Initialize new m_inFakeVim memberhjk2013-10-221-3/+4
| | | | | | | | | | | | | | | | Also move initialization before connection setup. Task-number: QTCREATORBUG-10443 Change-Id: I3f3d074534a44a0aa6b8cc60c8ffbcd22d96ca33 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | QNX: Fix compilation with Qt 4.Friedemann Kleint2013-10-221-7/+1
| | | | | | | | | | Change-Id: I8607dd339f5c6e3580f2e17c8ca3b7bcbbb11a8e Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-2234-76/+92
| | | | | | | | | | | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | CppEditor: Remember project in preprocessor dialog.David Schulz2013-10-223-13/+23
| | | | | | | | | | Change-Id: If226707541b1fd4d5c22de2795fb39bc333cfa49 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | QmlDesigner.Model: allowing some diagnostics for exceptionsThomas Hartmann2013-10-2114-1/+27
| | | | | | | | | | | | | | | | | | Setting QTCREATOR_QTQUICKDESIGNER_WARN_EXCEPTION will give detailed information about any exception thrown. Change-Id: Ia11b98324e6f0c27e086778ddcb1afec67d92e6a Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QmlDesigner.PropertyEditor: fix specifics for controlsThomas Hartmann2013-10-217-468/+513
| | | | | | | | | | | | | | User the new Qt Quick 2 format. Change-Id: I178ffe84c49df51bcf96983c3a0c89e240f5bf58 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | QbsProjectManager: Clean up qbs::Preferences object.Christian Kandeler2013-10-211-4/+3
| | | | | | | | | | Change-Id: I5921b97b42a94aaa9c06d47f8581538c12c4fcab Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Qnx: Fix broken qmake environmentEl Mehdi Fekari2013-10-211-6/+30
| | | | | | | | | | | | | | Fix the way we parse PATH and LD_LIBRARY_PATH. Change-Id: I9928bf3573728580af6f361ce30101d8db142fc2 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Vcs: Do not leak parameter widgetsTobias Hunger2013-10-211-7/+8
| | | | | | | | | | | | | | | | | | | | Executing a parameter widget command calls a diff() or log() of VcsBaseClient. The editor already existed, but parameter widget is always created (call to setConfigurationWidget() will be ignored in this case) - and parameter widget gets leaked. Change-Id: I25591d5a54b80fed25ff11ce26108882c421e9fc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Qbs: Do not throw away old project data if parsing failedTobias Hunger2013-10-211-0/+3
| | | | | | | | | | Change-Id: Icc54abcfcee1f8deea5247d46d8d13b75741feda Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Debugger: Fix QChar dumper with Python 3hjk2013-10-211-1/+1
| | | | | | | | | | Change-Id: I7da412c9bdaf3a8f65484ac99f06fc31a5cdc1c3 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Debugger: Offer base changes for all integral looking values.hjk2013-10-211-12/+22
| | | | | | | | | | | | | | If it talks like a duck, and walks like a duck... Change-Id: I166a452a9d067285467b346a4ef5d4de646d3a31 Reviewed-by: hjk <hjk121@nokiamail.com>
* | QNX: Use slog2info on pure QNX devices for debug outputTobias Nätterlund2013-10-213-3/+34
| | | | | | | | | | | | | | | | | | | | If available, slog2info should be used even for pure QNX devices to get hold of the debug output. Task-number: QTCREATORBUG-10442 Change-Id: If85855e94803a4b8648e84c0295bfdd2271e8d76 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | LLDB: Set environment for debugged processEike Ziller2013-10-211-0/+2
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-10030 Change-Id: Ib487cee704ea30f52c52f6f025823637fa4199eb Reviewed-by: hjk <hjk121@nokiamail.com>
* | Abi: Add unit tests for MSVC2013 detectionTobias Hunger2013-10-211-0/+12
| | | | | | | | | | Change-Id: I7ab801761d88c4dde45fe1fb9f6731b65ac3d0f0 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Add MSVC2013 supportYuchen Deng2013-10-214-4/+24
| | | | | | | | | | Change-Id: I956b5796a67792f826ddc72e7681609372a9c029 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | CppEditor: Remove duplicate code in cppeditorplugin.cppNikolai Kosjar2013-10-211-22/+19
| | | | | | | | | | Change-Id: Ifeff4455b1ce0a0a7299f009beaf6319e9abb523 Reviewed-by: David Schulz <david.schulz@digia.com>
* | QNX: Refactor BlackBerryLogProcessRunnerTobias Nätterlund2013-10-216-219/+309
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduce a separate class for running the slog2info process, in order to be able to use that for pure QNX (non-BlackBerry) devices. Also moved from using QSsh::SshRemoteProcessRunner to use ProcessExplorer::SshDeviceProcess for the tail/slog2info processes instead. Change-Id: If917bd2a1099800f1a7333639d674c8d1b16de7b Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | Qnx: Fixing Bar Descriptor XML file editor to provide editor actionsDavid Kaspar2013-10-218-4/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BarDescriptorEditorWidget is using TextEditorActionHandler class to provide editor actions e.g. Undo, Redo, Cut, Copy, Paste accessible from main menu and using shortcuts. TextEditorActionHandler.resolveTextEditorWidget() virtual function is added to all resolving TextEditorWidget for an Editor. This allows to have IEditor->widget() to have non-BaseTextEditorWidget instances too. Task-number: QTCREATORBUG-10040 Change-Id: I6f433fc307c13ef2b2a20c48e6473826f2619544 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | Qnx: Use Utils::Environment for qnx environmentMehdi Fekari2013-10-2115-105/+114
| | | | | | | | | | | | Change-Id: I499ca9be0abc15fc0c57847ff288e80612a536fe Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QNX: Fixed killing processes on QNX and BlackBerryTobias Nätterlund2013-10-211-10/+10
| | | | | | | | | | | | | | | | | | The commands were mixed up in previous commit, we have to use pidin on BlackBerry, at least the older ones. Change-Id: Ibff1f386c6570814a4bccfef5404e60854222f24 Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* | CppEditor: Add action to open a preprocessor dialogDavid Schulz2013-10-214-2/+17
| | | | | | | | | | Change-Id: I5ed09f6b8a358652145012e137ab717729999aca Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Debugger: Make ABI matching a bit more fuzzyTobias Hunger2013-10-181-4/+7
| | | | | | | | | | | | | | | | The debugger ABI might not be fully defined, so ignore any field that is undefined in the debugger ABI. Change-Id: Idf57b76efff12d4ab4c21f18721a02970efbf217 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | BaseQtVersion: Remove some useless calles to updateVersionInfo()Tobias Hunger2013-10-181-11/+2
| | | | | | | | | | | | | | qmakeProperty and qtVersion call that implicitly already. Change-Id: If4596740b9da02ef662b9831019f19c4d679cd39 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Qbs: Do not copy build step and build step listTobias Hunger2013-10-182-4/+4
| | | | | | | | | | | | | | | | Those are owned by the DeployConfiguration and we should not copy those settings since we may belong to a different DeployConfiguration. Change-Id: Ibb80eb808c8e0f790b35e38bb3dfcf357cf579d2 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | BaseCheckoutWizard: Add button to message box informing about failureTobias Hunger2013-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | Add a "OK" button to the message box informing about a failure to find any project file in the freshly checked out directory. That way the user has a way to close the message box on Mac. Task-number: QTCREATORBUG-10429 Change-Id: I9e1a4a2f368982dea2b0060f3f35dcb97d8936a3 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | Device support: Polish DeviceApplicationRunner.Christian Kandeler2013-10-182-47/+35
| | | | | | | | | | | | | | | | | | | | | | | | Remove timeout check (part of DeviceProcess now), react to the DeviceProcess' error() signal, remove unneeded members, improve messages. What's left is a light-weight wrapper around DeviceProcess suitable for run controls. Removal would result in identical boiler-plate code in several places. Change-Id: Ib306369df8dbf72dddb8ca305d256870a121dd63 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | C++: Limit typedef resolving depthNikolai Kosjar2013-10-183-79/+57
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 5be56c0 except for its tests. While it fixed the problem described in the bug report, it also introduced regressions. For now, we use a hard limit. Change-Id: I19a85be454e3d7969371707e3eb1c3d42a16ecee Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | QbsProjectManager: Do not create a build graph when resolving a project.Christian Kandeler2013-10-181-0/+4
| | | | | | | | | | | | | | | | | | People do not expect directories to be created as a side effect of opening a project. Task-number: QBS-304 Change-Id: I820a1311d534a4a76a4660588c4e9d71cc03f153 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | DebuggerKitInformation: Make setup() handle new kitsTobias Hunger2013-10-181-3/+4
| | | | | | | | | | | | | | Those return a invalid QVariant, so handle that explicitly. Change-Id: I50726552aeb76d21032c119c5ea2db48e6d88e8b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | DebuggerKitInformation: Invalid ids are okTobias Hunger2013-10-181-0/+3
| | | | | | | | | | | | | | | | Invalid Ids are used to for "No Debugger", so do not try to fix those values. Change-Id: I141f969524e1faffa66a22c2a08ef18ec4d7fc23 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | BaseQtVersion: Make sure qmake variables are up to date.Christian Kandeler2013-10-181-8/+9
| | | | | | | | | | | | | | | | Otherwise, qmake properties can be wrongly read as empty. Change-Id: If63a306664758c01529b437fca30f5222b75f02f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | BaseQtVersion: Make qmakeProperty(versionInfo, name, ...) protectedTobias Hunger2013-10-181-2/+3
| | | | | | | | | | | | | | This is a low level method which is not useful for normal usage. Change-Id: I5fd1c019856a8a84299f5b11c159ea6b0f5131a9 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Fixes in translated messages.Friedemann Kleint2013-10-184-5/+5
| | | | | | | | | | Change-Id: Ie1aa0547281d9a1ab31f00e44c4e09dd96c60543 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Android: Rework sdkTargets() to cache the output of adbDaniel Teske2013-10-184-13/+33
| | | | | | | | | | | | | | | | | | | | Also rename/change highestAvailablePlatform to highestAvailableSdk. This fixes a bug reported on irc, where the lists for sdk and ndk were different and the highestAvailablePlatform was not available as in the sdk. Change-Id: I17fec9e8ce1913e933ddcf8eaa21d6bb6e14c5be Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Android: Distinguish between platforms in the ndk and the sdkDaniel Teske2013-10-183-15/+14
| | | | | | | | | | | | | | | | | | | | The available platforms in the ndk might not be the same as in the sdk. This patch is renames everything using the ndk platform list to ndkPlatforms, except the highestAvailablePlatform which wrongly uses the ndk platform list. Change-Id: I02d9b68bbc27b0c748281678fe654d5f4244578d Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Android: Remove bestMatch calls in fallback code in buildTargetSDKDaniel Teske2013-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | besdtMatch finds a ndk version that is at most the targetApi passed into it. Since we are passing in the fallback and lowest possible api level that qt supports, the function would return at most the lowest supported version. That's not very useful and cannot have worked, so simpy return the fallback version directly. Change-Id: I5e4757639099af4d207f928b0335d28efd75a02b Reviewed-by: BogDan Vatra <bogdan@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 08:18:45 +0000