From 28b6820026dea80d78e7da4d874e93fe1e79733f Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 21 Apr 2016 16:32:07 +0200 Subject: [PATCH 1/8] Clang: Print error code on parse error Change-Id: Idecb0e9b78cc14c603de09fc460bbf17f43bb451 Reviewed-by: Christian Stenger Reviewed-by: Orgad Shaneh --- .../ipcsource/clangtranslationunit.cpp | 4 ++- .../translationunitparseerrorexception.cpp | 29 ++++++++++++++++--- .../translationunitparseerrorexception.h | 7 ++++- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp b/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp index 38315719d1c..3460e6ff46d 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp +++ b/src/tools/clangbackend/ipcsource/clangtranslationunit.cpp @@ -417,7 +417,9 @@ void TranslationUnit::checkTranslationUnitErrorCode(CXErrorCode errorCode) const { switch (errorCode) { case CXError_Success: break; - default: throw TranslationUnitParseErrorException(d->filePath, d->projectPart.projectPartId()); + default: throw TranslationUnitParseErrorException(d->filePath, + d->projectPart.projectPartId(), + errorCode); } } diff --git a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp index efb3c56ff93..3cd99c53e8a 100644 --- a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp +++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.cpp @@ -27,9 +27,13 @@ namespace ClangBackEnd { -TranslationUnitParseErrorException::TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId) +TranslationUnitParseErrorException::TranslationUnitParseErrorException( + const Utf8String &filePath, + const Utf8String &projectPartId, + CXErrorCode errorCode) : filePath_(filePath), - projectPartId_(projectPartId) + projectPartId_(projectPartId), + errorCode_(errorCode) { } @@ -43,14 +47,31 @@ const Utf8String &TranslationUnitParseErrorException::projectPartId() const return projectPartId_; } +#define RETURN_TEXT_FOR_CASE(enumValue) case enumValue: return #enumValue +static const char *errorCodeToText(CXErrorCode errorCode) +{ + switch (errorCode) { + RETURN_TEXT_FOR_CASE(CXError_Success); + RETURN_TEXT_FOR_CASE(CXError_Failure); + RETURN_TEXT_FOR_CASE(CXError_Crashed); + RETURN_TEXT_FOR_CASE(CXError_InvalidArguments); + RETURN_TEXT_FOR_CASE(CXError_ASTReadError); + } + + return "UnknownCXErrorCode"; +} +#undef RETURN_TEXT_FOR_CASE + const char *TranslationUnitParseErrorException::what() const Q_DECL_NOEXCEPT { - if (what_.isEmpty()) + if (what_.isEmpty()) { what_ += Utf8StringLiteral("Parse error for file ") + filePath() + Utf8StringLiteral(" in project ") + projectPartId() - + Utf8StringLiteral("!"); + + Utf8StringLiteral(": ") + + Utf8String::fromUtf8(errorCodeToText(errorCode_)); + } return what_.constData(); } diff --git a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h index 8175fa74547..e1b949f2c9e 100644 --- a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h @@ -28,6 +28,8 @@ #include +#include + #include namespace ClangBackEnd { @@ -35,7 +37,9 @@ namespace ClangBackEnd { class TranslationUnitParseErrorException : public std::exception { public: - TranslationUnitParseErrorException(const Utf8String &filePath, const Utf8String &projectPartId); + TranslationUnitParseErrorException(const Utf8String &filePath, + const Utf8String &projectPartId, + CXErrorCode errorCode); const Utf8String &filePath() const; const Utf8String &projectPartId() const; @@ -51,6 +55,7 @@ public: private: Utf8String filePath_; Utf8String projectPartId_; + CXErrorCode errorCode_; mutable Utf8String what_; }; From bd195295d996bff545ea349efcb0364ae06ef43d Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 22 Apr 2016 14:50:01 +0200 Subject: [PATCH 2/8] QmlDesigner: Fix warning Arguments of typeid should not have side effects. Change-Id: I197ee77e0757fcb961e62fa7bdff36e7d58da12a Reviewed-by: Tim Jenssen Reviewed-by: Eike Ziller --- .../qmldesigner/designercore/filemanager/qmlrewriter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp index b3b214cce26..f7706079097 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.cpp @@ -332,6 +332,7 @@ void QMLRewriter::dump(const ASTPath &path) { qDebug() << "AST path with" << path.size() << "node(s):"; for (int i = 0; i < path.size(); ++i) { - qDebug() << qPrintable(QString(i + 1, QLatin1Char('-'))) << typeid(*path.at(i)).name(); + auto node = path.at(i); + qDebug().noquote() << QString(i + 1, QLatin1Char('-')) << typeid(*node).name(); } } From 600693af2c7ea7eb52702f8f7021b44b0bdf2b6f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 23 Apr 2016 00:46:40 +0200 Subject: [PATCH 3/8] Debug start Icon: Use the toolbar variant I missed to change these in 5e32183c9b5da75118435bc67addbd03888fab8a Change-Id: I54740576f8a5b99d3c588f759b2337601b1e8dd5 Reviewed-by: Alessandro Portale --- src/plugins/debugger/debuggerruncontrol.cpp | 2 +- src/plugins/projectexplorer/appoutputpane.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index e9cb897acd2..1717b08a87f 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -111,7 +111,7 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfig, DebuggerEngi m_engine(engine), m_running(false) { - setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL); + setIcon(ProjectExplorer::Icons::DEBUG_START_SMALL_TOOLBAR); connect(this, &RunControl::finished, this, &DebuggerRunControl::handleFinished); connect(engine, &DebuggerEngine::requestRemoteSetup, diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 3a7b605892d..f858caa65f6 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -181,7 +181,7 @@ AppOutputPane::AppOutputPane() : // Attach m_attachButton->setToolTip(msgAttachDebuggerTooltip()); m_attachButton->setEnabled(false); - m_attachButton->setIcon(Icons::DEBUG_START_SMALL.icon()); + m_attachButton->setIcon(Icons::DEBUG_START_SMALL_TOOLBAR.icon()); m_attachButton->setAutoRaise(true); connect(m_attachButton, &QAbstractButton::clicked, From fdad4bf7b044e833a6cff1f1539b17a5565cc363 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 22 Apr 2016 15:42:30 +0200 Subject: [PATCH 4/8] New file overlay icons Change-Id: Icba67a1404b6e4604aef56def00bfe2098b8c8fe Reviewed-by: Eike Ziller --- src/plugins/coreplugin/fileiconprovider.cpp | 9 +- src/plugins/designer/designer.pro | 2 - src/plugins/designer/designer.qbs | 1 - src/plugins/designer/formeditorfactory.cpp | 3 +- src/plugins/designer/images/qt_ui.png | Bin 722 -> 0 bytes .../images/fileoverlay_cpp.png | Bin 0 -> 280 bytes .../images/fileoverlay_cpp@2x.png | Bin 0 -> 470 bytes .../projectexplorer/images/fileoverlay_h.png | Bin 0 -> 208 bytes .../images/fileoverlay_h@2x.png | Bin 0 -> 315 bytes .../images/fileoverlay_qml.png | Bin 0 -> 302 bytes .../images/fileoverlay_qml@2x.png | Bin 0 -> 538 bytes .../images/fileoverlay_qrc.png | Bin 0 -> 287 bytes .../images/fileoverlay_qrc@2x.png | Bin 0 -> 509 bytes .../projectexplorer/images/fileoverlay_qt.png | Bin 0 -> 263 bytes .../images/fileoverlay_qt@2x.png | Bin 0 -> 432 bytes .../images/fileoverlay_scxml.png | Bin 0 -> 297 bytes .../images/fileoverlay_scxml@2x.png | Bin 0 -> 506 bytes .../projectexplorer/images/fileoverlay_ui.png | Bin 0 -> 275 bytes .../images/fileoverlay_ui@2x.png | Bin 0 -> 327 bytes .../images/fileoverlay_unknown.png | Bin 0 -> 226 bytes .../images/fileoverlay_unknown@2x.png | Bin 0 -> 296 bytes .../projectexplorer/projectexplorer.qrc | 16 + .../projectexplorerconstants.h | 10 + src/plugins/qbsprojectmanager/qbsnodes.cpp | 2 +- .../qbsprojectmanagerplugin.cpp | 2 +- .../qmakeprojectmanager/images/headers.png | Bin 210 -> 0 bytes .../qmakeprojectmanager/images/run_qmake.png | Bin 1903 -> 0 bytes .../images/run_qmake_small.png | Bin 804 -> 0 bytes .../qmakeprojectmanager/images/sources.png | Bin 343 -> 0 bytes .../qmakeprojectmanager/images/unknown.png | Bin 407 -> 0 bytes .../qmakeprojectmanager/profileeditor.cpp | 3 +- .../qmakeprojectmanager/qmakenodes.cpp | 17 +- .../qmakeprojectmanager.qbs | 12 - .../qmakeprojectmanager.qrc | 5 - src/plugins/qmljseditor/images/qmlfile.png | Bin 254 -> 0 bytes src/plugins/qmljseditor/qmljseditor.pro | 2 - src/plugins/qmljseditor/qmljseditor.qbs | 2 - src/plugins/qmljseditor/qmljseditor.qrc | 5 - src/plugins/qmljseditor/qmljseditorplugin.cpp | 3 +- src/plugins/qtsupport/images/forms.png | Bin 554 -> 0 bytes src/plugins/qtsupport/images/qml.png | Bin 171 -> 0 bytes src/plugins/qtsupport/images/qt_project.png | Bin 527 -> 0 bytes src/plugins/qtsupport/images/qt_qrc.png | Bin 397 -> 0 bytes src/plugins/qtsupport/images/statecharts.png | Bin 426 -> 0 bytes src/plugins/qtsupport/qtsupport.qbs | 5 - src/plugins/qtsupport/qtsupport.qrc | 5 - src/plugins/qtsupport/qtsupportconstants.h | 3 - src/plugins/resourceeditor/images/qt_qrc.png | Bin 590 -> 0 bytes .../resourceeditor/qrceditor/resourcefile.cpp | 3 +- src/plugins/resourceeditor/resourceeditor.qrc | 1 - .../resourceeditor/resourceeditorfactory.cpp | 4 +- src/tools/icons/qtcreatoricons.svg | 337 ++++++++++++++++++ 52 files changed, 389 insertions(+), 63 deletions(-) delete mode 100644 src/plugins/designer/images/qt_ui.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_cpp.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_cpp@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_h.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_h@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qml.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qml@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qrc.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qt.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_qt@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_scxml.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_ui.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_ui@2x.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_unknown.png create mode 100644 src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png delete mode 100644 src/plugins/qmakeprojectmanager/images/headers.png delete mode 100644 src/plugins/qmakeprojectmanager/images/run_qmake.png delete mode 100644 src/plugins/qmakeprojectmanager/images/run_qmake_small.png delete mode 100644 src/plugins/qmakeprojectmanager/images/sources.png delete mode 100644 src/plugins/qmakeprojectmanager/images/unknown.png delete mode 100644 src/plugins/qmljseditor/images/qmlfile.png delete mode 100644 src/plugins/qmljseditor/qmljseditor.qrc delete mode 100644 src/plugins/qtsupport/images/forms.png delete mode 100644 src/plugins/qtsupport/images/qml.png delete mode 100644 src/plugins/qtsupport/images/qt_project.png delete mode 100644 src/plugins/qtsupport/images/qt_qrc.png delete mode 100644 src/plugins/qtsupport/images/statecharts.png delete mode 100644 src/plugins/resourceeditor/images/qt_qrc.png diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index 3b72700c9f7..1d89aeef9a2 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -155,11 +155,10 @@ QIcon icon(QFileIconProvider::IconType type) */ QPixmap overlayIcon(const QPixmap &baseIcon, const QIcon &overlayIcon) { - QPixmap iconPixmap = baseIcon; - QPainter painter(&iconPixmap); - painter.drawPixmap(0, 0, overlayIcon.pixmap(baseIcon.size())); - painter.end(); - return iconPixmap; + QPixmap result = baseIcon; + QPainter painter(&result); + overlayIcon.paint(&painter, QRect(QPoint(), result.size() / result.devicePixelRatio())); + return result; } /*! diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index 0a35709c9db..6c6cd5f900e 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -46,6 +46,4 @@ equals(TEST, 1) { DEFINES += SRCDIR=\\\"$$PWD\\\" } -RESOURCES += designer.qrc - DISTFILES += README.txt diff --git a/src/plugins/designer/designer.qbs b/src/plugins/designer/designer.qbs index fe007e8c968..ae6a9a996bd 100644 --- a/src/plugins/designer/designer.qbs +++ b/src/plugins/designer/designer.qbs @@ -29,7 +29,6 @@ QtcPlugin { files: [ "README.txt", "codemodelhelpers.cpp", "codemodelhelpers.h", - "designer.qrc", "designer_export.h", "designerconstants.h", "designercontext.cpp", "designercontext.h", diff --git a/src/plugins/designer/formeditorfactory.cpp b/src/plugins/designer/formeditorfactory.cpp index 4f611ad42a2..1fa9bc648d4 100644 --- a/src/plugins/designer/formeditorfactory.cpp +++ b/src/plugins/designer/formeditorfactory.cpp @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -45,7 +46,7 @@ FormEditorFactory::FormEditorFactory() setDisplayName(qApp->translate("Designer", C_DESIGNER_XML_DISPLAY_NAME)); addMimeType(FORM_MIMETYPE); - FileIconProvider::registerIconOverlayForSuffix(":/formeditor/images/qt_ui.png", "ui"); + FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_UI, "ui"); } IEditor *FormEditorFactory::createEditor() diff --git a/src/plugins/designer/images/qt_ui.png b/src/plugins/designer/images/qt_ui.png deleted file mode 100644 index f4b723482a7fe1fcbcd2ea752496201657ddf657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toW_r3fhFF~L4UYE+P86}f z|87=!=C-RnVHR(4w{B;uHfWh*AipexhmBSH==1|2RcG2c#6^Wu#8TQ8d^x_L#dGtn zoh?_`WnWyn>7YD~^YgK5cb@&L{J-XX^zKb*j`kLFihu6A|9(#K`JWRmX0Y&Z)j6N2 zl$y;H%@fUb`<}nC56hV@Q})MLjgWkq31_7-8_?Ky#DgbLwE1q4d*#2{l#wY z(|vpYZ{4x+WUK;HbS2Bmt~ciAKSwfdjpE(9+@CY`WBS&jqffhqAN$St;`09CV%N%T zg^mq1N*|91b-IKlyjsk?P&E7WyG_Za-kX&_e97%NdNk_fOdlbQEfqF=UQ30ls^2mF zN_uB*dJ&EgUE$TMx$GDc3ri21v&ExEIP|5giIj^ceBC$^S0 z=I5N!^lj!ip{n%Ka;_iq@j{0{k8fA6*2TpIUEFG5$&mfpb4IK!kNWC!ch1PG3qIfs zT%{z|-RQM+66@an+-S*PR}XzzP^NrpbMog?=H*pvf}iXD1TH*aW;xTxNzhl>i_Nqq zV`cJ9W44RF6Kl=a@3?pI=Jf*~B{h!72On4#^`WA~ZvOhWcNFDAWGp{^{(0n1^Xj>O z^}D{WsLWhr%_87*G-AoYw`JR__Qvs^-o)O^Ecl=O`sr`&=|?|4eJVQdk9g)rE>^x9 zZ@+mvJ3H%IT=Qn{?d|n%T4*55!7}Mm+!O8xo;lnpI%20cxGi4!>G$8NJIDGzefs2( znfa3Auz{xL=7R|fHi-WVbCj5_6BZU`78)MD{h{6U4?=IfmIgiXP5JcA`A0antJ&<{ jJ=;9aaajED|HBlMwdQ2|2{9!G1_lOCS3j3^P6QUVDRyDaSV|NPfn2VIB@9X@zY&r z#095Md+I3kVA>P`VKE^gp(hDV92_S)n06L9oaj?gU}yRxz^JD=K}a!=0lami{G4xllGQOEr_JV{HHPa_Wjql zAHQC_{rKe7yUTZ_4xH~>zNd2fhRPWm^CzxK=~xooINz&eic{_c=e&t_ zS$(F-9mYxR#>wpl32l0DElJ@mCm0wQ%u9m&f*II^RW)_>3=B=o+`J;A3+q}syL$R& zEL*v0>$dGXcJAAM@Ziy7r%qkDa`(xT=da&>`TqUKpTB?qwFjR)#lXO@%+tj&#Nu>v zf&}YfQG+6GuM?hK8y-wb7Y%1%woH5TDQ6ScsaaLO+?H`M-8d^A9$;?9&dBPyhO0s( z)|}uvBFc02>H;B$>;n<=m^~YNnmTt1&0=Cr z6k%N!!1}CUfkJCiE8`U|87_yuD{kAJINHr0_N5$`3ouYP->tkt(ZQ=l*gZwF<6&=} gWnrCK)-pwgW5TL!75z+|3=9kmp00i_>zopr01u!2ga7~l literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_h.png b/src/plugins/projectexplorer/images/fileoverlay_h.png new file mode 100644 index 0000000000000000000000000000000000000000..8b2d16522a9731ac7b278676eccc99613eb8f464 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7rhB?LhFJ8zooL8)C_uoa zUE#)mE!SN!2lT{G6n^2eY+t%uAZ+87&Hjm^th4!#c{P7pBQkM;edbqF?%k&iHf#U= z$=YCOz^+!yx~7Qlz^!M24aXh?GBPhau%f#;^r=j{j`iEiUy5|PbPZnX6qwyMN!@wx z=ttg&eYby~GB}^@xhPX@vo9BZFFq;C{!+KKeSz;cfgdW<7#J8B NJYD@<);T3K0RWS~Q-J^g literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_h@2x.png b/src/plugins/projectexplorer/images/fileoverlay_h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5cc5bc677dbc5ff76d6b725b29d1bc1fd50a2635 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG5(0ceTp1V`{*w!SUAy*U z_wG+qr+%I><3oM@+l-7iad9sl9bZ^jJk!>Grla#%Na)MTgxL%X4DuyGe!&c!T)e_b znFYmVO|up*S-)}9_Fel=oV$Mg?&D|gKYjZqRWP@dfq^00)5S5w;`H0|Cxsjg1Y9r9 z;8e2tJmvp?ZzoadOzG5xcXH<+%|7 literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qml.png b/src/plugins/projectexplorer/images/fileoverlay_qml.png new file mode 100644 index 0000000000000000000000000000000000000000..ff9d07640179460abcc94ef8a989c33b520a76d1 GIT binary patch literal 302 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUiPxvVY1_s5FAirP+LA|W9n&ys~%QkJ@wr$7mz55RwJ$~xpqet()|M>O$ z&)Eak75uThN!P3w=T{5&Gej>kz(WXxw9Gp%KixdJHVtw4a0s{i0 zf}&)U4(O`$q-b<$b)0ez^*EuW!F5RC29KUa_(b6(tNBV-0{qlE7-loDpGjkQ$HLC8 URl4dV0|Nttr>mdKI;Vst09HDb{Qv*} literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qml@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qml@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e67599f0029cc365203fca06f20d9ee3fc62c1 GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG&II^`xH2#>{HHPa^Y7pP z|Np=L{{8X$ug^bzz5e?B?bq*bzkR>({LP6+FOEHYe(3(Qy?37Mzw>0qiOZ9ZUn1UgU~n!8@(X6*;+2xq(Kqmk$uB6XZRzfvuxRnp73()_+_Yuuj$OO= z?%Tir;Gsi@4<9~x`pnsL=Wg75^!Vx1XV2b!`1tATkDtGO|M~mx{)TOR3=9mrJY5_^ zEd1Y2NEd1{5O7P*j}R2??OL7me($1pf8VPxvNccPelh!|{LgQ`Wx`JX{;*6`TAO~D z(TT6*5~CBZfFqZ{EuW02_6)Zr51hmgyit!fm~&=1v%TWNlJEK{8$MJ->VJ7v>?9ZV z!$$VpvV@IKTi9X>b7DJp%#kcD<|voB*|d3$ptXzd<(k$Vmu}mpEHYg#o^@p(b_64(k`Q6XHW8L7a$I!^Yz`)??>gTe~ HDWM4f)5kto literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qrc.png b/src/plugins/projectexplorer/images/fileoverlay_qrc.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c501397d091c4f0b447d61fe111f5c07bfb108 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUmdK II;Vst006*+761SM literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qrc@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0133e39f31661983612f7dc28dba49737f035d69 GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG_6GQbxH2#>{HF%^@%{U+ zA3shX+;wXIj?If_ZCp5g{k*BGX7x>}FPzp;G_A2@N?l=dc2rYlWU9Mynul?slU|au zeu|4>f}?hvtwyY^MxdTVpuR+au2`U+c%Z(-vZ<7EC*_ z+Wg7=+fN_ddG_$`i^mVLk^^HH7#Ivng8YIR1XWE;&Ew(|Tid#Odi!S2*|d4f)@{4@ zA3S*O{I%;hZa#eY@X?ExU%!6)_U-$Rpa1^NQMfjjfq`Mar;B5V#p$;bkMlJ-Ft~&} zx*lzNapUN{fMZ?jp8mH#-L0~t!06$#-TTUCq_q5)Eb+35l_AVd_Pw!hO-9|`f B5oZ7Z literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qt.png b/src/plugins/projectexplorer/images/fileoverlay_qt.png new file mode 100644 index 0000000000000000000000000000000000000000..5db696e64fb2408e2a44e4634ecbf147399b53f9 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUQW7hqC0EL*u2olCt5JEjy5W4|%$u`j-JCu9=A1=$7Vmz# z=lt6XcRt;D_U-xeZ!cbad-?a@U*FSevLF|f1o;Is`1l9z+kf!b@o(S1f4^C6bA^F{ z!N=3ZF+?IfIYA<(VPdN&(}EhcGQYUEIL5fR84TRhS8S13&*RiEHN4H=Ey7PMlp(aW zW6P2SEh7BfF%8qhJ?6}x-OQ=Rz?8E_=L`?S*EP)7w*G6-Vqjok@O1TaS?83{1OP~J BbVC3D literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_qt@2x.png b/src/plugins/projectexplorer/images/fileoverlay_qt@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a078e4ab1c06b1e16dcbb3c38c06f7fab0a93c61 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGwgmWuxH2#>{Kp2W&Q@2Q zs})}%C9y(UVYRZ-8dbHm8tUt`v^VJKZZOc>XrRB*&}@sP!*-|O{h^TuW1Y<(nUG-uig!_Q%_IKHYir<p?|Nr2kHN6ZB3|u8ae!&b5jxKxl?muz={`Pu_8U_Z2g`O^sAr`%FFS?60 z8Hlt#?2!1H^q#ePje=NGy=+kNG-`WqLvd}W+tk-dZW zmo#UlL-*!we!GZSW}T3OW&+oBQMH0S8VCBM+3p|yR(pFI(`m*z!Da_;{`&9IvLr#v zLOeU+bJV&e3rv&We3MJ~A`rLT>#GQd`ImRKSE{!z$PQ{aSuArWME#@q)Wy+SLZThN a+3$)8XP?TsFpGhKfx*+&&t;ucLK6UA&F2CD literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_scxml.png b/src/plugins/projectexplorer/images/fileoverlay_scxml.png new file mode 100644 index 0000000000000000000000000000000000000000..6e51f6234916670a0a54fad6803cc2a893548be4 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUtIk~t%HnOp?`TF`cG&DRgIdq4C zfkC~S3yt5M6%)r2q;OXKRA|bi< zAU9u=fq?5p_ER1gySZNcc>Sh+=CLK2yBN-2-2bI)OC0ZRd$Zu=s(ta3rMA`PEpv0f zu+sIzWHwQj?)3P{UBM61)7+2RDKSfi{y1|qaBA53I@wTOPK!57^!MFj`FCzt=TQa* O1_n=8KbLh*2~7Y(;EqcG literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png b/src/plugins/projectexplorer/images/fileoverlay_scxml@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..275b100ee5a975bd7577d523d1ca7d4fd8ed54cf GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG<_GwMxH2#>{HGrH{{8!p zA3uKm`n7lO-u?UcA2@Je*REar_U)TDZ{Ga*^XJT&lai8>nwpxHmX@8Jotc@Lm6atT zA|fg(DkLN%EG!%l5D*v`2y!zoudlCfLqo%C=xNKY#xHdo$j@oPmMirl*Tz zh{fr*7yb%0I*70q+;>@c!m5*F;`)N>|LK?WW+vX6Ene{N=FGeI&+M(v+FHNwvO$hw z&f-NsLol}D;^&#VHxnK1 zGF=kc@G2+Ra>WWG_V+vbZmwa8^s&8hgfmcRJ%c;P z^8WHAEWac@f)~{|S57q7)D8aF&rtvO_wwP-(QNzEzMc19m*aAIkE9fL%fbKu|DVD4&g^ujZ%!h;7*xG`5czDDmBqi$~ c6&o^KFxd6df9h!y1_lNOPgg&ebxsLQ0GR-Tk^lez literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_ui@2x.png b/src/plugins/projectexplorer/images/fileoverlay_ui@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..918bec031895b2f736a8808176cd1dd370f8b4b2 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGG6Q@Z1X}H7#I{wg8YIR*k$C+gCgS-(sDaGdv@&KfBf?G>o@M)y?_7V<0sFb zzyJ5;1e+EE14E9di(`nz>9=Ry#TpDaSOVT0^UB$%eeeH-V|ynsztH*lS)#$dZ^@~L z9bVrGr%7GwycX5zx23@T&AyFwW-~tgZd*66e39gF$4|=@t$pQ7?>`jCytyzV_4}&W u5{{2Itj=1ebc9N>uW_E&dhhmMwgu~j@(vvSmd(Jxz~JfX=d#Wzp$P!QUFVdQ&MBb@0OJE;)Bpeg literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png b/src/plugins/projectexplorer/images/fileoverlay_unknown@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d7616e162479f05a1035c3f94f9d803e91717054 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGYyx~jTp1V`{^JHOU%q_v z=1pp9YI1V2udi=vYHCJC#`WvhZ{EE5?AbHr^tGJ~3=DiFL4LsumUfP=tJmz=yZ`9X zFJEWxiQ2=!z|iaI;uvCa`t2oez6J#zmVo*NUxTmQ`@b$qKzQK-L%q3EyPx}Th#ZwS zT*@XLtJ=_{oU6;suw~}2btjo*+BY0tuPmf^uG(GU&o1U{opVLpCpx`Yw3)?}S1{}- z-CV(?(D2uPGV7gOF{OXg7`rW*|9IYGny&BgX-5CS!s1tKFM{^0S@B2FVt)3Xy4s@a bUwO5~#G9W?-Ey0Ofq}u()z4*}Q$iB}78QpF literal 0 HcmV?d00001 diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 15513cd5645..865483c57d2 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -69,5 +69,21 @@ images/targetchangebutton2@2x.png images/desktopdevice.png images/desktopdevice@2x.png + images/fileoverlay_qml.png + images/fileoverlay_qml@2x.png + images/fileoverlay_qrc.png + images/fileoverlay_qrc@2x.png + images/fileoverlay_qt.png + images/fileoverlay_qt@2x.png + images/fileoverlay_ui.png + images/fileoverlay_ui@2x.png + images/fileoverlay_scxml.png + images/fileoverlay_scxml@2x.png + images/fileoverlay_cpp.png + images/fileoverlay_cpp@2x.png + images/fileoverlay_h.png + images/fileoverlay_h@2x.png + images/fileoverlay_unknown.png + images/fileoverlay_unknown@2x.png diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index f0e866916ed..d09a5b65aaa 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -263,5 +263,15 @@ const char DEBUG_RUN_MODE_WITH_BREAK_ON_MAIN[]="RunConfiguration.DebugRunModeWit // Navigation Widget const char PROJECTTREE_ID[] = "Projects"; +// File icon overlays +const char FILEOVERLAY_QT[]=":/projectexplorer/images/fileoverlay_qt.png"; +const char FILEOVERLAY_QML[]=":/projectexplorer/images/fileoverlay_qml.png"; +const char FILEOVERLAY_UI[]=":/projectexplorer/images/fileoverlay_ui.png"; +const char FILEOVERLAY_QRC[]=":/projectexplorer/images/fileoverlay_qrc.png"; +const char FILEOVERLAY_CPP[]=":/projectexplorer/images/fileoverlay_cpp.png"; +const char FILEOVERLAY_H[]=":/projectexplorer/images/fileoverlay_h.png"; +const char FILEOVERLAY_SCXML[]=":/projectexplorer/images/fileoverlay_scxml.png"; +const char FILEOVERLAY_UNKNOWN[]=":/projectexplorer/images/fileoverlay_unknown.png"; + } // namespace Constants } // namespace ProjectExplorer diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp index f7745f42448..dd16988bd8d 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.cpp +++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp @@ -809,7 +809,7 @@ bool QbsProjectNode::showInSimpleTree() const void QbsProjectNode::ctor() { if (m_projectIcon.isNull()) - m_projectIcon = generateIcon(QString::fromLatin1(QtSupport::Constants::ICON_QT_PROJECT)); + m_projectIcon = generateIcon(QString::fromLatin1(ProjectExplorer::Constants::FILEOVERLAY_QT)); setIcon(m_projectIcon); addFileNodes(QList() diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 2bd00069782..e31de7cec70 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -94,7 +94,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString * const Core::Context projectContext(::QbsProjectManager::Constants::PROJECT_ID); - Core::FileIconProvider::registerIconOverlayForSuffix(QtSupport::Constants::ICON_QT_PROJECT, "qbs"); + Core::FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QT, "qbs"); //create and register objects addAutoReleasedObject(new QbsManager); diff --git a/src/plugins/qmakeprojectmanager/images/headers.png b/src/plugins/qmakeprojectmanager/images/headers.png deleted file mode 100644 index c26269004fb7910c404018113f1ac295878584a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFqC+@IEGZ*O8WEvzdf^RLuaFtK^DVY-h{R!kpoUk zp2?Ziacb%@-2UYfu|uNe|GtWYd{4LzABjBirAl>WTtl;YV`JU^{JWEwH|}I&_Marf zZS(Tw@*`#M=P@VMNAJHkCq=xVqGC_NvmdKI;Vst0Fc{G4gdfE diff --git a/src/plugins/qmakeprojectmanager/images/run_qmake.png b/src/plugins/qmakeprojectmanager/images/run_qmake.png deleted file mode 100644 index b5aa4345c3cb75ae4fb8a388ba3b86feb697f47c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1903 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 Pfq}u()z4*}Q$iB}mnn43 diff --git a/src/plugins/qmakeprojectmanager/images/sources.png b/src/plugins/qmakeprojectmanager/images/sources.png deleted file mode 100644 index c03a8c45f428a6716294ce5a2d4182f1be8d5aa9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 343 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztF#Pm%aSW-rmGtNTe|u)thR#MOgRBD^3>sMb=jaRE zR{r>&;UiBHFUQWR?@ROV@0#p*e*d3mf)5h@&3w3U|IKp&6B+LcxXF0#R9}_pDrPQy z`urY;?%ZJWxkdHAzluM9)z*>iu(Mf1%aLtC;ym;B_Wp+F=Y08p>g;jvh8kmqcZ`oN zJM6i=zVvjxfV^As=R^KxV$B-^%zVuxv_X4TFwgRh zI~ZE3-vr;PI}+ko|L@`B>n8(6gX7oTsC>kKLNse(Xu|A7lXV6ick4fOmA~B*`tN)E yzK0V;p8UT%Pk86St5N;}8s&nKiVh8o48^sJ86@tV{(JaZG%Q-e|yQz{EjrrIztFj{)LIEGZ*S~A(Nt2scR?YX3AknRj^j-NaO2W0oP4q)?Ys#>M-y5okE$2X|6TPGr8Il54Sb#?dH=wjA+>>62A{UQhldn85Jnka(c~iT9Qa3=9mO Lu6{1-oD!M<17@td diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index 54878d3b080..81602ab6d1a 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -201,7 +202,7 @@ ProFileEditorFactory::ProFileEditorFactory() addHoverHandler(new ProFileHoverHandler(keywords)); setSyntaxHighlighterCreator([keywords]() { return new ProFileHighlighter(keywords); }); - const QString defaultOverlay = QLatin1String(QtSupport::Constants::ICON_QT_PROJECT); + const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT); Core::FileIconProvider::registerIconOverlayForSuffix( creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay).toLatin1().data(), "pro"); Core::FileIconProvider::registerIconOverlayForSuffix( diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 63b4319de0f..18c009e6737 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -94,19 +95,19 @@ struct FileTypeDataStorage { static const FileTypeDataStorage fileTypeDataStorage[] = { { HeaderType, Theme::ProjectExplorerHeader, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Headers"), - ":/qmakeprojectmanager/images/headers.png", "*.h; *.hh; *.hpp; *.hxx;"}, + ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"}, { SourceType, Theme::ProjectExplorerSource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Sources"), - ":/qmakeprojectmanager/images/sources.png", "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" }, + ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" }, { FormType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Forms"), - ":/qtsupport/images/forms.png", "*.ui;" }, + Constants::FILEOVERLAY_UI, "*.ui;" }, { StateChartType, Theme::ProjectExplorerForm, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "State charts"), - ":/qtsupport/images/statecharts.png", "*.scxml;" }, + ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" }, { ResourceType, Theme::ProjectExplorerResource, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Resources"), - ":/qtsupport/images/qt_qrc.png", "*.qrc;" }, + ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" }, { QMLType, Theme::ProjectExplorerQML, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "QML"), - ":/qtsupport/images/qml.png", "*.qml; *.qml.ui" }, + ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" }, { UnknownFileType, Theme::ProjectExplorerOtherFiles, QT_TRANSLATE_NOOP("QmakeProjectManager::QmakePriFileNode", "Other files"), - ":/qmakeprojectmanager/images/unknown.png", "*;" } + ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" } }; class SortByPath @@ -171,7 +172,7 @@ QmakeNodeStaticData::QmakeNodeStaticData() } // Project icon const QString fileName = creatorTheme()->imageFile(Theme::ProjectFileIcon, - QLatin1String(":/qtsupport/images/qt_project.png")); + QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT)); const QIcon projectBaseIcon(fileName); const QPixmap projectPixmap = FileIconProvider::overlayIcon(dirPixmap, projectBaseIcon); projectIcon.addPixmap(projectPixmap); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 43d82e38d17..5235c5ecaeb 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -69,18 +69,6 @@ QtcPlugin { ] } - Group { - name: "Images" - prefix: "images/" - files: [ - "headers.png", - "run_qmake.png", - "run_qmake_small.png", - "sources.png", - "unknown.png", - ] - } - Group { name: "Wizards" prefix: "wizards/" diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc index af8684afce3..11ce77ba611 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc @@ -1,11 +1,6 @@ - images/run_qmake.png - images/run_qmake_small.png QmakeProjectManager.mimetypes.xml - images/headers.png - images/sources.png - images/unknown.png images/dark_headers.png images/dark_sources.png images/dark_unknown.png diff --git a/src/plugins/qmljseditor/images/qmlfile.png b/src/plugins/qmljseditor/images/qmlfile.png deleted file mode 100644 index 61ec42e363421a986ed2690bd9b8662405498f73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7j(WN{hFF|VPLN=A=GjyA zHS6na^Zc;?e|{F5`ni@p43~JaM&Cf - - images/qmlfile.png - - diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index c8dd189dc65..adb409377b2 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include @@ -186,7 +187,7 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e errorMessage->clear(); - FileIconProvider::registerIconOverlayForSuffix(":/qmljseditor/images/qmlfile.png", "qml"); + FileIconProvider::registerIconOverlayForSuffix(ProjectExplorer::Constants::FILEOVERLAY_QML, "qml"); registerQuickFixes(this); diff --git a/src/plugins/qtsupport/images/forms.png b/src/plugins/qtsupport/images/forms.png deleted file mode 100644 index 72d1549b58ad2185e4b6c91defd0aba15a0627bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFrM*raSW-rmGtNTe|u)thR#N(15J7g`sWUQ`0$j! zNveFS0k`e1%qi~ExEp4jouOKr?-N&ccv>q&yQO-Pd?pLv(u#{V%^-BgB!k{P;c8lf99mdSNjCI zj%|vMpEq+(q~xp9nrn_0{e0onR(##wXoKg@`|Mfwx{Re3I(+=U|Gr!JwzSGkpR_i{ zSlRSHy!qOm=lHvh+W5Vtr+oHszWgRsEO52#ea7<7`D}U9yd7rS*ZexX;j7N^{qt6O z^Pf0zs(ev~19z^S0^i^7->*-UmVW$Sf0e)wd&S=G@E`LPGn&-u=+UYux zn^tY!{Q3XdqiO&7&zAgqpLgtk`rB1Ye{aZSOLWUfyTp)mHF9&Bt4-}MlUGkqPv>Fh zlS!~B{BxsFOl;b5n>{rTPk726=AJiiUiQ+ZOaCh;r>8$Jb=aw}z+0l=X5XWxo}QjP z?)`En|NZ^_eR@yN8R5dhkN)la^84!k|NDDhfz^MW&CMR&T?|Y-3`dSzS1zgBqshR) Oz~JfX=d#Wzp$P!NWDD~E diff --git a/src/plugins/qtsupport/images/qml.png b/src/plugins/qtsupport/images/qml.png deleted file mode 100644 index 1478cf94550bd54190804d300f7e8245a92b3e19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7iacE$Lo7}wCrGd^ZeaTG z|NnnIfn_Hex(}WFZ|I}Knk?~QP2SZ$Z=po>|nrNVEQ<)Q7_3t*i>p6L=4}O@6|44$rjF6*2UngFEKKWYE~ diff --git a/src/plugins/qtsupport/images/qt_project.png b/src/plugins/qtsupport/images/qt_project.png deleted file mode 100644 index d067c8a0516e8902ad58385444e10e50db0eac03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 527 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7uX(yShFF|#4Yu`Wb`+3J z-Xq}XA;sF=(JFMQ^GBmpXUBzNSAtD zm4ysj+gE6HnFXWb62^`` z%Pj#KU!K=UakMbSXm>GP%($ZBa{l?}3&!{Jd>h#PCbbvLvTM3}^Xu}>Up`vjo^(Vq z(JbTHMeFOFN1tTJGcz`|Gshk{aK8Cp-t`Ilckhpzn$atiym$Ik?l}(EON%p_AIAoq z*!x3b2XC=ns?;>~a39v-+rkB#>)Cf-H+p0;TS35i@eu_jtErb}nhWDxMMlI#0JeADDMdUW1*(h+0sKOQ{! zn5YHkRr?igOCDWkl}?x=oDr(&# diff --git a/src/plugins/qtsupport/images/qt_qrc.png b/src/plugins/qtsupport/images/qt_qrc.png deleted file mode 100644 index 961e3e1a4ee7ddf8a8f510715ffb001ea875c46b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7BuiW)N`mv#O3D+9QW+dm z@{>{(JaZG%Q-e|yQz{EjrrIztFzS1{IEGZ*O8WEvzdf^RLuaFt0S`~YLDj^?r#tjm zxN_Z8W^Lf^i}@GNdPu?7VVBg*wv~xTgnL7amtTAR=H9+Le@-60?G^FlJLAU^u^K&w zOue%vVL^f4m_LjA%|9kEdD_7bzkh4D6{nxG+UmFWV8eBW31_{y_VLvJ`;+|RcYou< z!_)us$j8Mc{`mM+w0Vn#v`42f_ridGA3y6yd|v+%hWA3mB}_&Br)lr-*HbZo8m_PEuZ+#4HB_x$}b|KaEK1&sCojrY|2=3bJ* ze$Jp_nM=T*RHlvW9mNmzl$#rkV*c_4STS%IFz~j`O}-PxTFk(}z~JfX=d#Wzp$P!D CowCUQ diff --git a/src/plugins/qtsupport/images/statecharts.png b/src/plugins/qtsupport/images/statecharts.png deleted file mode 100644 index c8a418f4de2b8ba20388eb8ab42d32d4e4571151..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^PXNr}OT51_lPs z0*}aI1_o|n5N2eUHAjMhfq}im)7O>#0V5xu1n);_HGc*MMsrUW#}JFtb0^t*9}W;X zTEBhUtAtR2vlA9vIC|Fe58qFLKCi-(Z^kRC7b=vBs)w^H%d#$=EZU{o!PiyKC3d?) zcGi*f*&QDbJpNSiUhbXcbFKvv0ilY_MTx?zPSr0IWQdKK(ZR`^dK^Cf890rF_`o9-?IfjKP*Uk=W<8=8CSdAjPF~nP8Afs%yBO+ zeu;&xu=Ms6-@d8`yY#l@s{bm8jrNwQb#dAmv+Qo3FbiYf - images/forms.png - images/statecharts.png - images/qml.png - images/qt_project.png - images/qt_qrc.png images/dark_forms.png images/dark_qml.png images/dark_qt_project.png diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 551e201c2e3..421421a2640 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -59,9 +59,6 @@ const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile"; const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop"; -// Icon: -const char ICON_QT_PROJECT[] = ":/qtsupport/images/qt_project.png"; - } // namepsace Constants } // namepsace QtSupport diff --git a/src/plugins/resourceeditor/images/qt_qrc.png b/src/plugins/resourceeditor/images/qt_qrc.png deleted file mode 100644 index 2b0fea75030469ad6e9b72775a93cd0fdc37a687..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!toL_J*`LoEDTC;Dax2MQej z-+C)sh~IZuSKhl07gxGf2p6w%YF5e~X??y{l$+t+8_c=l^H-RL;GaA@YB7jNbOwXG&uY z%Recc-emFP_T!HhN)u1mE7~0>oD-X5m+Y-Jxvs$4gL{Ew%B*D^9IZ~(PAmtuy`6Su z&-&}Hl@!Ff6ZNwhH_VuOG{#YD>Z89u&-|Tu^W*E!cm3sJ{y4M^m zOcPW%#o2a=$M3l-AvLY)UCh3ZHN2M>w@$S=l*>40YuIW<37({%cTZpT{`5z4pZZ6k z^P4X(b}D&h@oui|#g7F)yQ4)JPH$py2n}USd?5WZGtK7a_4+5@S_EuQpGkOfNpwb( z;C#E9J=R};ytcHG`@;AqPjBwgH$Ts7|838YU2L7D^>@Xlr%swr7GCdq!CSsD=RiFZ zv&HUkPUagWhs7SXg}Hf_257B2yyZu??0VMQ3}Vu455G4(Z?^qyP*}`%cG|q?uh(nd zGiy!t@-F)}Us_FVy`1yn#Lk|6vATqu9n&9e)1DC>bDOcC%>T}xmZHeT2|@w#W}>eg zkBZnTaHnw+3NZt9)z`(%Z>FVdQ&MBb@05H)K Axc~qF diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp index ef15fe66604..d034a0556c0 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -547,7 +548,7 @@ ResourceModel::ResourceModel(QObject *parent) : QAbstractItemModel(parent), m_dirty(false) { m_prefixIcon = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon, - QIcon(QLatin1String(":/resourceeditor/images/qt_qrc.png")), QSize(16, 16)); + QIcon(QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QRC)), QSize(16, 16)); } void ResourceModel::setDirty(bool b) diff --git a/src/plugins/resourceeditor/resourceeditor.qrc b/src/plugins/resourceeditor/resourceeditor.qrc index 2a1816f1cba..9d6b792e035 100644 --- a/src/plugins/resourceeditor/resourceeditor.qrc +++ b/src/plugins/resourceeditor/resourceeditor.qrc @@ -1,6 +1,5 @@ - images/qt_qrc.png ResourceEditor.mimetypes.xml diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index de7c80d82e9..d4707e3f694 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include @@ -46,7 +47,8 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) : setMimeTypes(QStringList(QLatin1String(C_RESOURCE_MIMETYPE))); setDisplayName(qApp->translate("OpenWith::Editors", C_RESOURCEEDITOR_DISPLAY_NAME)); - Core::FileIconProvider::registerIconOverlayForSuffix(":/resourceeditor/images/qt_qrc.png", "qrc"); + Core::FileIconProvider::registerIconOverlayForSuffix( + ProjectExplorer::Constants::FILEOVERLAY_QRC, "qrc"); } Core::IEditor *ResourceEditorFactory::createEditor() diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index f9055648a59..90bc06669c5 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -5048,6 +5048,343 @@ transform="matrix(0.5,0,0,0.5,285,189.5)" width="100%" height="100%" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Mon, 25 Apr 2016 08:53:17 +0200 Subject: [PATCH 5/8] AutoTest: Fix marking for removal by file Was forgotten in ed6f4133e8b8cae72aaae8ad29af425d5e910cff. Change-Id: I2cdf06b6872e1ae80a7039d0d15593af37b1c5fa Reviewed-by: David Schulz --- src/plugins/autotest/testtreemodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 4701e126a66..9b5d59258ff 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -638,7 +638,7 @@ void TestTreeModel::markForRemoval(const QString &filePath) for ( ; grandChildRow >= 0; --grandChildRow) { TestTreeItem *grandChild = child->childItem(grandChildRow); if (grandChild->filePath() == filePath) { - grandChild->markForRemoval(true); + grandChild->markForRemovalRecursively(true); } } } From 26ba9e62f36871c71df8ed54509d22b9c19d0c56 Mon Sep 17 00:00:00 2001 From: Riho Pihlak Date: Sun, 24 Apr 2016 15:28:02 +0300 Subject: [PATCH 6/8] UpdateInfo: Fix checking for updates Checking for updates failed when MaintenanceTool printed out log messages. MaintenanceTool is expected to print out only xml data. So, parsing the output failed. MaintenanceTool printed out warnings about SSL and Qt account. Logging is now disabled when running MaintenanceTool. Change-Id: Ib163dae81368c8fec7218e5961590e07c208a73e Reviewed-by: Eike Ziller --- src/plugins/updateinfo/updateinfoplugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index a8c7ea64b99..b6fb7fd21ef 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -123,7 +123,9 @@ void UpdateInfoPlugin::startCheckForUpdates() { stopCheckForUpdates(); - d->m_checkUpdatesCommand = new ShellCommand(QString(), QProcessEnvironment()); + QProcessEnvironment env; + env.insert("QT_LOGGING_RULES", "*=false"); + d->m_checkUpdatesCommand = new ShellCommand(QString(), env); connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput); connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished); d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates"))); From ba75cf8b6d27008fb6b2c3816d6e41b7884054c0 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 25 Apr 2016 12:27:48 +0200 Subject: [PATCH 7/8] UpdateInfo: Fix implicit conversion to QString: src\plugins\updateinfo\updateinfoplugin.cpp(127): error C2248: 'QString::QString': cannot access private member declared in class 'QString' Change-Id: I4dfed40d14505fd5fae1cc87a08e1d58347f197d Reviewed-by: Riho Pihlak Reviewed-by: Eike Ziller --- src/plugins/updateinfo/updateinfoplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index b6fb7fd21ef..b6c9d3b1464 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -124,7 +124,7 @@ void UpdateInfoPlugin::startCheckForUpdates() stopCheckForUpdates(); QProcessEnvironment env; - env.insert("QT_LOGGING_RULES", "*=false"); + env.insert(QLatin1String("QT_LOGGING_RULES"), QLatin1String("*=false")); d->m_checkUpdatesCommand = new ShellCommand(QString(), env); connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput); connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished); From 728229690af3a5357c59790b58e10e9edddb3756 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 25 Apr 2016 11:48:06 +0200 Subject: [PATCH 8/8] UpdateInfo: Fix status of progress bar MaintenanceTool returns with exit status != 0 in case there are no updates, so that is no indicator of failure. Change-Id: Ibe94cc8b5ecbd7a04be5da41112a4eda0cd84153 Reviewed-by: Tobias Hunger Reviewed-by: Eike Ziller --- src/plugins/updateinfo/updateinfoplugin.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index b6c9d3b1464..d17bcfe5b2f 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -60,6 +61,13 @@ using namespace Core; namespace UpdateInfo { namespace Internal { +class IgnoreExitCode : public Utils::ExitCodeInterpreter +{ +public: + IgnoreExitCode(QObject *parent); + Utils::SynchronousProcessResponse::Result interpretExitCode(int code) const override; +}; + class UpdateInfoPluginPrivate { public: @@ -76,6 +84,16 @@ public: QDate m_lastCheckDate; }; +IgnoreExitCode::IgnoreExitCode(QObject *parent) + : Utils::ExitCodeInterpreter(parent) +{ +} + +Utils::SynchronousProcessResponse::Result IgnoreExitCode::interpretExitCode(int code) const +{ + Q_UNUSED(code) + return Utils::SynchronousProcessResponse::Finished; +} UpdateInfoPlugin::UpdateInfoPlugin() : d(new UpdateInfoPluginPrivate) @@ -128,7 +146,8 @@ void UpdateInfoPlugin::startCheckForUpdates() d->m_checkUpdatesCommand = new ShellCommand(QString(), env); connect(d->m_checkUpdatesCommand, &ShellCommand::stdOutText, this, &UpdateInfoPlugin::collectCheckForUpdatesOutput); connect(d->m_checkUpdatesCommand, &ShellCommand::finished, this, &UpdateInfoPlugin::checkForUpdatesFinished); - d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates"))); + d->m_checkUpdatesCommand->addJob(Utils::FileName(QFileInfo(d->m_maintenanceTool)), QStringList(QLatin1String("--checkupdates")), + /*workingDirectory=*/QString(), new IgnoreExitCode(d->m_checkUpdatesCommand)); d->m_checkUpdatesCommand->execute(); emit checkForUpdatesRunningChanged(true); }