From 4c699d518110554f9ca3ff4ab1ad09dc4c089fc1 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 9 Jun 2021 15:48:59 +0200 Subject: [PATCH 1/6] CMakePM: Enable extra compilers only for files in the project Qt Creator 4.15 added the "" project node containing all the files in the source directory. Qt Creator for its "find extra compilers" step needs only the files from the project and not all the files in the system. Task-number: QTCREATORBUG-25783 Change-Id: I5d33d5296f67ab3f321c232e5071f32e56d29101 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 94eeb5032e1..54de9efb68b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -1142,7 +1142,7 @@ QList CMakeBuildSystem::findExtraCompilers() // Find all files generated by any of the extra compilers, in a rather crude way. Project *p = project(); const FilePaths fileList = p->files([&fileExtensions](const Node *n) { - if (!Project::SourceFiles(n)) + if (!Project::SourceFiles(n) || !n->isEnabled()) // isEnabled excludes nodes from the file system tree return false; const QString fp = n->filePath().toString(); const int pos = fp.lastIndexOf('.'); From 0a497287270d479d7fde5109b2b51683b590c8b2 Mon Sep 17 00:00:00 2001 From: Knud Dollereder Date: Wed, 9 Jun 2021 16:00:51 +0200 Subject: [PATCH 2/6] Fix a crash-on-close in the dockmanager The destructor of DockManager deletes floatingwidgets in a for loop. The destructor of these floatingWidgets calls back to the DockManager and alters the list it is currently iterating over. This is now quick-fixed by deferring the deletion by using a temporal vector. Change-Id: I40b77ea505a5fc7506117dc16476e2e498ce4aef Reviewed-by: Thomas Hartmann --- src/libs/advanceddockingsystem/dockmanager.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libs/advanceddockingsystem/dockmanager.cpp b/src/libs/advanceddockingsystem/dockmanager.cpp index 7ae018b9129..5301e08c0b1 100644 --- a/src/libs/advanceddockingsystem/dockmanager.cpp +++ b/src/libs/advanceddockingsystem/dockmanager.cpp @@ -357,13 +357,20 @@ namespace ADS save(); saveStartupWorkspace(); + // Using a temporal vector since the destructor of + // FloatingDockWidgetContainer alters d->m_floatingWidgets. + std::vector aboutToDeletes; for (auto floatingWidget : qAsConst(d->m_floatingWidgets)) { - /* There have been crashes with partially destructed widgets in - m_floatingWidgets. Those do not have a parent. */ - if (floatingWidget && floatingWidget->parent() == this) - delete floatingWidget.data(); + if (floatingWidget) + aboutToDeletes.push_back(floatingWidget); } + + for (auto del : aboutToDeletes) { + delete del; + } + d->m_floatingWidgets.clear(); + delete d; } From b423523852dc4ae0907c3bd3bb17f7e334d5c432 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 10 Jun 2021 09:07:22 +0200 Subject: [PATCH 3/6] Bump version to 4.15.2 Change-Id: Ida5406673616350ad6656533de179342ab320171 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator_ide_branding.pri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index c442988571e..a3a3b933af3 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "4.15.1") # The IDE version. +set(IDE_VERSION "4.15.2") # The IDE version. set(IDE_VERSION_COMPAT "4.15.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "4.15.1") # The IDE display version. +set(IDE_VERSION_DISPLAY "4.15.2") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2021") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 864bfb910e0..924ad1f533c 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -3,10 +3,10 @@ import qbs.Environment import qbs.FileInfo Module { - property string qtcreator_display_version: '4.15.1' + property string qtcreator_display_version: '4.15.2' property string ide_version_major: '4' property string ide_version_minor: '15' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator_ide_branding.pri b/qtcreator_ide_branding.pri index 2bd6d479baa..135ccdf518d 100644 --- a/qtcreator_ide_branding.pri +++ b/qtcreator_ide_branding.pri @@ -1,6 +1,6 @@ -QTCREATOR_VERSION = 4.15.1 +QTCREATOR_VERSION = 4.15.2 QTCREATOR_COMPAT_VERSION = 4.15.0 -QTCREATOR_DISPLAY_VERSION = 4.15.1 +QTCREATOR_DISPLAY_VERSION = 4.15.2 QTCREATOR_COPYRIGHT_YEAR = 2021 IDE_DISPLAY_NAME = Qt Creator From 7a074608b6a18482ad7cca36bc7bdacba3cac11f Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 9 Jun 2021 19:57:11 +0200 Subject: [PATCH 4/6] CMakePM: Do not emit error signal in destructor while project is parsed Do not emit error occurred in the fileapireader destructor if it's parsing. This will cause the fallback file system view tree to be generated just before the parsing will be stopped. This can lead to crashes. Task-number: QTCREATORBUG-25837 Change-Id: Ic7a2dfc394ed8e259da3366727a3c5fa65d98776 Reviewed-by: Jarek Kobus --- src/plugins/cmakeprojectmanager/fileapireader.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index e5172e6f6e5..b19cd2068ec 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -64,8 +64,6 @@ FileApiReader::FileApiReader() FileApiReader::~FileApiReader() { - if (isParsing()) - emit errorOccurred(tr("Parsing has been canceled.")); stop(); resetData(); } From 9542ccd14eb92626c24c96614250ffa6596576e2 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 11 Jun 2021 09:59:54 +0200 Subject: [PATCH 5/6] CMakePM: Raise timeout for ctest run Depending on the size of projects and the underlying toolchain we may end up with no tests as the timeout for the ctest run was just too small. Fixes: QTCREATORBUG-25851 Change-Id: I5617987a9e43b16c02a2c0b4afd598a3ff909299 Reviewed-by: David Schulz --- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 54de9efb68b..243fdb83f9f 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -935,7 +935,7 @@ void CMakeBuildSystem::runCTest() process.setWorkingDirectory(workingDirectory); process.start(cmd.executable().toString(), cmd.splitArguments(), QIODevice::ReadOnly); - if (!process.waitForStarted(1000) || !process.waitForFinished(1000)) { + if (!process.waitForStarted(1000) || !process.waitForFinished()) { if (process.state() == QProcess::NotRunning) return; process.terminate(); From b1926e41c5528fc569f2e0ec9af762001bc101d0 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 11 Jun 2021 14:08:32 +0200 Subject: [PATCH 6/6] QmlDesigner: Update default image for Image Change-Id: I83f795ee5cb6c9ecfbf06c50d5d2ab5ade4fbabc Reviewed-by: Thomas Hartmann --- .../qml/qmlpuppet/images/template_image.png | Bin 2341 -> 1841 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/images/template_image.png b/share/qtcreator/qml/qmlpuppet/images/template_image.png index c880258277f70b7023285e1a65fe4662d94fbe70..96e7e6379648b32bd585d1a242719aa14e28da40 100644 GIT binary patch literal 1841 zcmeAS@N?(olHy`uVBq!ia0y~yU^oH79Lx+1471we)-W(I_6PWcxH2#>#E*hO69O7> zMx6`{3@s%=e!&ckOw257>>Qk2JiPn@!Xl#L5|UD~a`K8w$|`E=8d};qx&}tZCgv8F z)^-lg?jBw~0U;5QF>wjWX&IT>Ik|a-Ma5<1)wNB{?H#=nCr_O|d+ws8%hzn!vSa6- zz55OvJaqWz@snrHUbuAm%8gsM@7;g+_{p;uuiw0V|Ka23uiw7^`1R-SKdnc-i3|)Z zXFXjULn>~)z4N+SI8=cB0VnsCrPsK$lsXn3^$On@;UjojVL`_fE=C^n%THH1tmz16 z$+;ZxjQ_c_*;3zcM%A80&uon6e_DF}&F?um=FiR585tNDw#Q^oIFNPal-{0oi`<(| zYj2ZTYSp=}>SXzZA6kqIBCkIwepO|OXXyV=rvpCA@^$DO zpMGV*#VDzTPwz|dewd!-qLp%iy`#OsNo0{gtA>jrS73*e$RzueFAv_#EKc{ApD8hc z=cf7pg52son+j?|G@e{o`)$dmOLC19?wU6_UH_?=IbpH)LB=zWc4&A!tjU$>k|oeg(7`1|`k8)TA}Jn-Mf*>LC4 zlb`oz@ZUTxAB8%<}yWX+>*vJ zMSa{eO=OCuanCf6DVoK7Guz?`hqzIW#gpV^kM%GA|I4@LgTnQm{~enSG|w@SE1L7P zV&~y}h!ycmDc4FPS`A7!EwSGxzzwe~)jSoSP7^)Z*uc+MJ@K_XZMSRbsA+;DAoz zWVy)4A+(TJK;@K*A#2mwe;Tq)Yu7TKYJ2e7m(Q#1!LPScr&=Ezdu!~~noup!V5E3M zGIN0o2V1I-27lAROi8cigowJ%O$rk8G#0CHxTXHlU~jq@EIx(l;0{ZPQw<4!QiN0; zCK!Kl`>d$rF6231!N;A+vtA*GJ^qro2NQerC4LVj_V7#W9!~7Rm#RII*!?dRdvLLP zU&{8-Vt1b;`p9B$fq_b-qJ7AmIEzQBl8PQv93~wU)IP~Jv&xZEWu{EwB%cWzpJ{R| zQ(3I+Hi>o9WB&i^BPN~c%kX47ap8Qnti&W4nTeCWOgMD4R5nRIq%DQEueYwte~DJ_s=ztx1_bGxVx`VQGIeaeXgvN>Q1XeDlZlC|H@rabeXhS z*<})!QGxjm=LIU|?i*BimlUY3ac)?`-RIybbt0ysozF8|#&MF!1pUQUTRe9?;h3P( zUL*B)?+o5a>nyEQI~C>sh+j^eyQI61&ok)6?EOc}A|{tyy{PBOakFUl#e>sJZaSLG zmJ9kZ@#?}yUk*8%Uv}P?zHNntZ9z)InGMw;`_!5h=dYO%I92S^zx^q!DJc`zG~`4o zSSw6F$#)33}yZ-VRu;S}~KpF^z`e*ah3R>=SF8Ro$DezNR@ze^A~auE*Z z#0ekMpIt9yu3M@0Kd8e=L@2UZx8r}PS-94b+_-w?th3^w?#m9ZG+V!)Eww&#)w=}; zzE6E^z2Z)k)XS$#6=oJT3>w#-TEB8-XqZ&vv9j{?l$Q0Ld#~*J*}dq!@cJG9HU_OT jRZ)`Ky6L}0J*#C)!^?Gv4>cGV7#KWV{an^LB{Ts5vrP{^ literal 2341 zcmeAS@N?(olHy`uVBq!ia0y~yVAKI&4h9AWh8VGnD;XF#-gvq=hE&{odz-sJ^s3~6 zk9)tX?NoG-vpMWMv0>S?pp{|)EN&~82D|&bZHRJ7yXDlSw8HVSRn*3{54JR2YIk~F zBJv@y+eS;FM>AnrP{-6m0fJ4RB&Iq{p3tHq@X6qI%K3XK?=90$E@R%jv;5zE9)q9f zj^EsD|E=)bo1_^n&kYn9xOFxhVB*%{01+S-6Nu2+aG;3+BC%nRC`sZwEx;%ikmG5W#HaFY#=jr9!^XFIpUg0SDFyQ-{ z*UNP4_P;#TyfWIpye4gX%a_FMwvkuve7vE3{i*LhBV|oP+uzsJx10ZLdFt^ucg{t* z>3iSYXg=iG_-&eFebD!}H%=S3O9XwX`!VBpfZy|U3$OK6D?O#UMQ#^OniKoIe$Scs zHIuh{T2~kEj14MWe&y3zuIclZdYrOMK$@ArCLUs<2=O)&fa(^Cy? zQ#*=-b0rIJ2~SImDRwgN)0Yp>zPxQ`qN%>$h0@yJlJ_@s{mwX6eD~(GroXkOy4x#` z7_HL?Y`<8ue%+?qdA4DPO{TAN5C7Q`YP#j?_c-JGHUVMro3az9#m>y1we;FnjmP)) z|5?7}Vamne!*8aAo7gV*uY9xB*8Q|}*8U#_N6*Mjj179v-oG{WYSDI)>ml;DY*vTA z_W%2D_2H~jogw^lw?9mXbUrz6sqot)N8IW+EZhEv>;IOw2kibAPxRBtn|I}t`=-TD zIjikgFNtH*yCG=$?bY*~b@3+`R~+9L$@2M}Yf!p8&o-51uQoh$U&p!nc7Ee+w~m;3 z_7Q7$?>{{=PHR$e*p@%nmY=x!N&4caq!9h&`22wP6O`8;lDpKqx@^M>g`Edx-n~_~ zy?a$$w)*=OeXo)?J-GK)IPBN)i(4nJ$?=Lhty!V5>#15{Rq39c!H3tLig!yF?|R#6 z=Cb@g*Q*U$zq{}7FRhOM%c5<2P<@U0l3V<@|1G`lp)23KCr%)_xiZF?6lv~r-Iu14;*HT-=Y;?uuN@N%s1c9nxz%{#b?UD zmSYTxir#hocf;4xtv^C98hPbL>Mr{zXZB-a=*-tPVQ;)I3vT@(Tw0Orn%2KA-|+9P zcg)ugXMNlsn}2>$YD+uswC<=T790$X|I>JtlhJ z1}V1c8ws03E$>X+xIFW7=~ey{hkvj3_~UZBeB#xz<@^!sR~{L+Rh5=)Te6DR^u3+! zT2P~g5Em%s_TR1d*0Fe;BFiH;OOB^fthhFFSH`8W1st-dgs23PrhQ7 z6_04=-j6M+&-xzkeY0=o<(ZxMXRvfH_-KWeW>3fq;V{MW)` z-$lMI5kCH^WV-9o%2}^ArCfh(5VrA%)YXzyr+fa^r?=g|ua+~#@8*Pcx9S81epTN| z=)5lEnE5WkFzmlaknxFs+Z3~Y?on8?*3S4q9rK#lHuLXw*3UNdbz9$=utGo0%WbFa z{@kuL>uhfQ`(=0j?bq7Iy#-VE1j!ydH>W|cIN}-4Z>u}|mfYN6V)}`*^_F`b%f|C_ z*0yJ7^W~p>`}SYriS@Vb#JlZ8`*nXtEw}sm#wfyllJfjBI={ms55Hv2KQESlw>>QL zcgD4KB5LoAww}J4yX9E;yZFujU1F2JPW(RY{JvG2?;kIl`*n>u)2_Sk%Wo|0UuKzA znAP}KPeUhMpEIsSbk@2pYyPZp(|+AhEx-EGl1JJ0Su-;=-#5AJDX*+aoH@JdQ(LrTGv#*zVyoQdFocDLZ1pc{_z&vtJ8-uqgf zZ)xh?Uq|eZmOpvq`~B;#N2^k=dj&KGa^HJ)WDh4+s}@9nDB`Pj2lP=`NIy|rzr~i=GXj>kd&OLwb-?^)egN392ul{$%)mlpb=fxZ$XyxeI0Iefo l^(70m+7ui>1uf5i$nQUPDP+at8H}LzkEg4j%Q~loCIHHYcX$8*