summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Call refresh before checking the splitter sizes.Lincoln Ramsay2013-07-021-0/+1
| | | | | | | | | | If we don't do this, we miss the "current" size when an output pane has just been shown (it comes out as 0) and we resize it to the minimum size. Task-number: QTCREATORBUG-8877 Change-Id: I8b1cc19d116dde6edcf8770bb36d1598dfdce195 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmljs: coalesce resets of code model triggered by cpp files updateFawzi Mohamed2013-07-022-1/+13
| | | | | | | | | Use a timer to avoid resetting the model too often. Change-Id: Iadf3ff3f03cfc91df44168243972b1e5a0ee5077 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* C++: Fix resolving ui_* files in CppPreprocessorNikolai Kosjar2013-07-024-2/+56
| | | | | | | | | | | | | The working copy contains the artificial ui_* files and therefore we have to consider it while resolving include files. Task-number: QTCREATORBUG-9683 Change-Id: Icb3387b4cd885b3652bae3f1da465d3e0f633332 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* QmlDesigner.PropertyEditor: extend lookup rules for extensionsThomas Hartmann2013-07-021-0/+6
| | | | | | | | | | | | | | | | | If specifics for pane .qml files are located inside the plugin in the designer sudirectory, we still required the path to be fully qualified. e.g. myComponnents/designer/myComponent/MySpecifics.qml This is unconvinient and also a behaivour change for pure directory imports. Pure directory imports were not fully qualified until recently. With this patch we also allow: myComponnents/designer/MySpecifics.qml Change-Id: I9a61016f425caf5d7d15140554c72f4a69a6687a Reviewed-by: Marco Bubke <marco.bubke@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* CDB: fix breakpoint location in catch clauses.Erik Verbruggen2013-07-021-0/+1
| | | | | | | | | | Task-number: QTCREATORBUG-7336 Change-Id: I926e82499325e4fe38e25cc7a6158050f7fc0e82 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Qt4Project: Do not trigger updateCodeModels on folderChangedDaniel Teske2013-07-023-10/+80
| | | | | | | | | | | | | | | | This reverts commit 2fdb70bdce77ec0b60847623579af72ddc58da91. Be smarter about what to do on folder changes. Trigger at most one codemodel update per folder change signal. (Thus still fixing the original problem 2fdb70b fixed.) And only trigger one if the actual file list changes. This could be further optimized to only tell the code model about the new files, but that's for another patch. Task-number: QTCREATORBUG-9697 Change-Id: I78d134663f1455254caf812c27c048d4f0828242 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix translation context of "Attach to process".Friedemann Kleint2013-07-021-1/+1
| | | | | | Task-number: QTCREATORBUG-9712 Change-Id: Ib46e4c91a520044bfa9fb717edecee167b68076e Reviewed-by: hjk <hjk121@nokiamail.com>
* Git: Add some null protectionsOrgad Shaneh2013-07-021-2/+7
| | | | | Change-Id: Ia28c70690c6f79499fb8075935ec123b763bcc01 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* DiffEditor: Show tags and branches in Show paneOrgad Shaneh2013-07-011-1/+2
| | | | | Change-Id: I39be7c3fb9b57b133c4da3639813527aa280ae33 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Move static strings out of GitClient classOrgad Shaneh2013-07-012-9/+4
| | | | | | | They're only used in gitclient.cpp, define them there Change-Id: I601f23a6f2a8e533127d2ed068526815e1b9717d Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Make QImage dumper work with release versionshjk2013-07-012-6/+16
| | | | | | | | | This accidentally also allows non-debug Qt users to reproduce the http://blog.qt.digia.com/blog/2010/04/22/peek-and-poke-vol-3/ smiley drawing. Change-Id: Ica436f55494d012d5516ef9d00d6310f2ac2d4ee Reviewed-by: hjk <hjk121@nokiamail.com>
* DiffEditor: double click doesn't select the current wordjkobus2013-07-011-0/+2
| | | | | | | Task-number: QTCREATORBUG-9381 Change-Id: Icc96c31b029d978c23a44fca59bcc28891fd92c6 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Git: Diff current file against indexOrgad Shaneh2013-07-011-6/+6
| | | | | | | Task-number: QTCREATORBUG-9663 Change-Id: I18b4ec5577bf0114075141583c938eaa02d5eded Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Git: Support commit.template under ~Orgad Shaneh2013-07-011-2/+5
| | | | | | | Task-number: QTCREATORBUG-9530 Change-Id: I21ee4202aa750a9d4d89f05d51af7c63489eb6c3 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* SettingsAccessor: Fix empty environmentId handlingOrgad Shaneh2013-07-011-3/+3
| | | | | | | | * Empty environment should be ignored when comparing to current one * Fixes superfluous warning when opening a .user file without environmentId Change-Id: Iaf3f71eb2dd2a2a10faa1f6f9fe9e9154fe1ab1f Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Git: Add a soft assertionOrgad Shaneh2013-07-011-0/+1
| | | | | | | | | | | If directory is empty, buttons remains NULL, which leads to a crash To reproduce, open Branches dialog then close all editors and projects and click Log for a branch Change-Id: Icf06b76c58585c0dd6062017e94e07dad016c275 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Perforce: Support "+++ filename<tab>" for diffOrgad Shaneh2013-07-011-1/+3
| | | | | | Task-number: QTCREATORBUG-7136 Change-Id: I2c163356c06cdc46e39bf93989b9d56f598c0890 Reviewed-by: hjk <hjk121@nokiamail.com>
* Don't accept a column/line number selection just because of ":"Thiago Macieira2013-07-011-3/+6
| | | | | | | | | | | | | | | | | | If you had typed "filename.cpp:142" in the Locator field, Creator would offer "Column 142" the first option. At the very least, that's confusing because the user intended to select line 142, not column -- for a while I thought someone had typed the wrong word in the source code. But even worse, this selection was the first entry, so instead of jumping to filename.cpp on line 142, the user ended up still on the same file and line, but on a different column. Instead, simply validate that the parts before and after the colon are actually numbers. Change-Id: I1f1fbd33d702ae26c41fd2485aa99fae800e1410 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Cdbext: Fix QMap dumper for Qt5...David Schulz2013-07-011-4/+6
| | | | | | | | | | ... when the symbol was added as an expression. It seems that calling GetSymbolTypeName somehow destroys the red-black tree, so moved the call before creating the tree. Change-Id: Iefb187df4e7f99cfd95195a6ac9a4d8c64fa2365 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* CppTools: Fix snapshot in case another project is openedNikolai Kosjar2013-06-283-6/+97
| | | | | | | | | | | When a second project was opened the snapshot was reset. That resulted in all kinds of problems since from then on the code model effectively was not aware of the files of the first project. The regression was introduced by commit a0d6df7b. Change-Id: I1ccc9de68177205b49a4ba8ead2bc8abe4592b32 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix building from MSYS shellRay Donnelly2013-06-281-1/+1
| | | | | | | | | In debugger.pro, take path that checks and sets QMAKE_CHK_EXISTS_GLUE if QMAKE_SH isn't empty. Change-Id: I7c37acc5867c1ac3ab6da33db3eb2479c1d4213c Reviewed-by: Alexey Pavlov <alexey.pawlow@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Remove workaround for qbs bug.Christian Kandeler2013-06-271-1/+0
| | | | | | | It's been fixed. Change-Id: I49f3dc193752c2796548b5f49eb4e66824125b71 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update qbs submodule to version 1.0.1.Christian Kandeler2013-06-271-0/+0
| | | | | Change-Id: Ic5f6968736c6d465700baf2afeb388efc90ac1ab Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QmlDesigner: export NodeAbstractPropertyThomas Hartmann2013-06-271-1/+1
| | | | | | Change-Id: Ib34a474344d3077096c9775d1c5b99f59ae3e4fa Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Fix buildv2.8.0-rcEike Ziller2013-06-271-1/+1
| | | | | Change-Id: I18dc32ca33f9ac50a3fc8411d075f16474d54f16 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* FileName: Support "~ -> homePath" substitutionOrgad Shaneh2013-06-271-1/+4
| | | | | | Change-Id: Ie1ca69582cfd8893b0616e51d2d5c1b13e987b69 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Adapt Qbs profile generation to recent changes in QbsEike Ziller2013-06-261-5/+15
| | | | | | | | * targetOS for mac is "osx" * targetOS and toolchain are lists Change-Id: I53d6c0d3669570c5c35f42a358727128d4d9d827 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs files: fix OS X checksJoerg Bornemann2013-06-269-13/+13
| | | | | | | Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-06-263-3/+6
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/libs/cplusplus/LookupContext.cpp src/plugins/plugins.pro src/plugins/qnx/Qnx.pluginspec.in src/plugins/qnx/qnx_dependencies.pri Change-Id: I6c406c2503845b08c4852db99c64491a325629c7
| * QmlProfiler: Avoid idle engine cancelling other engine's processKai Koehne2013-06-261-0/+4
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9643 Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * Qnx: add a dependency to the debugger pluginEl Mehdi Fekari2013-06-253-0/+3
| | | | | | | | | | | | | | | | | | This is already done in Master and 2.8 branches. Task-number: QTCREATORBUG-9455 Change-Id: I8ae9e5a14ba561640d3389e08cb74a5ec856d335 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * Qnx: Fix tag for splashscreensEl Mehdi Fekari2013-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9626 Task-number: QTCREATORBUG-9083 Cherry-picked: 4ff03aa71a7122d4573d4dc270a0847818842054 Change-Id: I69915d9da91cde39b1bc32f150c30a5e97cba157 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| * process_stub_unix: fix race condition with reading of env fileFawzi Mohamed2013-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | The stub incorrectly send its pid before reading the environment file, and qtcreator does interpret that as sign that it can delete the environment file. Task-number: QTCREATORBUG-9024 Change-Id: Id44777abdfdd94aa10815cb00ca27846b95a3ec7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * C++: Handle recursive using/typedef declarationsNikolai Kosjar2013-06-254-4/+155
| | | | | | | | | | | | | | | | | | Remember using/typedef declarations we have already looked up and stop if we try it again. Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> (cherry picked from commit 50a900e509be2e1f448f29be126ba3b7f8173901)
| * C++: Handle recursive auto declarationsNikolai Kosjar2013-06-256-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | Remember auto declarations we have already looked up and stop if we try it again. Task-number: QTCREATORBUG-9503 Change-Id: I989b11609c98bf197ce916d79c9d452294355053 Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> (cherry picked from commit 8f1b6656677344e9ca4b6798ddd900725c478b16)
* | Fix possible crash when looking for version control for directoryEike Ziller2013-06-261-2/+2
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9656 Change-Id: If8babdb942830bd11fe360a311c57b75312248be Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | CrashHandler: Allow ptrace on current processOrgad Shaneh2013-06-261-0/+8
| | | | | | | | | | | | | | | | Required when ptrace_scope is set to 1 (default on recent debian and ubuntu) Change-Id: I47c4da5b5f01ae41b5a2b01cc3d35e4615d78288 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | Android: Set ANDROID_HOME environment variableDaniel Teske2013-06-261-0/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-9424 Change-Id: Iba4a9663a8fa39160f1953366ae4aa64d5f586ea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | CrashHandler: Use exec variants that search in pathOrgad Shaneh2013-06-261-2/+2
| | | | | | | | | | | | | | Executable can be non-absolute Change-Id: Ibb0a4385ef0d763fe2aae2c8ac0b205328a64870 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* | CppEditor: Fix "Rename Symbol Under Cursor" in new splitNikolai Kosjar2013-06-262-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The slot CPPEditorWidget::onContentsChanged() was still connected to the initial QTextDocument of BaseTextEditorWidgetPrivate and not to the via BaseTextEditorWidget::duplicateFrom() updated QTextDocument. This fixes the visual appearance when renaming. The actual renaming is/was not affected. Task-number: QTCREATORBUG-9651 Change-Id: Id26dc11627c253bbf89904be3f3df21a45041d01 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Workaround QCompleter issue with closing its popup on escapeEike Ziller2013-06-264-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | QCompleter doesn't close its popup if there's a application wide 'escape' shortcut. This commit adds the necessary shortcut overrides for CompletingTextEdit and FancyLineEdit, which fixes the issue at least for find tool bar, advanced search, gerrit dialog and description field of submit editor. Task-number: QTCREATORBUG-9453 Change-Id: Ib1df218ab6b9a54fbf19d6132c6edd8e83ace46c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlDesigner.PropertyEditor: use proper transforms for anchorsThomas Hartmann2013-06-251-2/+5
| | | | | | | | | | Change-Id: I71866481b6d7e9ae42d5f9c90e6006fde5767511 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Revert "QmlDesigner.NodeInstanceView: introducing delay in setPathToQt()"Marco Bubke2013-06-252-32/+3
| | | | | | | | | | | | | | | | This reverts commit 94011a12f1230719557105e6c5bd979e7e053a25. It was a hot fix which is not needed anymore. Change-Id: I64ad1d6be54982ddd9b0ef790508a15bd0f73f72 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Refactor qbs project files.Christian Kandeler2013-06-257-0/+229
| | | | | | | | | | | | | | | | | | | | | | | | - Use sub-projects. - Move the main application and the application header products into dedicated files. As a result, qtcreator.qbs becomes much simpler to understand, consisting now of just a bunch of global properties and a few sub-project references. Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | CppTools: "Switch Header/Source" checks also other projectsNikolai Kosjar2013-06-251-23/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | ...and not only the current one as fallback. E.g. if the projects qtcreator and qtbase are open and you navigate into qdir.h of your include path from the qtcreator project and trigger "Switch Header/Source", then "qdir.cpp" will be found in the qtbase source dir. Task-number: QTCREATORBUG-3789 Change-Id: Ibd73c37bb626f8f7ee80cd8be3ef1244883ccf5e Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Debugger: Set cdb extension version to 2.8David Schulz2013-06-251-1/+1
| | | | | | | | | | Change-Id: Idd62703c1c521cd2546beb11ae070c2a6de09066 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Adapt the escape key logic for external windows.Eike Ziller2013-06-253-44/+99
| | | | | | | | | | Change-Id: I294ba18e8ca91060e5d0ef8f81885642e045a975 Reviewed-by: David Schulz <david.schulz@digia.com>
* | Debugger: Add view menu to toolbarhjk2013-06-253-0/+22
| | | | | | | | | | Change-Id: I8783ce66d28626e9a484d6aa729fccd07bbda0b8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Workaround for Clang generating wrong debug infoEike Ziller2013-06-252-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang obviously takes PWD as a basis for source paths in debug information (AT_comp_dir) if it is set. Since the build tools are not executed in a shell that would set PWD to a sensible value, debug information with Clang is broken if the build environment got a wrong PWD to start with, for example by starting Qt Creator from a shell (which sets PWD). Workaround is to explicitly unset PWD for the build environment used for the Clang tool chain. Task-number: QTCREATORBUG-8825 Change-Id: Ia3e47693121edd61b0ea43bddbb1fcaaac9eb390 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Fix escape key for "About Qt Creator"Eike Ziller2013-06-252-0/+20
| | | | | | | | | | Change-Id: I15c49541a6914c8db58784935de43f0b046895b0 Reviewed-by: Robert Loehning <robert.loehning@digia.com>
View Lorry Controller Status