aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
Commit message (Collapse)AuthorAgeFilesLines
* Re-fix QtCore resource path changing and prepare for Qt 5.134.9Thiago Macieira2019-07-161-26/+19
| | | | | | | | | | | | | | | | | | | Commit 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 added the #ifdef, but that of course only works if you don't upgrade Qt compared to what Qt Creator was compiled with. Instead, attempt both paths and only do that if the system copy is not found. Searching the system copy is required to address Qt 5.13's configure option -no-mimetype-database (used by Linux distributions because the system copy is always present). This code will still need work to deal with Qt 5.14 changes. Task-number: QTCREATORBUG-19600 Task-number: QTCREATORBUG-22636 Change-Id: I6aed4df6a12e43c3ac8efffd15ac952a6e9d4770 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* SSH: Add missing return statementChristian Kandeler2019-06-051-1/+3
| | | | | Change-Id: Ic109b0b5a022ea462532fbf21736ee7124168608 Reviewed-by: hjk <hjk@qt.io>
* LSP: remove incorrect soft assertsDavid Schulz2019-05-093-18/+29
| | | | | | | | Remove or replace soft asserts that can be triggered by the language server with categorized debug messages. Change-Id: I07caeeee7ca57d5195a0a7479a4959b579c8d208 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* SSH: Shorten the temporary directory even moreChristian Kandeler2019-04-301-4/+2
| | | | | | | | | | Creating a sub-directory of Creator's master temp dir makes the socket path too long on macOS, so use a normal QTemporaryDir. Fixes: QTCREATORBUG-21748 Change-Id: I4992e43032838e6f625162cd40ae101d21c62fdc Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SSH: Fix upload of symbolic linksChristian Kandeler2019-04-231-1/+5
| | | | | | | | | | This was broken in d7178b88c4. Fixes: QTCREATORBUG-22307 Change-Id: I75eef7767acd15d0a3cbef50ebe72ebf6987e8bb Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* SyntaxHighlighting: Add modelines dependencyDavid Schulz2019-04-231-0/+197
| | | | | Change-Id: I33a70d7e0ed18a8068548a9b3648331b40f84e55 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Tracing: Update selection range when timeline width changesUlf Hermann2019-04-101-13/+15
| | | | | | | | The viewTimePerPixel needs to be adapted then. Change-Id: Ie057c780cc75099f1b9df18c79c5e133411ef8e6 Fixes: QTCREATORBUG-22094 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Debugger: Re-organize dock widget persistinghjk2019-04-052-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like the mainwindow cannot be convinced to handle multiple sets of dockwidgets. So switch back to a single set containing everything and keep track of non-default visibility in the perspectives, and persist these sets. The following pass: 1. Start Creator with new settings Goto Debug Mode Move Break dock widget to right, switch on Global log widget Leave Creator Start Creator Goto Debug Mode Check: Debugger Selected, Break on right, Global log visible 2. Start Creator with new settings Goto Debug Mode Move Break dock widget to right, switch on Global log widget Switch to QmlProfiler sub-perspective Leave Creator Start Creator Goto Debug Mode Check QmlProfiler selected Switch to Debugger sub-perspective Check: Debugger Selected, Break on right, Global log visible 3. Start Creator with new settings Use any C++ test project Start debugging / stop at main() (F10) Wait for stop Switch to Edit mode Switch back to Debug mode Check: Only "running" debugger dock widget layout present (not the normal + preset at the same time) Quit Qt Creator while this debugger is running Check: Shuts down without crash 4. Use any C++ test project Start debugging Switch to Debugger Preset perspective Start a second debugger Kill either instance Check: Application dies, Debugger Preset perspective gets displayed Switch to perspective of second instance Check: Perspective looks ok (docks visible as before) Task-number: QTCREATORBUG-21083 Task-number: QTCREATORBUG-21669 Task-number: QTCREATORBUG-21668 Task-number: QTCREATORBUG-21813 Task-number: QTCREATORBUG-21851 Task-number: QTCREATORBUG-22110 Task-number: QTCREATORBUG-22169 Task-number: QTCREATORBUG-22189 Change-Id: Ic9eb41ff7699ac0f48a85e68376daa80b2b6847e Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlJS: Fix code re-formatter for arraysThomas Hartmann2019-04-031-3/+2
| | | | | | Task-number: QTCREATORBUG-22026 Change-Id: Iae9e53b149ebfbbe904fc1aef8408b1f6f852a13 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlJS: re-enable revision parsingTim Jenssen2019-04-031-1/+1
| | | | | | | | | | Looks like it was unintentional disabled when the QML parser was updated. Task-number: QTCREATORBUG-22057 Change-Id: I670882b78e0e421447e7f7b463c51f3568e7c2a2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* TreeView: Fix mapping to source models in case ProxyModels are involvedhjk2019-04-022-1/+26
| | | | | | | Visible e.g. in context menu handling of the debugger's module view. Change-Id: I342ed262c9e3dcdf98590003a7930cb8ef4ca0d2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* OutputFormatter: Fix behavior of text with different format after \rOrgad Shaneh2019-04-011-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | For example, git rebase for outdated Git versions has: stdout: Rebasing (1/2)\r stdout: Rebasing (2/2)\r stderr: Successfully rebased and updated refs/heads/master.\n The stderr is supposed to overwrite the Rebasing line. Without redirections, this is what you get on the terminal. Conform to that by deleting a line that ends with \r even if the next output has different format. The only exception is when the following *starts with* \n. On this case, it will behave as \r\n, meaning it will *not* overwrite the previous line, and will continue on the next line. This amends commit 79cfb784be49633fbdafd5fe5b4a3011c5c064ae. Fixes: QTCREATORBUG-22179 Change-Id: I4208008095f3e186aa9b4cee99fa5cd807ffdbcb Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Clang: Improve project part updatingMarco Bubke2019-04-0120-116/+879
| | | | | | | | | | | | The project part ids are now already created very early in the database. This removes some checks because we can assume that an id already exists. The project part are now completely persistent, so we can read them from the database and compare them with new generated from a new creator session. This should help to not recreate the same PCH again and again. Task-number: QTCREATORBUG-21151 Change-Id: Iced818ff9f7431eaed3e37978087cc0a43b9afda Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Clang: Do not show completions after comma in initializer listIvan Donchevskii2019-03-121-1/+1
| | | | | | | | | | Appends 0852f889d1. Do not automatically show global completion when initializer list does not have a type, e.g. auto foo = {{},<cursor>}; Change-Id: I233fef71c60bb79211000df70bf5b04fa2d9df37 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-03-111-2/+2
|\ | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljscheck.cpp Change-Id: Ib3d97e8e59463185e2fa4663ae594c1e29b4b337
| * qmljs: Fix variable nameKai Koehne2019-03-071-2/+2
| | | | | | | | | | Change-Id: I8ea8d18e0471071f3a7a22760c041ecf77dbbe8c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | SSH: Fix error messageRobert Loehning2019-03-071-1/+1
| | | | | | | | | | | | | | | | A binary cannot crash. When executing the binary, a process is created which can crash. Change-Id: I0dc3d41c84b55fefda7e98353390b49bb51a288f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Utils: Use proper pluralRobert Loehning2019-03-071-2/+2
| | | | | | | | | | | | Change-Id: Ia1b596aa373fdc5629a1d164b7df63992f1f3dc8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | ClangFormat: Fix UTF-16 line and column for 0 offsetIvan Donchevskii2019-03-061-2/+5
| | | | | | | | | | Change-Id: I348a32d623da1c2da7f3e7f18cad8c9c06dc7b06 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Clang: Disable warnings in CommandLineBuilderMarco Bubke2019-03-061-0/+3
| | | | | | | | | | Change-Id: I7597d57a0bb97facefb08c9c1bbe6e909c146080 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Don't filter source with missing includesMarco Bubke2019-03-061-0/+1
| | | | | | | | | | | | | | | | We do now tag and save them. So we can reliably track them. Task-number: QTCREATORBUG-22035 Change-Id: I49aaeeb76150b7e2d77b863eeb0aedefc9ab50f4 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Improve dependency buildingMarco Bubke2019-03-061-3/+4
| | | | | | | | | | | | | | | | | | We want to use the cached values in the database because it is faster than to parse the the files again. Task-number: QTCREATORBUG-22035 Change-Id: I7ada7073887b1d89a06332fdb617701cb69ccd68 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Utils: fix memory leak in normalizePathName on windowsDavid Schulz2019-03-061-3/+4
| | | | | | | | | | | | | | | | The PIDLIST_ABSOLUTE item returned by SHParseDisplayName has to be freed again by ILFree according to the documentation of ITEMIDLIST structure. Change-Id: I29eb7576600287cdc8380e81a83ce2af79e13e33 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | TextEditor: Allow using KSyntaxHighlighting from systemChristian Stenger2019-03-051-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set KSYNTAXHIGHLIGHTING_LIB_DIR to the directory that contains the KSyntaxHighlighting library file (e.g. libKF5SyntaxHighlighting.{dll,dylib,so}). This will use the respective files from there and its related include files instead of the files provided by QC. If deducing the include directory depending on the library does not work you can additionally specify KSYNTAXHIGHLIGHTING_INCLUDE_DIR as well. Both variables can be set either as qmake variable or environment variable. Task-number: QTCREATORBUG-21980 Change-Id: Ie021489d930dfc46ad3e37f9fa02d09fa146ac87 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Sqlite: Use exclusive lock for table initializationMarco Bubke2019-03-041-1/+1
| | | | | | | | | | | | | | We cannot change tables if other connections access the database. Change-Id: I1915ab491952d9684cb9839957c84c8f7a15c308 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Share executeInLoopMarco Bubke2019-03-042-0/+73
| | | | | | | | | | Change-Id: Id02902e1e7abdb8b3430e7b228547c4372a424ce Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | SyntaxHighlighter: Update to latest masterChristian Stenger2019-03-042-0/+2
| | | | | | | | | | | | | | Adapt the respective include inside the TextEditor. Change-Id: Ie3cb17f1b0e3c0639840bc135156edd354a0aeda Reviewed-by: David Schulz <david.schulz@qt.io>
* | SSH: Fix UI textLeena Miettinen2019-03-041-1/+1
| | | | | | | | | | Change-Id: Iabd0a3278ac2f241b8880f41d0cfad729cdea1fd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Merge remote-tracking branch 'origin/4.8' into 4.9Eike Ziller2019-02-281-6/+8
|\| | | | | | | | | | | | | Conflicts: src/plugins/android/androidbuildapkstep.cpp Change-Id: Id6dfda480c23706089ab38aa6277cd37599b5167
| * C++: Fix nullptr references in preprocessorNikolai Kosjar2019-02-141-6/+8
| | | | | | | | | | | | Fixes: QTCREATORBUG-21981 Change-Id: Iaded998eb793fb4284a9f8b22b2fa7a7443a1585 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * Fix warningThomas Hartmann2019-01-181-1/+1
| | | | | | | | | | Change-Id: I646cf0d1c1e7dec7f44baf50a586ff22044cb7f0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangPchManager: Show extra progress for dependency buildingMarco Bubke2019-02-222-12/+10
| | | | | | | | | | | | Task-number: QTCREATORBUG-21956 Change-Id: Id244c9ef9fc7825489daa143b21fcca78164d8c7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Fix progress barMarco Bubke2019-02-2220-88/+142
| | | | | | | | | | | | | | | | Sometimes the messages are not send immediately, so we force it. Task-number: QTCREATORBUG-21957 Change-Id: I9526cb4b4e3dd8b7a02e15f77bffdc51917d47c8 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | ClangFormat: Refactor codeIvan Donchevskii2019-02-202-0/+26
| | | | | | | | | | | | | | Reorder some functions, remove code duplication. Change-Id: I33e118e567dee7db622bbc99e6a7c500db54e5c5 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Observe the cration of extra compilerMarco Bubke2019-02-181-2/+2
| | | | | | | | | | | | | | | | We link into the extra compiler factory and notify the PchManager for every extra compiler creation. It enables to monitor if all extra compiler finished. Change-Id: If8da386c88909abd2e0e651e4336865c9dc5bf34 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Clang: Disable min and max macrosMarco Bubke2019-02-181-1/+4
| | | | | | | | | | Change-Id: I75f930053ca514dbd32366c628e7e4916ba8550a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Help: Add fallback word lookup for context help to base text editorEike Ziller2019-02-152-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | If we do not have a hover handler, or that did not produce any result, use the word under cursor and try with that. This adds at least some help fallback mechanism to all text editors, e.g. we get some context help (though a bit crude) for Pyside "for free". Change-Id: I1b6d91ad6f46bfd12e242b1aec9f4fcadae23403 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Squish: Fix verification of tool tipsChristian Stenger2019-02-141-0/+1
| | | | | | | | | | Change-Id: I12487c784cf784ca7ddf705895c99f0ed912b0f4 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* | Clang: Fix command line builderMarco Bubke2019-02-141-3/+4
| | | | | | | | | | | | | | Add "-nostdinc++" only for C++. Change-Id: I21228fca80045b040877328f41ca0edb4f227fcc Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Syntax highlighting: Add patches for KSyntaxHighlighting adaptationAlessandro Portale2019-02-136-0/+5082
| | | | | | | | | | | | | | | | | | | | | | | | The patches which lead from "syntax-highlighting"'s SHA e07306d9c22f6426d6b50287eee532555d74ac75 to the current state in qtcreator's repo This is useful to document what changed, and to ease further code merges from "syntax-highlighting". Change-Id: I4be45d12aa4237558b6e381a70947326829e79cb Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang: Fix command line builderMarco Bubke2019-02-121-2/+2
| | | | | | | | | | | | | | Clang does not support c18, so we use c17 Change-Id: I272461cf70aa3d620900f76437cf4745f2a0e26c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | ClangRefactoring: Fix progress counterMarco Bubke2019-02-121-9/+23
| | | | | | | | | | | | | | | | We use threads now and the code had to be adapted. Task-number: QTCREATORBUG-21950 Change-Id: Ie96c5bea1fa045588d0c5a8b18bfd1ccb5d9fdd9 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | LSP: collect and execute quick fixes via shortcutDavid Schulz2019-02-122-3/+24
| | | | | | | | | | | | Fixes: QTCREATORBUG-21802 Change-Id: I611fac1c3fc5b094816441e36492ed57706c98b8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Utils: Add a JsonTreeItemDavid Schulz2019-02-124-2/+162
| | | | | | | | | | | | | | | | | | JsonTreeItem is used to visualize json values in tree views. It will automatically generate new child items if the value contains an object or array. Change-Id: I316ea9f626050c21c05cbfc0628d0a5e20ad5a49 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Clang: Extend ClangTool and CommandLineBuilderIvan Donchevskii2019-02-111-8/+12
| | | | | | | | | | | | | | | | We now support source file and not only header files and the file path is now automatically added to the end. This removes quite some clutter. Change-Id: I74eabd262e6c7e5f4d523e3a3cd194bd3efe1ef3 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Fix some deprecation warnings in basic pluginsFriedemann Kleint2019-02-118-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings apppearing in 5.13, for example: warning: ‘QDir& QDir::operator=(const QString&)’ is deprecated: Use QDir::setPath() instead [-Wdeprecated-declarations] ... warning: ‘static QRgb QColorDialog::getRgba(QRgb, bool*, QWidget*)’ is deprecated: Use getColor() [-Wdeprecated-declarations] warning: ‘Qt::DropAction QDrag::start(Qt::DropActions)’ is deprecated: Use QDrag::exec() instead [-Wdeprecated-declarations] warning: ‘void QProcess::finished(int)’ is deprecated: Use QProcess::finished(int, QProcess::ExitStatus) instead [-Wdeprecated-declarations] ... warning: ‘const QRect QDesktopWidget::availableGeometry(int) const’ is deprecated: Use QGuiApplication::screens() [-Wdeprecated-declarations] ... warning: ‘const QBrush& QPalette::background() const’ is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] ... warning: ‘const QBrush& QPalette::foreground() const’ is deprecated: Use QPalette::windowText() instead [-Wdeprecated-declarations] ... warning: ‘void QTextOption::setTabStop(qreal)’ is deprecated [-Wdeprecated-declarations] warning: ‘void QList<T>::swap(int, int) [with T = ProjectExplorer::BuildStep*]’ is deprecated: Use QList<T>::swapItemsAt() [-Wdeprecated-declarations] warning: ‘void QProcess::setReadChannelMode(QProcess::ProcessChannelMode)’ is deprecated: Use QProcess::setProcessChannelMode() instead [-Wdeprecated-declarations] ... warning: ‘QString QFileInfo::readLink() const’ is deprecated: Use QFileInfo::symLinkTarget() instead [-Wdeprecated-declarations] Change-Id: I1d893d42d372245892f2de8406f52dbe7bbd552a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | LSP: Avoid unneeded copy inside loopChristian Stenger2019-02-081-1/+1
| | | | | | | | | | Change-Id: I7c4d61eda6caf0baacdde01392e2457d54286863 Reviewed-by: David Schulz <david.schulz@qt.io>
* | LSP: Fix buildChristian Kandeler2019-02-081-1/+3
| | | | | | | | | | Change-Id: Ic43ce5e2f55dc450fb0a4628dc5de22a4a6f3dbd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | AutoTest: Use TypedTreeItem for TestResultItemChristian Stenger2019-02-081-0/+5
| | | | | | | | | | | | | | | | Simplifies code and reduces (visible) static_casts on the auto test plugin's side. Change-Id: I31ae3e4f1a32d3e74527ccb36080944848f3b1fa Reviewed-by: David Schulz <david.schulz@qt.io>
* | Make deployqt target recursiveEike Ziller2019-02-071-0/+2
| | | | | | | | | | | | | | So perfparser's deploy target is triggered too Change-Id: I131a23b46127130967767fd7fee629ac5a97b17a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>