aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: fix calling QDesktopServices::openUrl when opening about:blank4.7David Schulz2018-12-031-0/+4
| | | | | | | | | | Workaround QTBUG-71833 Fixes: QTCREATORBUG-21515 Change-Id: Iffa363ab94a8f71d958b04932c9829887bb00dd7 Reviewed-by: Eike Ziller <eike.ziller@qt.io> (cherry picked from commit fc5caf3e0fff736acf1fc6c30e95b9b40089c03d) Reviewed-by: David Schulz <david.schulz@qt.io>
* Fix reference on temperary valueTim Jenssen2018-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code at Context::lookupReference took via Context::ptr() a temporary QSharedPointer as an argument into a reference member which is deleted just after ReferenceContext is constructed - changing that to a general member copies this temporary QSharedPointer and fixes the problem which was there since always and that this was not crashing before was just luck. class ReferenceContext { public: ReferenceContext(const ContextPtr &context); private: const ContextPtr &m_context; }; QWeakPointer<const Context> _ptr; ContextPtr Context::ptr() const { return _ptr.toStrongRef(); } const Value *Context::lookupReference(const Value *value) const { ReferenceContext refContext(ptr()); return refContext.lookupReference(value); } Task-number: QTCREATORBUG-21510 Change-Id: Ic49a0597763fb8be65feca6f24fec105d531d6ab Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 4d74cbb945d53991ae844922b532987b513e14e6) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* More Qt Quick wizard fixes for Qt 5.12Eike Ziller2018-11-293-48/+48
| | | | | | | | Task-number: QTCREATORBUG-21476 Change-Id: Icadcf12dc59786a62205cccc917a13b42f55b782 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io> (cherry picked from commit 69b111b3c7839dd6a6a88f94288f66166d4c220d)
* Fix Qt Quick wizards with Qt 5.12 / ECMAScript 7Eike Ziller2018-11-295-50/+50
| | | | | | | | | | | The expression that we used either worked in ECMAScript 6, or only accidentally worked in QJSEngine in Qt 5.11. Fixes: QTCREATORBUG-21476 Change-Id: Id2ce0932ead24c8caef9a82b10a173dfdcf1e927 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit 2bf9333e4c8a80c4ed98df59bb6cb119d7efdd8b)
* More change log for 4.7.2v4.7.2Eike Ziller2018-10-231-0/+15
| | | | | Change-Id: I96f8678b0f0658aa72689fcefa410c5e26af50e9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* iOS: Work around mismatch of USB serial and iOS device idEike Ziller2018-10-231-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Currently we track connection of devices in the iOS plugin via USB, using the USB serial number as a device identifier (iosdevice.h/cpp). On the other side, iostool uses the MobileDevice framework to identify iOS devices (iosdevicemanager.h/cpp). The assumption that the two identifiers are the same seems to be no longer true with the iPhone XS devices. These have a device identifier that contains a dash that is not present in the USB serial number. As a hotfix, just remove any dashes from the identifier on the iostool side because we only use it for the lookup deviceId -> AMDeviceRef anyhow. The longer term fix should be to use MobileDevice framework for the connection tracking of devices on the iOS plugin side as well, instead on relying on questionable assumptions. Change-Id: Iac3115a1c3f43a4f9e159aaa4ded1c671c55d888 Fixes: QTCREATORBUG-21291 Reviewed-by: Jason Hihn <jhihn@gmx.com> Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Fix crash in folder navigation widgetEike Ziller2018-10-232-9/+23
| | | | | | | | We want to delay updating the crumble path, but we may not keep and pass around the QModelIndex, since that can become invalid. Change-Id: Id0c1ffb046dda1fb3bc09801fd1952787f9919fa Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix Linux & macOS build in releaseEike Ziller2018-10-221-0/+2
| | | | | | | | | msvctoolchain.h/.cpp is only available on Windows (except if tests are enabled...) Change-Id: Id2ad5bd0945f1f1c21ca6a3a08e8bc4d5f50c3ed Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io>
* ProjectExplorer: do not send non existing debug outputDavid Schulz2018-10-191-0/+2
| | | | | | | | Task-number: QTCREATORBUG-20848 Fixes: QTCREATORBUG-21215 Change-Id: I55366b42a94721ea800d0babe72f24d343d55de2 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix crash when pressing wrong shortcuts in welcome modeEike Ziller2018-10-191-2/+8
| | | | | | Fixes: QTCREATORBUG-21302 Change-Id: Ib7e50f3cbd3e6e8f995b8cda7ad965f0cafde511 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Fix soft assert when adding file to subfolder in generic projectEike Ziller2018-10-181-2/+3
| | | | | | | | | We can only select a node directly in the wizard summary page's project tree, if that is actually listed there. Task-number: QTCREATORBUG-21342 Change-Id: I52b3db8c38ae2bb59b3f6856e79354ca60a00140 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Fix crash when adding file to sub folder in generic projectEike Ziller2018-10-181-1/+2
| | | | | | | | | | | | The moment the file is added to the project, a reparse is triggered, which invalidates the tree sub-nodes. So we need to check if the context node (on which the wizard was opened) still exists before trying to access it, similar to how we do that in JsonSummaryPage::findWizardContextNode. Change-Id: I9154e000a31ea8d5d4ebc66c25528d422c377b94 Fixes: QTCREATORBUG-21342 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Add changes file for 4.7.2Eike Ziller2018-10-171-0/+48
| | | | | Change-Id: I042c29592b46a4f094251d241dba442bc4d728c6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* ProjectExplorer: cancel MSVC tool chain detection on shutdownDavid Schulz2018-10-175-0/+16
| | | | | | | Task-number: QTCREATORBUG-21329 Change-Id: I681757f1a2e77ecd7f766f25ab554d57473f1c6d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Cdb: fix std vector dumper in non python dumperDavid Schulz2018-10-111-1/+1
| | | | | | | Task-number: QTCREATORBUG-21074 Change-Id: Iae78195b5bed1a6baa4515bf578d4f0b004eddae Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: Do not access a text document from another threadDavid Schulz2018-10-101-38/+38
| | | | | | Task-number: QTCREATORBUG-21192 Change-Id: I5c327f268da2364f1fc4f671993e8498cd0b7421 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Russian translation updateSergey Belyashov2018-10-091-3/+27
| | | | | | Change-Id: I40965282a75586bb23e6e42b7d82bd8532290820 Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Editor: Do not jump over invisible blocks in paintEvent sub routineDavid Schulz2018-09-281-6/+5
| | | | | | | | | The paintEvent relies on invisible blocks to find collapsed blocks and paint the collapsed block popup. Task-number: QTCREATORBUG-21040 Change-Id: Id50e8602722fd807e57fa008cf9fd8106ffdafe1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Fix file saver for delete locked filesDavid Schulz2018-09-261-7/+20
| | | | | | | | | If we can not delete a file via the ReplaceFile operation, because we ca not get the DELETE access right we still can try to replace it contents. Task-number: QTCREATORBUG-7668 Change-Id: I8804133a0e118518307f33976b821d5b2fdc9b8d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* More changelogEike Ziller2018-09-261-0/+6
| | | | | Change-Id: I2de07e518e8be48afee271e5e4674ce2e7dd6d86 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Valgrind: Add target executable suffix to heob command lineHannes Domani2018-09-251-2/+3
| | | | | | | | | | The suffix is needed in case the executable name contains a dot, because then the .exe suffix is not added automatically by CreateProcess(). Change-Id: Ief2cfeaa8dd8ebbfb71f69575ee9574a4f2156d3 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix conflicting LanguageVersion and value __cplusplus defineEike Ziller2018-09-241-3/+8
| | | | | | | Task-number: QTCREATORBUG-20884 Change-Id: Ieddb277ed5a7c167d75f902275b8f98cc3fc8af4 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* SshDeviceProcess: Don't emit readyRead signals if no data availableJonathan Liu2018-09-211-2/+8
| | | | | | | Task-number: QTCREATORBUG-19367 Change-Id: I477800b2e2060748c2b5f9fde3acc91d9f5ae176 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix incorrect grammar in 'does not exists'Kai Koehne2018-09-214-6/+6
| | | | | | Change-Id: I790d9bbdfc170808ff66e70be0f81d1c292c0bcb Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Clang: Remove version check for skipping inlude file warningsIvan Donchevskii2018-09-211-1/+1
| | | | | | | | The change is not upstreamed so the version number is not valid. Task-number: QTCREATORBUG-21139 Change-Id: I46fdb0a700780811b88083ae6ed55a241c705cb9 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* qtcdebugger: Extend help textFriedemann Kleint2018-09-211-18/+30
| | | | | | | | | | | | | | Factor out a helper function to read out the current debugger. Display the currently registered debugger and the Qt version used in the help. Enable copying the message box text. This offers a convenient way of checking since the debugger settings often get overwritten by OS or MSVC updates. Change-Id: If61e30ae22802b71960cb6f3da96100f5fd9e47c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Bump version to 4.7.2Eike Ziller2018-09-202-4/+4
| | | | | Change-Id: I10b0692b069aa587ab39156ddd6c4601646ff493 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CppTools: Fix crash on smart selection change with lambdaNikolai Kosjar2018-09-201-0/+3
| | | | | | | | | ...in case there is no lambda declarator provided, e.g.: []{} Fixes: QTCREATORBUG-20994 Change-Id: I6a77cffe4e585422f1ed0639cabc687d3d123f5d Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* ProjectExplorer: Do not add too many newlines for remote processesJonathan Liu2018-09-201-2/+2
| | | | | | | | Do not add newlines when remote process output gets flushed. Task-number: QTCREATORBUG-19367 Change-Id: I9e878695279404d436264abd580884fb6a9e91ad Reviewed-by: hjk <hjk@qt.io>
* Clang: Fix possible out of bounds access in ClangFollowSymbolIvan Donchevskii2018-09-181-2/+2
| | | | | Change-Id: I80132dca9c26a54059f2c1ba872b102df8e6e0d7 Reviewed-by: hjk <hjk@qt.io>
* Qnx: Fix passing path to Qt libraries on device to run configurationv4.7.1Eike Ziller2018-09-181-0/+1
| | | | | | | | | The line edit was gone. Broke in 4b9945c32981105bfae3ba59f9565757f0dc7417 Task-number: QTCREATORBUG-21100 Change-Id: Ib341df783d6b8060226863637c65f081635deaf0 Reviewed-by: hjk <hjk@qt.io>
* Fix colorization of change numbers in VCS annotations (like git blame)Eike Ziller2018-09-121-2/+5
| | | | | | | | | | | | | | | | Syntax highlighters get information on which text char format they should set, which is not necessarily equivalent with the resulting color in the editor. Currently the only way to explicitly get the color, is through the global text editor settings. Fix-up of 601eebd832e8f8a39d661031a44d5ee3c53bf718 Task-number: QTCREATORBUG-21041 Change-Id: I8fb6e79500d490438b2ccd27b162a3b80822c1ee Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* qmljs: fix bug in reformattingMarco Benelli2018-09-111-1/+4
| | | | | | | | | Reformatting multi-line comments caused, in some cases, the deletion of the preceding line. Task-number: QTCREATORBUG-21036 Change-Id: I9bf9627e5992e9821c0dd62a13601a3ca6367e65 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Squish: Wait for a clean shutdown when restarting QCChristian Stenger2018-09-077-0/+7
| | | | | | | | | | | | | | | This fixes a race condition in tst_CSUP06 where the next run of QC removed .user* but the first instance was not completely finished with the shutdown process. The .user files of the project got updated (or recreated) before the second instance tried to open the same project again. Ensure the first instance is closed to be sure that project's .user files got created or updated before the second instance tries to remove and re-open them. Follow the same approach for other tests to avoid the same issue later on. Change-Id: I37721f4dd647f9bbf7c6fed6e753a2906e30db81 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Squish: Stabilize tst_CSUP06Robert Loehning2018-09-071-0/+1
| | | | | Change-Id: I2cac53f69d15763770fe3955408867ec668bfccd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Refactor starting Qt Creator from SquishChristian Stenger2018-09-0571-112/+91
| | | | | Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260 Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Fix environment for Start and Debug External ApplicationEike Ziller2018-09-041-0/+5
| | | | | | | | | | In this case we do not have a run configuration with the needed information, so use the system environment, modified by the kit's environment changes. Task-number: QTCREATORBUG-20185 Change-Id: Ie95e6eecf0b81f09f2f2aca3d5e792e5b39d000c Reviewed-by: hjk <hjk@qt.io>
* .gitignore: Ignore Squish config files we don't useRobert Loehning2018-09-041-0/+3
| | | | | Change-Id: Id4a25cd1952666aaba8efface910cbb70235c825 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* AutoTest: Fix handling cancellation for timeoutChristian Stenger2018-09-041-14/+14
| | | | | | | | | | | | If the timeout triggered a cancellation of a test run the testrunner missed to inform the progress manager about this. This in turn resulted in a sticky progress widget which even could pile up with further progress widgets. Fix this by explicitly informing the progress manager of the cancellation. Change-Id: Ie19a1aa998e19f911cd0dd856008552baaffeb9b Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2018-09-041-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: Idbbb9054b73c8f1330da17bb6ff5f6534046993d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* winrt: Use full path when running windeployqtOliver Wolff2018-09-041-1/+8
| | | | | | | | | | | | As winrt does not have the concept of a run environment acquiring the path to windeployqt from the environment might lead to unexpected results like using windeployqt from a different Qt installation. Calling the program with its absolute path is the safer alternative and thus should be the default anyways. Task-number: QTBUG-70175 Change-Id: I6eb5416275d7ff243f396bf1fccdbcb9d04f7e15 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add line/column number handling to spotlight locator filterEike Ziller2018-09-031-5/+7
| | | | | | | | | Otherwise it is not possible to directly open a file at a location with the spotlight filter (in the style of "md qwidget.cpp:100"). Task-number: QTCREATORBUG-20473 Change-Id: I9ee70c411f77ca715ebba864ef16eab7c9b31bde Reviewed-by: David Schulz <david.schulz@qt.io>
* Update qbs submoduleChristian Kandeler2018-09-031-0/+0
| | | | | | | To HEAD of 1.12 branch. Change-Id: Ia932667870d12108a7735c6103f89053b9138ec1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Tracing: Adapt aggregator test to new ctor signatureUlf Hermann2018-08-311-1/+2
| | | | | Change-Id: Ifb94c1e1f14b26aa2bb365cd08d36fa67642ecc7 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlProfiler: Listen on QHostAddress::Any in QmlProfilerToolTestUlf Hermann2018-08-301-1/+1
| | | | | | | | | | | | | | | The attach dialog retrieves the host address to connect to from the device's toolControlChannel(). All of the toolControlChannel() implementations currently specify "localhost" as host address. "localhost" means IPv6 on macOS and IPv4 everywhere else. Unfortunately there is no shortcut for listening on a dual-stack local address in QTcpServer and urlFromLocalHostAndFreePort() will try both v4 and v6, returning whatever works. There is a shortcut for listening on a dual-stack "any" address, though. As this is only the test, we can live with exposing a TCP server to the internet for a short time. Change-Id: I4114f03668e608f80353d21a59edf67db4b7f738 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Squish: Fix checking for plugin loader issuesChristian Stenger2018-08-301-4/+4
| | | | | | Change-Id: Ibf894f3792f78c496be5fcbdfcd6c19b8b1246e4 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Robert Loehning <robert.loehning@qt.io>
* Theming: Fix value of TextColorDisabled for classic modeChristian Kandeler2018-08-301-1/+1
| | | | | | | | | | | | | TextColorDisabled has always been the same value as TextColorNormal (which was presumably unintended), and nobody seems to have noticed for a long time. However, as of commit f7a0a3cd26 we have been using TextColorDisabled to display disabled project nodes, which means users could not tell enabled and disabled parts of the project apart anymore when using classic mode. We now use the same value as in the other themes. Change-Id: I1f616b6808d6c2012748af24b90953e4eb75df18 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* More change log for 4.7.1Eike Ziller2018-08-301-0/+4
| | | | | Change-Id: I79b26828ee572525cc32619fcddd3f70353e355c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Tracing: Properly signal destruction of non-owned propertiesUlf Hermann2018-08-301-10/+44
| | | | | | | | | | | | | When the zoomer, model, or notes properties for TimelineAbstractRenderer are destroyed, the QPointers become null, and therefore the change signals need to be emitted, and an update to the widget should be scheduled. If this is not done, clients using the property might keep a dangling pointer in some cache and dereference it later. Change-Id: I63fb657afb8138e9ac54c7d839d4a52271f8f3e8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlProfiler: Don't scan the whole file system in rewriter testUlf Hermann2018-08-291-2/+3
| | | | | | | | | | | | | | QLibraryInfo::location() returns one string. Iterating over that gives us the individual characters, beginning with '/'. Running that through FileName::fromString(), gives us "/", and feeding this to ModelManagerInterface::importScan() is not funny. This has to be backported as the sheer volume of files to be scanned makes the tests time out. (cherry-picked from commit af8bd1238724e3d578b9a16e4ffa88a6a046dca6) Change-Id: Ib4293437ab83da8ed10a696fba2c30f5c51c8124 Reviewed-by: Eike Ziller <eike.ziller@qt.io>