summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into wip/clangwip/clangErik Verbruggen2013-12-10377-19435/+30056
|\ | | | | | | Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
| * C++: split defines into project-defined and toolchain-defined.Erik Verbruggen2013-12-1010-34/+45
| | | | | | | | | | | | | | | | So we can ignore possibly problematic toolchain-defines, while can still unconditionally apply project-defines. Change-Id: I7cb96f35a963d080011fe888ef71bfc098dd33ef Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| * Move markableInterface() to ITextEditorDocumentEike Ziller2013-12-108-33/+20
| | | | | | | | | | | | | | And remove the indirection over BaseTextEditorWidget. Change-Id: I2c570edf46b9ca72a11704ce27d8ae3f2218dcf0 Reviewed-by: David Schulz <david.schulz@digia.com>
| * Rename QString ITextEditorDocument::contents --> plainTextEike Ziller2013-12-109-12/+12
| | | | | | | | | | | | | | To differentiate it from the byte array based IDocument::setContents Change-Id: Icc9600732c2742fb79254a0697870bacce3a59ee Reviewed-by: David Schulz <david.schulz@digia.com>
| * Mac: Remove code that was there for 10.4 compatibilityEike Ziller2013-12-103-18/+8
| | | | | | | | | | | | Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * IDocument: Remove unused enum.Eike Ziller2013-12-101-6/+0
| | | | | | | | | | Change-Id: I30eb3855fa4e8e59195cb865c712cdc171700af3 Reviewed-by: David Schulz <david.schulz@digia.com>
| * QmlProfiler: Add model template for range dataUlf Hermann2013-12-094-2/+302
| | | | | | | | | | | | | | | | | | In order to unify the uses of range data and the calculation of first and last ranges in visible areas we need a template class to provide the respective algorithms. Change-Id: I1c2e9c9fa9ae048262026236c4ff39017ab7913f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * TODO: Fix some UI textEike Ziller2013-12-092-6/+6
| | | | | | | | | | Change-Id: I7c07ec61f215cc325109fb091f89b09fbfc0d043 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * CdbExt: Add dumper for C++11 std::array.David Schulz2013-12-093-1/+33
| | | | | | | | | | Change-Id: I1b9285e4bc3d0d9a21f0779b3e6dec1f9a4b4ee1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * WelcomePage: Report sizes of loaded imagesUlf Hermann2013-12-091-5/+12
| | | | | | | | | | | | | | | | | | It's so much nicer for the qml profiler to know the actual sizes of images ... Change-Id: Ib1c0d38b002a061e7cffe2619034e144e4d5f2cf Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
| * Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-0916-15/+41
| |\
| | * Qnx: Fixing incorrect environment for running BlackBerry cmd-line toolsDavid Kaspar2013-12-093-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BlackBerry command-line tools were launched without any environment set that would match the related BB NDK Target. This results in command-line tools to not run at all (they fail to find 'java' program). The only workaround it to have 'java' program on system PATH. Task-number: QTCREATORBUG-11029 Change-Id: I90e102413d7843d538d394aec306749e37e6148b Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com>
| | * Fix compilation of ios plugin with Windows 64 bitKai Koehne2013-12-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Q_PID is a pointer under windows, and the compiler won't allow us to convert a 64 bit pointer to int. Task-number: QTCREATORBUG-11026 Change-Id: I34e45bf2ef1e565c5967fac6b482c14117a04578 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| | * Remove unneeded texts.Jarek Kobus2013-12-091-4/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ibf18eb165b9e052c9a77b1b917b2746d56f81646 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| | * QmlProjectManager: Fix spellingThomas Hartmann2013-12-081-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia03bb14c7e19090fa71ebf35597539a254bcb308 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| | * Remove function acceptIndented that is not used anywhereThiago Macieira2013-12-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by ICC: warning #177: function "<unnamed>::Rewriter::acceptIndented" was declared but never referenced Change-Id: I37892d021a4ca9886fd35fea00102d44fa99320f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| | * qbs: fix ios profilesFawzi Mohamed2013-12-061-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QBS-427 Change-Id: I2ad69076ba8fe4c989f6909b77087c94def683cb Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| | * Fix warning about non-void function with no returnThiago Macieira2013-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remotelinuxruncontrolfactory.cpp(124): warning #1011: missing return statement at end of non-void function "RemoteLinux::Internal::RemoteLinuxRunControlFactory::create" Technically, the function doesn't reach there, but ICC 14 doesn't know about it. Change-Id: Id55f6f33ff7c0eb97dba9af99bf0d34a9c01e191 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| | * Qnx: Update target list after Environment Setup WizardEl Mehdi Fekari2013-12-055-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-10795 Change-Id: Ia158370a00762190fa4b209e27c52c2ef32e5819 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| | * Resolve links and normalize file names when opening editors again.Eike Ziller2013-12-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the check if a certain editor is already open. Broke with 8c2e3fd2cbaeb1178ae3991de794ee6d74c84d85. Task-number: QTCREATORBUG-10836 Task-number: QTCREATORBUG-10945 Task-number: QTCREATORBUG-10994 Change-Id: Id1b20cd935986306f85a659f19dff52f2ee38052 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
| | * Debugger: Do not test the hash seed value in dumper test.David Schulz2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | On Windows the hash seed is initialized before the main is entered. Change-Id: If7d2fd6ac1d15e704a6fc984c2d3218a5facdd5c Reviewed-by: hjk <hjk121@nokiamail.com>
| * | Add icons in TaskPetar Perisin2013-12-096-23/+26
| | | | | | | | | | | | | | | Change-Id: I6c96cb90cd22c9ece225bc99470068a9168dabe4 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | Git: Enable choosing non-fast-forward mergeOrgad Shaneh2013-12-093-5/+34
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5972489d06637616953bd0d93a3b65c4d9918377 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
| * | Utils: Export execMenuAtWidgetOrgad Shaneh2013-12-095-33/+125
| | | | | | | | | | | | | | | | | | Change-Id: I77c89263746390a20dee90ff435db08f0e08f03e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * | EditorManager: Add command to reload current filePetar Perisin2013-12-091-3/+4
| | | | | | | | | | | | | | | | | | Change-Id: Ic6d246c27540689a68d338d7e62c3d85fd5236b4 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * | Fix abuse of QProcess::errorThiago Macieira2013-12-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's invalid to call it if no previous function returned an error. Don't rely on undefined behavior. Instead, simply check if waitForFinished() returned false, which is what this code intended to do anyway. Change-Id: I67903ba65e86ff1d1810481b2bd5724ab99a4b76 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
| * | BlackBerry: do not show invalid password messageRafael Roquetto2013-12-064-14/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show "Invalid password" dialog when the user has actually pressed "Cancel" upon prompting for the certificate password or csk password dialog, and make sure the "overwrite" dialog does not appear after a failed attempt to request a debug token. Change-Id: Id9aa78ab3517249df5bd3b4c2d1e0fd2032c3c0b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | BlackBerry: fix password prompt alignmentRafael Roquetto2013-12-065-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align certificate and csk password prompts according to their parents Task-number: QTCREATORBUG-10948 Change-Id: I139019b2a5a73f5082a434518c62be97c63574e8 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | BlackBerry: do not load certificate automaticallyRafael Roquetto2013-12-061-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent the certificate password dialog from appearing when the BlackBerryKeysWidget is shown(), only request the password and open the certificate when the user clicks "Open certificate" button. Task-number: QTCREATORBUG-10948 Change-Id: Ieb4f11735e726be892fbb3cf4e09afe1b9067b04 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | Git: Improve Push to Gerrit iconOrgad Shaneh2013-12-063-3/+2
| | | | | | | | | | | | | | | Change-Id: I5ee6d308409eef60a240b89bb10ef35e2d5f1f62 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * | Debugger: fix duplicated "," in response to locals + watch queryMartin Bohacek2013-12-061-1/+0
| | | | | | | | | | | | | | | Change-Id: I509f39a6423a572219d941f10ca429914ee61996 Reviewed-by: hjk <hjk121@nokiamail.com>
| * | ClearCase: Give warning if editing a Derived ObjectKnut Petter Svendsen2013-12-052-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Derived objects (DO) are created during builds with ClearCase build tools (e.g., clearmake). They are used for build avoidance and derived object sharing. DOs are typically object files, but can also be source code generated from code generation tools. It is probably never a good idea to edit such a file. Change-Id: If4248f09409424ee771aab720851bb6ce1aa40c9 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * | ClearCase: Handle Derived ObjectsKnut Petter Svendsen2013-12-052-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Derived Objects (DO) should not be checked in or out. Ideally they should not be edited at all, but in the case where a user by accident opens a DO and it is read only do not offer to vcsOpen() the file. Change-Id: I5aee9655ca8696c6d7291950946052261526c751 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * | ClearCase: Improved performance for indexing dynamic viewsKnut Petter Svendsen2013-12-054-49/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For dynamic views we only at initial sync/indexing check for checked out files. When a file is opened it will be reindexed if needed. The very time consuming recursive listing of all vobs is not needed as for snapshot views. Change-Id: I83d4ab70efdd311b6f3239ab45569c6d1810e10f Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * | ClearCase: Refactor and add testsKnut Petter Svendsen2013-12-055-67/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored code to make it more testable, and added tests. When running WITH_TESTS the TestCases will make the plugin fake ClearTool such that ClearTool is not needed to run the current tests. Change-Id: I49b50a667309cf337a07ef20dabb4801c680700d Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * | Git: Fix soft assertionOrgad Shaneh2013-12-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | First selectionChanged when dialog is opened always has empty index for previous. Change-Id: I024374f9e61fffae351f15af54f769ddf84ded75 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
| * | Git: Wait with stashing on interactive rebase until user approvesOrgad Shaneh2013-12-051-5/+3
| | | | | | | | | | | | | | | Change-Id: Ieb8d0cd0906cdf0ea7a37e60e92a263c359c7a41 Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
| * | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-0526-4686/+13959
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I49dca8a41519869f122a4dfdbd6564b357ddeb1e
| | * CppEditor: Visual hint for changed preprocessor directives.David Schulz2013-12-052-4/+14
| | | | | | | | | | | | | | | Change-Id: I3c3ae623beab55259179aaf0613d2bc5aaad1c28 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
| | * Fix build failureJan Kundrát2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStringList::join doesn't accept a QLatin1Char on my system. This fixes a build regression introduced in commit fccffba04bbac0439583272b1c73151e9a00b0c6. Change-Id: I98d8339032cb5ea315e09860aac3db91ab21d4c5 Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| | * QNX: Use correct command for running the SDK installerTobias Nätterlund2013-12-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on NDK version, the application used for the SDK installer is different. Without this, the installation of NDK's is not possible from within Qt Creator. Change-Id: I71ba67ccb05d30bcef5b63e7e397e545c5a89e3e Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Update french translationGuillaume Belz2013-12-041-3458/+8106
| | | | | | | | | | | | | | | | | | | | | | | | Also, converted non-breakable spaces into &nbsp;. Change-Id: I3cf7f3b1bc3a5bd90219ea5ffa794411d5c8bc85 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| | * Android: Fix restoring of MakeExtraSearchDirectoryDaniel Teske2013-12-041-6/+4
| | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-10983 Change-Id: I73dbc3e5279db8d85954d15411b68c47a038bafb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| | * Polish Polish translationsJarek Kobus2013-12-041-17/+34
| | | | | | | | | | | | | | | | | | Change-Id: I55ac136b63e389f5c433a401067dd2ea477632d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
| | * ios: cleaner kill of subprocess of iostoolhandlerFawzi Mohamed2013-12-042-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try to first terminate (sig TERM) the tool before killing it (this ensures a cleaner shutdown of the connection to the device). Task-number: QTCREATORBUG-10922 Change-Id: Ib39fbd1d35a651cdb51364532bdef5b69cb1347e Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| | * ios: fixing DYLD_FALLBACK_FRAMEWORK_PATHFawzi Mohamed2013-12-041-5/+8
| | | | | | | | | | | | | | | | | | | | | adding /System/Library/Frameworks for completeness Change-Id: If2fbe015af591eb3ff820b2ea2f732b2d4c08e01 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| | * ios: wait 5s after sucessful deployFawzi Mohamed2013-12-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ios 7.0.4 with xcode 5.0.2 seem to need a bit of time after installation before running, otherwise the device might be locked up. Task-number:QTCREATORBUG-10922s Change-Id: I4d35d0c3b21407db7d0aa5f629d3fa51117d4ddd Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| | * Debugger: Reset engine type and ABI for non-existing commandsTobias Hunger2013-12-041-0/+3
| | | | | | | | | | | | | | | Change-Id: I53bdb26ea4e48d59b4623076da9cdb4ff499c3e1 Reviewed-by: hjk <hjk121@nokiamail.com>
| | * Debugger: Do not lose the engine type in the debuggeritemmodelTobias Hunger2013-12-042-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Have the DebuggerItemConfigWidget remember the engine type (even though it does not display it), so that it can write that information back into the model later. Change-Id: I1ed0d6a8d3750696a7eb5c453179acc282b78ce4 Reviewed-by: hjk <hjk121@nokiamail.com>
| | * Debugger: Do not warn SOFT_ASSERT when no debugger is selectedTobias Hunger2013-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Do not not try to update the debugger if none is actually set. This avoids triggering a SOFT_ASSERT in the debuggeritemmodel. Change-Id: I646e251f58d6e25f1a88bddc142d953f94522084 Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status