aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.9' into 4.10v4.10.0-beta2Eike Ziller2019-06-262-3/+59
|\ | | | | | | Change-Id: I53ceb69b1558520e7d7b6db8b7ebdd5c1590e991
| * Add changes file for 4.9.2v4.9.2Eike Ziller2019-06-251-0/+56
| | | | | | | | | | Change-Id: Icce93b9daed51603093cf1efe8c904253984351b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Small fixes in French translationRobert Loehning2019-06-241-3/+3
| | | | | | | | | | | | Change-Id: I86816eb8e1d0f7b439532b9196aa28a8119e5234 Fixes: QTCREATORBUG-22613 Reviewed-by: Jocelyn Turcotte <turcotte.j@gmail.com>
* | ClangTools: Show hint when disabling "Build the project before analysis."Nikolai Kosjar2019-06-264-1/+31
| | | | | | | | | | | | | | | | | | Show also the same hint as a tooltip. Fixes: QTCREATORBUG-22382 Change-Id: If1b594994cea387d6727775ce4c28c21d51f2d86 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Fix std::basic_string printer with custom allocatorMichael Weghorn2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes expansion of 'std::basic_string' in the locals view when a custom allocator is used (which previously would result in "<not accessible>" being shown); for example, when expanding 's' at the breakpoint in the following example: #include <string> template<class T> class myallocator : public std::allocator<T> {}; int main() { std::basic_string<char, std::char_traits<char>, myallocator<char>> s("hello"); return 0; // break here and expand value of 's' in locals view } Change-Id: I0ca98de50d83a1f6e6f019acc37a1302a05fdba8 Reviewed-by: hjk <hjk@qt.io>
* | Fix std::vector<bool> printer with custom allocatorMichael Weghorn2019-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the std::vector<bool> pretty printer, which previously just showed "<not accessible>" for variable 'v' for the following sample code (with system GDB pretty printer disabled so that the custom pretty printers are used): #include <vector> template<class T> class myallocator : public std::allocator<T> { }; int main() { std::vector<bool, myallocator<bool>> v; v.push_back(true); return 0; // break here and check value of 'v' } Change-Id: Ia9883aa0b06a396cb3546ac2594a82c1b2062b80 Reviewed-by: hjk <hjk@qt.io>
* | gdbbridge: Convert children to gdb.ValueMichael Weghorn2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Dumper::fromNativeValue' expects an object of type 'gdb.Value'. However, the 'pretty_printer.children()' iterator may return values that first need to be converted to this, as documented for function 'pretty_printer.children' at [1]: > This method must return an object conforming to the Python iterator > protocol. Each item returned by the iterator must be a tuple holding two > elements. The first element is the “name” of the child; the second > element is the child’s value. The value can be any Python object which > is convertible to a GDB value. Therefore, explicitly convert the value to a GDB value first. This fixes the expansion of 'std::vector<bool>' when system GDB pretty printers are enabled which previously led to "<not accessible>" being shown e.g. for the following example (expand 'v' in the local variable view at the breakpoint): #include <vector> int main() { std::vector<bool> v; v.push_back(true); return 0; // insert breakpoint here } Side note: GCC's pretty printer for 'std::vector<bool>' previously returned either '0' or '1' for the element values, thus leading to the problem described above. With this patch in place, the elements are shown when the vector is expanded, but the shown type is 'long long' (since that's the type that GDB seems to automatically assign when constructing a 'gdb.Value' from these integers, at least with GDB 8.2.1 on amd64). This will work as expected ('bool' shown as type) from GCC commit [2] on ("Have std::vector printer's iterator return bool for vector<bool>"). [1] https://sourceware.org/gdb/onlinedocs/gdb/Pretty-Printing-API.html [2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6c7d761a3f5fd7d19795d1d4b9b027a04b3fe88b Change-Id: I9047affa5b4369befd2e2386c8a6b04c66c4b632 Reviewed-by: hjk <hjk@qt.io>
* | Squish: Update openCmakeProjectRobert Loehning2019-06-261-4/+4
| | | | | | | | | | Change-Id: I17f1a271eafbcff24987fbd7e31dc6cc8c789b84 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CppTools: Ignore -f[no-]keep-inline-dllexportNikolai Kosjar2019-06-261-1/+8
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-22452 Change-Id: Ic17e6331e92f23c31f4f7319257f2d09c66af8a4 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | CppEditor: Add another sanity check to ParseContextModelNikolai Kosjar2019-06-261-1/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-22596 Change-Id: I222656503477ea8dbd3b65801d1816b77baa7c39 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Squish: Fix tst_qml_localsChristian Stenger2019-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | The locals and expressions display nowadays an additional column which might be hidden. Use the right 'Value' column to fetch the values. Fixes: QTCREATORBUG-22617 Change-Id: I646b05eed607c5941f2713013221eb4c511d901b Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* | PerfProfiler: Connect the updateRunActions() signal earlierUlf Hermann2019-06-251-3/+3
| | | | | | | | | | | | | | | | | | The startup project can get enabled before we create the views. In that case we miss an update and the run button stays disabled. Fixes: QTCREATORBUG-22616 Change-Id: I5af9075a4899a5dd0e5f69c13348510cde47285d Reviewed-by: hjk <hjk@qt.io>
* | VCS: Do not use monospace font in output windowOrgad Shaneh2019-06-251-7/+0
| | | | | | | | | | Change-Id: Id022a55152880a999c6c6c81ca88f70abfa88b8b Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | LanguageServerProtocol: Fix compilation warningsCristian Adam2019-06-251-3/+2
| | | | | | | | | | | | | | Remove export macro from inline functions. Change-Id: Ifd3cedb88e8da1b043c81f99624556843671aab3 Reviewed-by: David Schulz <david.schulz@qt.io>
* | CppTools: Handle not only "-std=X" but also "--std=X"Nikolai Kosjar2019-06-251-1/+1
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-22444 Change-Id: Iedb0b17a26724d0cc8233a3bad273f3e6bd7462d Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Project Explorer: Fix UI textLeena Miettinen2019-06-256-15/+15
| | | | | | | | | | | | | | Use book-style capitalization for dialog and button labels. Change-Id: I2c074d83d6a95ad348daacabd561c758e0a493f8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | qmake Project Manager: Fix UI textLeena Miettinen2019-06-252-2/+2
| | | | | | | | | | Change-Id: I6048c952ca36d953d7667676435440615d756c45 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remote Linux: Use double quotes for emphasis in UI textLeena Miettinen2019-06-251-2/+2
| | | | | | | | | | Change-Id: I2195cfe93d3ca77e8ba4d33f73164680ec17c066 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Squish: Update GuiAppWizardDialogRobert Loehning2019-06-253-18/+15
| | | | | | | | | | Change-Id: Icdcab66e4d3a231286607a32ba8ce66d47741442 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Squish: Update message box "changed on disk"Robert Loehning2019-06-251-1/+2
| | | | | | | | | | Change-Id: I53149a67e3072a0466ccbb80c55bf9f76b33cb2a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ClangTools: Hint to "Build the project before starting" optionNikolai Kosjar2019-06-251-0/+10
| | | | | | | | | | | | | | | | | | ...if the analysis ends with errors. Task-number: QTCREATORBUG-22382 Change-Id: I59f99947e80f7f4d0e2cac4df2e00f68e385ee01 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | AutoTest: Limit condition for test execution to LinuxChristian Stenger2019-06-251-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | gcc and clang are handling builtin include paths differently. On Linux the default should be gcc - which works fine even if boost is installed in /usr/local. On macOS clang is default which does have the correct builtin include paths only for Qbs but we are testing on qmake as well. So, expect the BOOST_INCLUDE_DIR set on macOS if we want to have this test executed. Change-Id: Ib9ad697b59bfad5413ad984c9b969ec8b174ae9a Reviewed-by: David Schulz <david.schulz@qt.io>
* | LanguageClient: Fix file path filter handlingChristian Stenger2019-06-251-4/+4
| | | | | | | | | | | | | | | | | | | | Avoid sending files to a language server without a file path, like temporary generated files. Only allow this if the file matches the MIME type of the language server. Change-Id: Ibf71a7196c387a2c8bf345db24c0005ba8fbdfb1 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Unittest: Silence most of the warnings on WindowsChristian Stenger2019-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | There are lots of warnings coming from including or linking against LLVM which cannot be influenced directly. Silence most of the warnings to be able to work with the mess. Change-Id: I2c4adec14945ada878bb1e6fda2f06e6d56007e2 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | ClangTools: Make building before starting analysis defaultNikolai Kosjar2019-06-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | ...when switching to "Custom Settings" in Menu: Analyze > "Clang Tidy and Clazy...". Otherwise we might run into parse errors due not yet generated source files (e.g. "fatal error: 'ui_mainwindow.h' file not found"). Task-number: QTCREATORBUG-22382 Change-Id: I6f499fa8f8ab2fff08d19165e474d14305cfded5 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Allow adding of fontsThomas Hartmann2019-06-255-0/+42
| | | | | | | | | | | | | | This adds ResourceHandler for tff and otf files to the resource browser. Change-Id: I8fc757162266d79d656ee58bd0f948107d58db4d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: List all fonts in projectThomas Hartmann2019-06-251-1/+31
| | | | | | | | | | | | | | | | | | We iterate all over all ttf and otf files that are found unter the project directory and show their name in the FontComboBox. Task-number: QDS-100 Change-Id: I45c4d512783d5ecc4a646860c08e6088bd712798 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Language Client: Fix UI text capitalizationLeena Miettinen2019-06-251-1/+1
| | | | | | | | | | Change-Id: I6871bb6f91b6a7dfd8b0a12973e709193d6a8a99 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Clang Code Model: Fix product name capitalization in UI textLeena Miettinen2019-06-251-1/+1
| | | | | | | | | | Change-Id: I81d7e411d47e64d5304f30ca295c3f4b1f0d51b5 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Debugger: Set tab title when attaching to started applicationChristian Stenger2019-06-251-1/+1
| | | | | | | | | | | | | | This amends 75b501be9db68. Change-Id: I186b276b82ac5793c58be9d37c36c9d49dda1edd Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Make varsBatCombos Squish-testable againRobert Loehning2019-06-242-8/+4
| | | | | | | | | | Change-Id: I4656800f80022652f9277029c597754c9263bf66 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Output panes: Support keyboard shortcuts for zoomingChristian Kandeler2019-06-248-7/+51
| | | | | | | | | | | | Fixes: QTCREATORBUG-22567 Change-Id: I3c7419c7b464c329d8f8dae11db9a0b01e51f32c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Doc: Describe creating and running Boost UTF testsLeena Miettinen2019-06-249-23/+87
| | | | | | | | | | | | Task-number: QTCREATORBUG-21169 Change-Id: I5e90d2cd089dbfac2a49a33c69ba0fa2ac43438b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | qmake: Let evaluateFunction() return error for infinite recursionChristian Kandeler2019-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it can happen that parsing goes on forever in cumulative mode. Task-number: QTCREATORBUG-17656 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io> (cherry-picked from qtbase/feb06decfe5355a14c982f7ddb427a262ad2b393) Change-Id: If69f2265ac7eee0d230bd77a9aa9500e97ebeff6 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | Highlighter: Use file pattern matching if mime type is 'text/plain'David Schulz2019-06-241-7/+21
| | | | | | | | | | | | | | | | | | | | | | Do not try to match 'text/plain' mime types against highlight definitions, because it is automatically set if the file contains just printable characters in the first bytes, in this case file pattern matching gives better results. Fixes: QTCREATORBUG-22540 Change-Id: Ifd662cd6961011f5cf5d9232ce5f17d2314b4824 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ensure the 'Auto' key is set while registering post mortem debuggerDavid Schulz2019-06-242-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | The 'Auto' indicates that the the registered post mortem debugger is directly started after an unhandled user exception. If the value is unset or set to '0' in rescent windows versions the debugger selection dialog is not shown. Set this value to '1 ' to show the qtcdebugger dialog, which also has an option to show the system dialog, if the user does not want to debug the exception with Qt Creator. Change-Id: I3160315060dbfb37bec5eaa677c4208900f574a4 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | ProjectExplorer: Respect pinned documentsChristian Kandeler2019-06-212-6/+5
| | | | | | | | | | | | | | | | | | ...when closing the files of a project. Also remove unused member IDocumentPrivate::pinned. Amends fe21a7a77e. Change-Id: I15fa06bcde2022c559c4bd7234625c5ea06ba26e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlJS: Add "Array" to global functionsThomas Hartmann2019-06-211-1/+1
| | | | | | | | | | | | | | | | This fixes a false positive error message. Task-number: QTCREATORBUG-22599 Change-Id: I54104857982873baaa092ad936586c3d245ce720 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | CMake build: Allow brandingEike Ziller2019-06-212-20/+20
| | | | | | | | | | | | | | | | | | | | Create your own QtCreatorIDEBranding.cmake somewhere and point cmake to it via CMAKE_MODULE_PATH Task-number: QTCREATORBUG-22488 Change-Id: Ic1057d879c5104b57e4ed8ef8a9c4fc8d4140de9 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake build: Do not write versions etc into the cacheEike Ziller2019-06-211-22/+21
| | | | | | | | | | | | | | | | | | | | The user is not supposed to change these via configuration. If they are written to the cache, version bumps do not take effect automatically, resulting in quite some hassle. Change-Id: Ibaf9dba02114da1cbc3ec2210ae7c3328f35bb1f Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Qnx: Do not deploy files that are not neededhjk2019-06-211-0/+9
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-20000 Change-Id: Ie9a2341a3bcd1531bc83b54bf43466df1347627c Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Doc: Add information about new CMake featuresLeena Miettinen2019-06-212-1/+6
| | | | | | | | | | | | Change-Id: Iae561d5d13dc45e83432b0515679702b6b4737e1 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Update qbs submoduleChristian Kandeler2019-06-211-0/+0
| | | | | | | | | | | | | | To HEAD of 1.14 branch. Change-Id: I662bab89006041b54a9d467a4aa40b4035732ece Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* | ProjectExplorer: Respect pinned documentsChristian Kandeler2019-06-213-7/+7
| | | | | | | | | | | | | | | | ... in "Close All Projects and Editors". Amends fe21a7a77e. Change-Id: I162753e08f97cf4538bf58e5f48fd222cdb9ee2b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CppEditor: Check model index in ParseContextModel::dataNikolai Kosjar2019-06-211-1/+1
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-22596 Change-Id: I6babbab8fc9c66ca6d16fe60d93bfbc9147ead90 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Core: Do not access outdated QTextBlockDavid Schulz2019-06-211-8/+5
| | | | | | | | | | | | | | Fixes: QTCREATORBUG-22547 Change-Id: Iddcf2a9b4d4e864f6038f3955b945a942e351081 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | WelcomePlugin: Close slpash screen after 15 secondsThomas Hartmann2019-06-211-0/+5
| | | | | | | | | | | | | | | | Some window managers on Linux have issues with the spash screen and it cannot be closed. Change-Id: I20d1f3365f671b67b0c50950cf739430aa58086d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.9' into 4.10Eike Ziller2019-06-211-4/+9
|\| | | | | | | Change-Id: Id3bd5794a6821855c41567e8de3898d94a896ceb
| * Squish: Fix crash in tst_default_settingsRobert Loehning2019-06-181-4/+9
| | | | | | | | | | | | | | On Windows, compilers of type "Clang" display a QComboBox instead of a QLabel Change-Id: I68537259d8d5b38b288308675139c92395f6df62 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Update KSyntaxHighlighting 5.52 -> 5.59David Schulz2019-06-2025-148/+593
| | | | | | | | | | | | Task-number: QTCREATORBUG-22558 Change-Id: I2eac03b54f2c2d330ee9b5d0037ee42a6640d76b Reviewed-by: Eike Ziller <eike.ziller@qt.io>