aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* File System View: Fix scroll position and bread crumb in some casesEike Ziller2018-08-152-8/+8
| | | | | | | | | | | | Use a model index from the right model, and update the bread crumb, when updating the scroll position delayed, for the case where the directory for the file was not already loaded in the file system model yet. Broke with introduction of the folder vs alphabetic sorting. Task-number: QTCREATORBUG-20897 Change-Id: Ifc912184b4910ed546c0141044eead3650b98c87 Reviewed-by: David Schulz <david.schulz@qt.io>
* Use Qt::AA_UseOpenGLES instead of QT_OPENGLThomas Hartmann2018-08-151-1/+1
| | | | | | | | | Environment variables are passed on to user applications, and we should avoid forcing ANGLE on these. Task-number: QTCREATORBUG-20808 Change-Id: Ia6663e4e2bc4f78ec053d100563a0f07d47092be Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix hiding file system view's bread crumbEike Ziller2018-08-152-3/+10
| | | | | | | | | | | When hiding the bread crumbs in the filter option dropdown, there was some spacing and the separator line left. With this patch, the spacing and line are hidden too, making the layout nicer and more similar to before the bread crumbs feature existed. Task-number: QTCREATORBUG-20733 Change-Id: I560b4414804c8cd25e88d645aa3042acb1b8e06c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* TextEditor: Fix compile on macOSChristian Stenger2018-08-151-0/+2
| | | | | Change-Id: I78929b2d3f6e7803879e63ba5611e5210cc53f90 Reviewed-by: David Schulz <david.schulz@qt.io>
* Valgrind: Fix heob check if executable existsHannes Domani2018-08-141-1/+2
| | | | | | | Task-number: QTCREATORBUG-20938 Change-Id: Id1c3cbf610b97a13209e6a767c5e881e9be18ac7 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* GenericHighlighter: check text color against backgroundDavid Schulz2018-08-141-1/+41
| | | | | | | | | | | | | The kate syntax highlighter format allows to directly assign a color for a specific item. This could result in a bad contrast ratio between text and background. Check the contrast ratio according to W3C Recommendation and apply if it exceeds the minimum contrast ratio for large text. (https://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast- contrast) Task-number: QTCREATORBUG-20919 Change-Id: If5a5d09224446df72f31027cd30e50088179d6d7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Fix Botan build on macOSEike Ziller2018-08-132-2/+6
| | | | | | | | | | | Since some Xcode version, running clang directly from the Toolchains directory requires explicitly passing the sysroot to use. If that is not done, inclusion of some standard headers like string.h fails. Change-Id: I640eca41d4132354f1091a7514586cb582e5d05c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Botan: Fix compile if documentation tools are presentChristian Stenger2018-08-132-2/+3
| | | | | | Change-Id: If5adae5840cca75e3a1429922f48ea25b9903dc3 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Update qbs submoduleChristian Kandeler2018-08-101-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: Idfc6e54062cdc9f3cc5edebb9f7d2aab4c0db105 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* SSH: Use Botan2Christian Kandeler2018-08-10499-65031/+75444
| | | | | | | | | | | | | | | | Botan 1.10 will be completely unsupported by the end of this year, so we now target API version 2 instead. Also upgrade our bundled Botan to the latest version 2.7. We no longer check in pre-processed files, but use the upstream sources directly (with unneeded parts removed), employing Botan's own configure script for building. This will make future upgrades much simpler. A script to automate this process is also provided. Task-number: QTCREATORBUG-18802 Task-number: QTCREATORBUG-8107 Change-Id: I5a5ea62cfd30d720b556217142e8b7e06bf49f7e Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix wrong color of line/column labelEike Ziller2018-08-091-1/+2
| | | | | | | | | | Fix up of a8aa4bbb312d163c1fffaa59102a49c77458404c. That introduced a non-QToolBar widget that should be styled like a tool bar, so use a StyledBar instead of plain widget. Task-number: QTCREATORBUG-20916 Change-Id: Ifd899fac136ef4e3310cd5d2b9cd9f0cd2de1376 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ProjectExplorer: reduce amount of concurrent running vcvars.bat scriptsDavid Schulz2018-08-091-2/+15
| | | | | | | | | | | | | The concurrent execution of multiple batch scripts seems to be suspicious behavior for some of the anti virus solutions out there. Task-number: QTCREATORBUG-20868 Task-number: QTCREATORBUG-20637 Task-number: QTCREATORBUG-20829 Task-number: QTCREATORBUG-20886 Change-Id: I2a05ccf937218bca09227bf34f56da38123ffbe7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: Fix parsing of server command line optionhjk2018-08-091-1/+1
| | | | | | Task-number: QTCREATORBUG-20928 Change-Id: Iaa23555353f5b234c550763cdbd04d115d4e0eda Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Clang: Fix resource directory pathIvan Donchevskii2018-08-082-10/+7
| | | | | | | | Effected clang tools in developer builds. Change-Id: I3ecbc38f37fa2a41f3777f402fd7fe5bf5ba7e94 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Clang: Fix the include paths order for libclangIvan Donchevskii2018-08-081-1/+1
| | | | | | | | | | | | Clang headers should always come first. After we removed '-isystem' from other paths it was still used for clang headers which put it in the end of list. This fix returns the paths their original order. Change-Id: I0a4ab450a5303e2536e60200f479cc19f6f55e99 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* AutoTest: Fix and unify handling of group nodesChristian Stenger2018-08-079-9/+26
| | | | | | | | | | | | | QtTest had been forgotten to handle correctly as well. So, it was possible to have several levels of grouping which had not been handled correctly. By (current) definition we handle only one level of grouping, so prohibit more for QtTest tree items as well. Basically move the check into a separate function and use this beforehand instead of creating a nullptr. Change-Id: Icbf02eae67e89464f371eb349eecf2976636d05f Reviewed-by: David Schulz <david.schulz@qt.io>
* QbsProjectManager: Adapt to cpp.cxxLanguageVersion type changeChristian Kandeler2018-08-071-10/+16
| | | | | | Task-number: QTCREATORBUG-20909 Change-Id: Ic0c018b1a06e2d715d4ea6e301deeacc6aa7f480 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* AutoTest: Disconnect signal after being processedChristian Stenger2018-08-062-2/+6
| | | | | | | | | | | When debugging a test the run control outlives the connection and the signal can be triggered again and again which results in warnings on the command line. Do not rely on run control handling things for us, instead disconnect the signal after it had been processed. Change-Id: I704fd110bce3b387ee419a3f83bf904f2687a435 Reviewed-by: David Schulz <david.schulz@qt.io>
* AutoTest: Avoid crash in illegal stateChristian Stenger2018-08-061-1/+6
| | | | | | | | | | While debugging tests we rely on some states of the debugger. If anything goes wrong we might end in an illegal state on our side as well. This would then result in a crash. Avoid nullptr access and try to recover from illegal state. Change-Id: If8ca396a6e456d2f37777eba86f320643fbcd275 Reviewed-by: David Schulz <david.schulz@qt.io>
* TextEditor: fix crash while request follow symbol and typing on macDavid Schulz2018-08-062-1/+2
| | | | | | | | Use a qobject_cast to prevent accessing a not available function. Task-number: QTCREATORBUG-20910 Change-Id: If2aa6b7b120379681e9590db80904c45a6d9bd55 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* GDB: Escape quotes on breakpoint commandsOrgad Shaneh2018-08-031-2/+6
| | | | | | | | The commands are wrapped in quotes, and if they contain quotes it gets messed up. Change-Id: I41cebd8cf4a57a8ea671e5f43a3295af1c73fd02 Reviewed-by: hjk <hjk@qt.io>
* Update qbs submoduleChristian Kandeler2018-08-031-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: I44bf654eb81a30f44055b366c21dca10fded37c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Revert "Wizards: Drop support for Qt4 for widgets application"hjk2018-07-262-3/+1
| | | | | | | | | | | | | | | This reverts commit 1a6522b47c7eb667d297c71a48751e22f7069c04 which leaves people wondering about their kit setups. Creating a project that possibly does not compile due to the use of C++11's nullptr in the generated code is lesser evil. Apart from that this potential mis-compilation does not happen in practice on e.g. Ubuntu 18.04 with system Qt 4 and system compiler. Change-Id: Iaa90f225d5317dc48428aa2d3fcf3ec051ef2018 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Environment: Do not leave stray ':' in LD_LIBRARY_PATHTobias Hunger2018-07-261-2/+4
| | | | | | | | | | | A empty path segment in LD_LIBRARY_PATH is *not* ignored and treated as '.' IIRC. So make sure to not leave a ':' in first place of LD_LIBRARY_PATH or set an empty LD_LIBRARY_PATH on Linux. Change-Id: I99ec2e333c6c0205334daf14ac6a2373c6e465ad Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Debugger: Do not start the mixed engine on Attach to QML Serverhjk2018-07-261-0/+1
| | | | | | Task-number: QTCREATORBUG-20168 Change-Id: I6af3bf7f0f9ed2316d1382383a7889f55a16dea1 Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: fix msvc toolchain detection for Windows SDK 7.xDavid Schulz2018-07-251-8/+4
| | | | | | | | | | Cancel processing the environment diff only if the setenv scripts return a non zero exit code. Just checking the presence of standard error output seems to be a to aggressive error checking in this case. Task-number: QTCREATORBUG-18328 Change-Id: I9243932cd5721cfbfec5a980a2fab6e69f4c31c7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Clang: Suppress "unreferenced formal parameter" warnings on MSVCOrgad Shaneh2018-07-251-0/+3
| | | | | | | | They are triggered a lot in Clang headers. Change-Id: I31f31a4f52e269d773cf1b41ad52f279ee368c2e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* QbsProjectManager: Fix qbs build against external qbsChristian Kandeler2018-07-201-1/+1
| | | | | Change-Id: Iccc0b340498e363fa6c8df39bd0949f55bddd77a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Debugger: Fix breakpoint disabling and enabling in for QMLUlf Hermann2018-07-191-10/+7
| | | | | | | | | | | | | | | | As QML currently does not expose a command to atomically enable or disable a breakpoint, we need to remove and re-insert it. The previous code scheduled the removal through a timer, and depending on if the timer hit before the insertion or after, the operation was successful or not. As the QML engine doesn't have to be in a specific state to insert and remove breakpoints, we can just directly send the messages instead and therefore be certain that they arrive in the right order. Task-number: QTCREATORBUG-20795 Change-Id: If69797b2c75e1107ad552f88e709e1580b4164db Reviewed-by: hjk <hjk@qt.io>
* Remove copying settings from Nokia directoryv4.7.0Orgad Shaneh2018-07-161-1/+1
| | | | | Change-Id: I550b62ab74505f72eee5c8daba206f80dd5a3a34 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Qml Profiler: Do toggle extended statistics when option is checkedUlf Hermann2018-07-161-1/+1
| | | | | | Task-number: QTCREATORBUG-20778 Change-Id: I3390241c25ab7a87329bc8b20c49c32cf4c02944 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* BinEditor: Fix "Find Next" for a single charOrgad Shaneh2018-07-161-1/+1
| | | | | Change-Id: If35807230969d3620a3a9018af8d2c21236cd58d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Make Collapse All action for project tree workTobias Hunger2018-07-131-2/+2
| | | | | | | | | Creator registers a "Collapse All" action for the Project tree. Make this work again. Task-number: QTCREATORBUG-20771 Change-Id: I49f1c8a97c4eb22ef6f7f703eefdfe46c3c0a035 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Clang: Suppress class-memaccess warnings for GCC8Orgad Shaneh2018-07-131-0/+9
| | | | | | | | | They appear a lot in Clang headers. Until this is fixed in Clang, suppress them. Change-Id: I5292ae442089aec3f52ba846ee21e0bd9e61d0cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Tracing: Don't rebuild flame graph if there is nothing to seeUlf Hermann2018-07-121-5/+7
| | | | | | | | | | If the root size is 0, none of the nodes will be visible. Don't create them in the first place. Task-number: QTCREATORBUG-20772 Change-Id: I9595daece2d17fe8202b322ffafd361d6fa422fa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* AutoTest: Handle direct usage of quick_test_mainChristian Stenger2018-07-123-3/+75
| | | | | | | | | | | | If users need to register additional QML types before Qt5.12 they need to bend the Quick tests magic a bit and use quick_test_main or quick_test_main_with_setup directly. The plugin supports something similar for QTest::qExec, so allow this for Quick tests as well. Task-number: QTCREATORBUG-20746 Change-Id: I672f8410914c6cc77abc901998f419dda35755ae Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* Fix assert when filtering examples / tutorialsEike Ziller2018-07-121-4/+67
| | | | | | | | | | | | | | | | | | | | | The examples are put throw two proxy models. The first one implements the sorting and filtering, the second one transforms the list into a grid. The grid proxy model was based on QIdentityProxyModel, which is wrong because that explicitly states that it should be used when the structure of the model stays the same. Even QAbstractProxyModel works under the assumption that all items in the proxy model correspond to an item in the source model, which is not true for a N*M grid. Just implement the proxy model "by hand", making sure that all items that cannot be mapped to the source are handles correctly as "empty" items. Task-number: QTCREATORBUG-20641 Change-Id: Id08b77bb7157b893b9d0d73dc006db98d90032b7 Reviewed-by: hjk <hjk@qt.io>
* ProjectModel: Fix crash when updating parsing state of projectTobias Hunger2018-07-121-2/+8
| | | | | | | | | Fix crash when updating the parsing state of a project during the time between the project being removed from the session and the time when the project is actually destroyed. Change-Id: I54bf4793626497315fe588ebb68474b880de2984 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake: Fix building on current executable targetTobias Hunger2018-07-121-1/+1
| | | | | | | Task-number: QTCREATORBUG-20763 Change-Id: Ie25c0993c1c2051de3f6a15fca56b56caaa04b00 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* FileProperties: Use native separators for file pathAndre Hartmann2018-07-121-1/+2
| | | | | Change-Id: I66c9f62b0c48165f5160d117ad3f0cf5e84f686b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that Qt Quick Designer did not request Design mode creationEike Ziller2018-07-121-0/+1
| | | | | | | | | | If you turned off Designer and ScxmlEditor plugins, you'd not get Design mode even if you have Qt Quick Designer. Fix-up of 299da013325be20ff731b91e7ead47b20242b1cd Change-Id: Ib3a269db9630af09c36968435ca0b0d998cc1709 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Update qbs submoduleChristian Kandeler2018-07-121-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: I3b0115655d3f3735730250a06b96805bc343dee8 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* AutoTest: Fix handling of cpp files for Quick testsChristian Stenger2018-07-114-4/+43
| | | | | | | | | | | | | | | | Modifying C++ files of Quick tests had been ignored as they normally have little impact. But nevertheless this behavior is wrong and could lead to unexpected behavior later on if no complete rescan had been done and even with a rescan there could have been some cached artifacts. Fix this by tracking the paths of the C++ files that hold the main() or the respective macro to be able to handle changes of these files correctly as well. Task-number: QTCREATORBUG-20746 Change-Id: Iec860aa63ffd167511efdbf63a6ffa369f094edf Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: only add Tasks from the main threadDavid Schulz2018-07-114-60/+89
| | | | | | | | | | | If something fails while extracting the build env from msvc vavars scripts we want to add task hub entries to inform the user about a most probably unusable toolchain. As the msvc toolchain detection is threaded nowadays and the TaskHub is not thread safe we need to propagate the error message to the main thread before adding the Task entries. Change-Id: I5c67d3b8d58b22ea895afb6f22ee73f19fa52f17 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Follow symlinks in Environment::isSameExecutableOrgad Shaneh2018-07-111-1/+5
| | | | | | | | | If qmake uses /usr/bin/gcc and the kit is configured to use /usr/bin/gcc-7, and both reference the same executable, there is no reason to warn. Change-Id: Ida79fccb97cffb682c1d85d7fa8888d85bf7d6a4 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* use initializer listTim Jenssen2018-07-101-1/+1
| | | | | Change-Id: I15fdcf313db913df91a1a93684e1d60de7bf16bd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* WinRT: set symbol file before debugging winrt packagesDavid Schulz2018-07-101-0/+1
| | | | | Change-Id: Ic3224cd1f12e799a9b38f31ba6dfe04c7774e35f Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Fix handling of the QTC_USER_FILE_PATH variableFriedemann Kleint2018-07-101-5/+4
| | | | | | | | Add a quick check whether the variable is set and return nullopt in that case. Flip the check in the below code. Change-Id: I655662f2940946150165107a66c003a3a4bc025d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix running lrelease and lupdate as external toolsEike Ziller2018-07-102-0/+2
| | | | | | | | | | | With newer Qt versions. These want to run cl.exe on Windows, which usually is not on the PATH except for the build environment. So, use the current build environment's PATH if that is available (falling back to the system environment's PATH). Task-number: QTCREATORBUG-19892 Change-Id: Ia512b3599d2cca7a0d1169b0d673f32158cb701f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add %{CurrentBuild:Env} to global environmentEike Ziller2018-07-101-0/+7
| | | | | | | | %{CurrentBuild:Name} and %{CurrentBuild:Type} are there too. Change-Id: I06b49da61cd689b54be87333d7fa3f212ebf1762 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>