aboutsummaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/clangpchmanagerbackend/source/taskscheduler.h2
-rw-r--r--src/tools/iconlister/iconlister.cpp2
-rw-r--r--src/tools/icons/qtcreatoricons.svg130
-rw-r--r--src/tools/iostool/main.cpp2
-rw-r--r--src/tools/qtcreatorcrashhandler/backtracecollector.cpp6
-rw-r--r--src/tools/sdktool/addkitoperation.cpp2
6 files changed, 127 insertions, 17 deletions
diff --git a/src/tools/clangpchmanagerbackend/source/taskscheduler.h b/src/tools/clangpchmanagerbackend/source/taskscheduler.h
index 31d82ed2c4..7ae70c9f66 100644
--- a/src/tools/clangpchmanagerbackend/source/taskscheduler.h
+++ b/src/tools/clangpchmanagerbackend/source/taskscheduler.h
@@ -91,7 +91,7 @@ public:
for (auto &task : tasks) {
auto callWrapper = [&, task = std::move(task)](auto processor) -> ProcessorInterface & {
task(processor.get());
- executeInLoop([&] { m_queue.processEntries(); });
+ this->executeInLoop([&] { m_queue.processEntries(); });
return processor;
};
diff --git a/src/tools/iconlister/iconlister.cpp b/src/tools/iconlister/iconlister.cpp
index 509214cc25..522cd1891b 100644
--- a/src/tools/iconlister/iconlister.cpp
+++ b/src/tools/iconlister/iconlister.cpp
@@ -327,6 +327,8 @@ void IconLister::addProjectExplorerIcons()
""},
{QIcon(":/projectexplorer/images/fileoverlay_h.png"), "fileoverlay_h.png", prefix,
""},
+ {QIcon(":/projectexplorer/images/fileoverlay_py.png"), "fileoverlay_py.png", prefix,
+ ""},
{QIcon(":/projectexplorer/images/fileoverlay_unknown.png"), "fileoverlay_unknown.png", prefix,
""},
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index 86fcbb48d0..c0a0009e7d 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -14,7 +14,7 @@
height="600"
id="svg2"
version="1.1"
- inkscape:version="0.92.1 r15371"
+ inkscape:version="0.92.4 5da689c313, 2019-01-14"
sodipodi:docname="qtcreatoricons.svg">
<defs
id="defs4">
@@ -561,19 +561,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4"
- inkscape:cx="407.31417"
- inkscape:cy="170.08332"
inkscape:document-units="px"
- inkscape:current-layer="g4718"
showgrid="true"
showguides="true"
inkscape:guide-bbox="true"
- inkscape:window-width="2880"
- inkscape:window-height="1503"
- inkscape:window-x="-13"
- inkscape:window-y="527"
- inkscape:window-maximized="1"
+ inkscape:window-maximized="0"
inkscape:snap-grids="true">
<inkscape:grid
type="xygrid"
@@ -612,7 +604,7 @@
inkscape:locked="false" />
<sodipodi:guide
orientation="0,1"
- position="0,80"
+ position="232,80"
id="guide4545"
inkscape:locked="false" />
<sodipodi:guide
@@ -3453,6 +3445,98 @@
width="100%"
height="100%" />
</g>
+ <g
+ transform="translate(128)"
+ id="src/libs/utils/images/settings">
+ <use
+ transform="translate(1740,132)"
+ height="100%"
+ width="100%"
+ id="use4105"
+ xlink:href="#backgroundRect"
+ y="0"
+ x="0" />
+ <circle
+ style="fill:none;stroke:#000000;stroke-width:1.75"
+ id="path4133"
+ cx="1732"
+ cy="576"
+ r="3.5" />
+ <path
+ style="fill:#000000"
+ d="m 1733.25,579.5 -0.5,2.5 h -1.5 l -0.5,-2.5 z"
+ id="path4135"
+ inkscape:connector-curvature="0"
+ inkscape:transform-center-y="5.25"
+ sodipodi:nodetypes="ccccc" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ inkscape:transform-center-y="3.5355339"
+ id="use4137"
+ transform="rotate(45,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="3.5355339" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ id="use4139"
+ transform="rotate(90,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="5.25" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ inkscape:transform-center-y="-3.5355339"
+ id="use4141"
+ transform="rotate(135,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="3.5355339" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ inkscape:transform-center-y="-5.25"
+ id="use4143"
+ transform="rotate(-180,1732,576)"
+ width="100%"
+ height="100%" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ inkscape:transform-center-y="-3.5355339"
+ id="use4145"
+ transform="rotate(-135,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="-3.5355339" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ id="use4147"
+ transform="rotate(-90,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="-5.25" />
+ <use
+ x="0"
+ y="0"
+ xlink:href="#path4135"
+ inkscape:transform-center-y="3.5355339"
+ id="use4149"
+ transform="rotate(-45,1732,576)"
+ width="100%"
+ height="100%"
+ inkscape:transform-center-x="-3.5355339" />
+ </g>
</g>
<g
inkscape:groupmode="layer"
@@ -8914,6 +8998,30 @@
</g>
</g>
<g
+ transform="translate(111)"
+ id="src/plugins/projectexplorer/images/fileoverlay_py">
+ <use
+ x="0"
+ y="0"
+ xlink:href="#transparentBackgroundRect"
+ id="use2479"
+ width="100%"
+ height="100%"
+ transform="translate(113,68)" />
+ <path
+ style="opacity:0.75;fill:#ffffff"
+ d="m 104,535.99991 c 0.5,-9e-5 1,-0.49991 1,-0.99991 v -1 c 1,0 1.58286,0 2.58286,0 -0.5,0.5 -0.2217,1 0.0332,1.22379 L 108.50001,536 h 0.74644 c 0.27171,0 0.55533,-0.30177 0.75356,-0.5 l 2.24999,-2.25 c 0.25054,-0.25054 0.75001,-0.85547 0.75001,-1.41406 V 530 c 0,-0.5 -0.5,-1 -1,-1 0,0 -8.49999,0 -9,0 -0.50001,0 -1,0.5 -1,1 v 5 c 0,0.5 0.49999,1 0.99999,1 0.5,0 0.5,0 1,-9e-5 z"
+ id="path5194-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zsccscscssszzsszz" />
+ <path
+ sodipodi:nodetypes="cccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 103.49859,532.5 v -2 c 1.02427,-0.0193 2.92783,-0.45188 3,1 0.0722,1.45188 -2,1 -3,1 z M 111.5,530 v 1.73815 c -0.36757,0.7971 -1.47164,1.64275 -3,3.26185 m 0,-5 v 1.97707 c 0.22805,0.82162 1.35083,0.8693 2,1.52293 m -7,-3.5 v 5"
+ style="fill:none;stroke:#1986a0;stroke-opacity:1"
+ id="path5210-3" />
+ </g>
+ <g
id="src/libs/utils/images/filesave">
<rect
style="display:inline;fill:#ffffff;fill-opacity:1"
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index e99fe0dcb5..f62c0c6180 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -227,7 +227,7 @@ void Relayer::setClientSocket(QTcpSocket *clientSocket)
m_clientSocket = clientSocket;
if (m_clientSocket) {
connect(m_clientSocket,
- static_cast<void (QAbstractSocket::*)(QAbstractSocket::SocketError)>(&QAbstractSocket::error),
+ QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
this, &Relayer::handleClientHasError);
connect(m_clientSocket, &QAbstractSocket::disconnected,
this, [this](){server()->removeRelayConnection(this);});
diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp
index f4c49ba919..b3bc1939f7 100644
--- a/src/tools/qtcreatorcrashhandler/backtracecollector.cpp
+++ b/src/tools/qtcreatorcrashhandler/backtracecollector.cpp
@@ -49,10 +49,10 @@ public:
BacktraceCollector::BacktraceCollector(QObject *parent) :
QObject(parent), d(new BacktraceCollectorPrivate)
{
- connect(&d->debugger,
- static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
+ connect(&d->debugger, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &BacktraceCollector::onDebuggerFinished);
- connect(&d->debugger, &QProcess::errorOccurred, this, &BacktraceCollector::onDebuggerError);
+ connect(&d->debugger, &QProcess::errorOccurred,
+ this, &BacktraceCollector::onDebuggerError);
connect(&d->debugger, &QIODevice::readyRead,
this, &BacktraceCollector::onDebuggerOutputAvailable);
d->debugger.setProcessChannelMode(QProcess::MergedChannels);
diff --git a/src/tools/sdktool/addkitoperation.cpp b/src/tools/sdktool/addkitoperation.cpp
index b1c480811e..9cdba2a0b2 100644
--- a/src/tools/sdktool/addkitoperation.cpp
+++ b/src/tools/sdktool/addkitoperation.cpp
@@ -57,7 +57,7 @@ const char SDK[] = "PE.Profile.SDK";
const char ENV[] = "PE.Profile.Environment";
const char DATA[] = "PE.Profile.Data";
-// Standard KitInformation:
+// Standard KitAspects:
const char DEBUGGER[] = "Debugger.Information";
const char DEBUGGER_ENGINE[] = "EngineType";
const char DEBUGGER_BINARY[] = "Binary";
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 06:56:31 +0000