feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I842a7c7358fd0ff6d85c151806e440043914e09a
This commit is contained in:
Eike Ziller
2020-12-14 14:19:15 +01:00
parent cf010911f7 30397fd2d4
commit 4bc2b4741d
65 changed files with 768 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/CMakeLists.txt
View File

@@ -26,7 +26,6 @@ add_subdirectory(help)
add_subdirectory(resourceeditor)
add_subdirectory(tasklist)
add_subdirectory(nim)
add_subdirectory(incredibuild)
add_subdirectory(conan)
# Level 4: (only depends on Level 3 and below)
@@ -45,9 +44,7 @@ add_subdirectory(beautifier)
add_subdirectory(clangformat)
add_subdirectory(clangrefactoring)
add_subdirectory(clearcase)
add_subdirectory(cmakeprojectmanager)
add_subdirectory(cvs)
add_subdirectory(debugger)
add_subdirectory(designer)
add_subdirectory(fakevim)
add_subdirectory(genericprojectmanager)
@@ -65,6 +62,10 @@ add_subdirectory(languageclient)
add_subdirectory(studiowelcome)
# Level 6:
add_subdirectory(cmakeprojectmanager)
add_subdirectory(debugger)
# Level 7:
add_subdirectory(android)
add_subdirectory(autotest)
add_subdirectory(autotoolsprojectmanager)
@@ -72,6 +73,7 @@ add_subdirectory(baremetal)
add_subdirectory(clangcodemodel)
add_subdirectory(clangtools)
add_subdirectory(cppcheck)
add_subdirectory(incredibuild)
add_subdirectory(ios)
add_subdirectory(python)
add_subdirectory(qmljseditor)
@@ -84,7 +86,7 @@ add_subdirectory(perfprofiler)
add_subdirectory(qbsprojectmanager)
add_subdirectory(ctfvisualizer)
# Level 7:
# Level 8:
add_subdirectory(boot2qt)
unset(qmldesigner_builddir)
if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -1020,7 +1020,7 @@ FilePath AndroidConfig::defaultSdkPath()
// Set default path of SDK as used by Android Studio
if (Utils::HostOsInfo::isMacHost()) {
return Utils::FilePath::fromString(
QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Android/sdk");
QStandardPaths::writableLocation(QStandardPaths::HomeLocation) + "/Library/Android/sdk");
}
if (Utils::HostOsInfo::isWindowsHost()) {

11
src/plugins/android/androidsdkdownloader.cpp
View File

@@ -118,14 +118,13 @@ bool AndroidSdkDownloader::extractSdk(const QString &jdkPath, const QString &sdk
}
}
QProcess *jarExtractProc = new QProcess();
jarExtractProc->setWorkingDirectory(sdkExtractPath);
QProcess jarExtractProc;
jarExtractProc.setWorkingDirectory(sdkExtractPath);
QString jarCmdPath(jdkPath + "/bin/jar");
jarExtractProc->start(jarCmdPath, {"xf", m_sdkFilename});
jarExtractProc->waitForFinished();
jarExtractProc->close();
jarExtractProc.start(jarCmdPath, {"xf", m_sdkFilename});
jarExtractProc.waitForFinished();
return jarExtractProc->exitCode() ? false : true;
return jarExtractProc.exitCode() ? false : true;
}
bool AndroidSdkDownloader::verifyFileIntegrity()

2
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -324,7 +324,7 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const
if (!Utils::contains(allLanguages, [&tcd](const Id& language) {return language == tcd.language;}))
continue;
ToolChain *tc = ToolChainKitAspect::toolChain(k, tcd.language);
if (!tc || tc->compilerCommand() != tcd.compilerPath)
if (!tc || tc->compilerCommand().canonicalPath() != tcd.compilerPath.canonicalPath())
return false;
}

4
src/plugins/debugger/shared/backtrace.cpp
View File

@@ -55,12 +55,10 @@ void dumpBacktrace(int maxdepth)
for (int i = 0; i < qMin(size, maxdepth); i++)
proc.write("0x" + QByteArray::number(quintptr(bt[i]), 16) + '\n');
proc.closeWriteChannel();
proc.waitForFinished();
QByteArray out = proc.readAllStandardOutput();
qDebug() << QCoreApplication::arguments().at(0);
qDebug() << out;
proc.waitForFinished();
out = proc.readAllStandardOutput();
qDebug() << out;
#endif
}

2
src/plugins/incredibuild/CMakeLists.txt
View File

@@ -1,6 +1,6 @@
add_qtc_plugin(IncrediBuild
PLUGIN_DEPENDS Core ProjectExplorer
PLUGIN_RECOMMENDS QmakeProjectManager CmakeProjectManager
PLUGIN_RECOMMENDS QmakeProjectManager CMakeProjectManager
SOURCES
buildconsolebuildstep.cpp
buildconsolebuildstep.h

7
src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
View File

@@ -210,7 +210,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
auto frameAll = [this, zoomOut]() {
if (m_graphicsView) {
QRectF bounds;
if (QmlItemNode(m_formEditorView->rootModelNode()).isFlowView()) {
QmlItemNode qmlItemNode(m_formEditorView->rootModelNode());
if (qmlItemNode.isFlowView()) {
for (QGraphicsItem *item : m_formEditorView->scene()->items()) {
if (auto *fitem = FormEditorItem::fromQGraphicsItem(item)) {
if (!fitem->qmlItemNode().modelNode().isRootNode()
@@ -219,8 +221,9 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view)
}
}
} else {
bounds = m_graphicsView->rootItemRect();
bounds = qmlItemNode.instanceBoundingRect();
}
m_graphicsView->frame(bounds);
zoomOut();
}

4
src/plugins/qmldesigner/components/importmanager/importmanagerview.cpp
View File

@@ -122,8 +122,8 @@ void ImportManagerView::removeImport(const Import &import)
void ImportManagerView::addImport(const Import &import)
{
if (import.isLibraryImport()
&& (import.toImportString().startsWith("QtQuick")
|| import.toImportString().startsWith("SimulinkConnector"))) {
&& (import.url().startsWith("QtQuick")
|| import.url().startsWith("SimulinkConnector"))) {
QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_IMPORT_ADDED
+ import.toImportString());
}

8
src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
View File

@@ -101,7 +101,7 @@ void InteractiveConnectionManager::dispatchCommand(const QVariant &command, Conn
void InteractiveConnectionManager::puppetTimeout(Connection &connection)
{
if (connection.socket && connection.socket->waitForReadyRead(10)) {
if (connection.timer && connection.socket && connection.socket->waitForReadyRead(10)) {
connection.timer->stop();
connection.timer->start();
return;
@@ -112,8 +112,10 @@ void InteractiveConnectionManager::puppetTimeout(Connection &connection)
void InteractiveConnectionManager::puppetAlive(Connection &connection)
{
connection.timer->stop();
connection.timer->start();
if (connection.timer) {
connection.timer->stop();
connection.timer->start();
}
}
} // namespace QmlDesigner

10
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -101,6 +101,7 @@
#include <QPicture>
#include <QPainter>
#include <QDirIterator>
#include <QFileSystemWatcher>
enum {
debug = false
@@ -464,6 +465,8 @@ void NodeInstanceView::propertiesAboutToBeRemoved(const QList<AbstractProperty>&
resetVerticalAnchors(property.parentModelNode());
} else if (name == "anchors.baseline") {
resetVerticalAnchors(property.parentModelNode());
} else if (name == "shader" && property.parentModelNode().isSubclassOf("QtQuick3D.Shader")) {
m_resetTimer.start();
}
}
@@ -512,6 +515,13 @@ void NodeInstanceView::variantPropertiesChanged(const QList<VariantProperty>& pr
QTC_ASSERT(m_nodeInstanceServer, return);
updatePosition(propertyList);
m_nodeInstanceServer->changePropertyValues(createChangeValueCommand(propertyList));
for (const auto &property : propertyList) {
if (property.name() == "shader" && property.parentModelNode().isSubclassOf("QtQuick3D.Shader")) {
m_resetTimer.start();
break;
}
}
}
/*!
Notifies the view that the property parent of the model node \a node has

8
src/plugins/texteditor/CMakeLists.txt
View File

@@ -1,6 +1,12 @@
if(TARGET KSyntaxHighlighting)
set(KSYNTAXHIGHLIGHTING_TARGET KSyntaxHighlighting)
else()
set(KSYNTAXHIGHLIGHTING_TARGET KF5::SyntaxHighlighting)
endif()
add_qtc_plugin(TextEditor
DEPENDS Qt5::Concurrent Qt5::Network Qt5::PrintSupport Qt5::Xml
PUBLIC_DEPENDS KSyntaxHighlighting
PUBLIC_DEPENDS ${KSYNTAXHIGHLIGHTING_TARGET}
PLUGIN_DEPENDS Core
SOURCES
autocompleter.cpp autocompleter.h