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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Change-Id: I873266bc23680ea02aaff6387790f2a834335113
This commit is contained in:
Eike Ziller
2019-02-05 09:02:01 +01:00
parent 107028dd19 9561fd9f45
commit 66226453a1
20 changed files with 112 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qbs/imports/QtcProduct.qbs
View File

@@ -19,7 +19,14 @@ Product {
Depends { name: "cpp" }
Depends { name: "qtc" }
Depends { name: product.name + " dev headers"; required: false }
Depends {
name: product.name + " dev headers";
required: false
Properties {
condition: Utilities.versionCompare(qbs.version, "1.13") >= 0
enableFallback: false
}
}
Depends { name: "Qt.core"; versionAtLeast: "5.9.0" }
// TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that

2
src/libs/utils/filenamevalidatinglineedit.cpp
View File

@@ -97,7 +97,7 @@ void FileNameValidatingLineEdit::setForceFirstCapitalLetter(bool b)
#define SLASHES "/\\"
static const char notAllowedCharsSubDir[] = ",^@=+{}[]~!?:&*\"|#%<>$\"'();`' ";
static const char notAllowedCharsSubDir[] = ",^@={}[]~!?:&*\"|#%<>$\"'();`' ";
static const char notAllowedCharsNoSubDir[] = ",^@={}[]~!?:&*\"|#%<>$\"'();`' " SLASHES;
static const char *notAllowedSubStrings[] = {".."};

95
src/plugins/android/androidrunnerworker.cpp
View File

@@ -53,6 +53,7 @@
namespace {
Q_LOGGING_CATEGORY(androidRunWorkerLog, "qtc.android.run.androidrunnerworker", QtWarningMsg)
static const int GdbTempFileMaxCounter = 20;
}
using namespace std;
@@ -248,19 +249,60 @@ bool AndroidRunnerWorker::runAdb(const QStringList &args, QString *stdOut,
return result.success();
}
bool AndroidRunnerWorker::uploadFile(const QString &from, const QString &to, const QString &flags)
bool AndroidRunnerWorker::uploadGdbServer()
{
QFile f(from);
if (!f.open(QIODevice::ReadOnly))
// Push the gdbserver to temp location and then to package dir.
// the files can't be pushed directly to package because of permissions.
qCDebug(androidRunWorkerLog) << "Uploading GdbServer";
bool foundUnique = true;
auto cleanUp = [this, &foundUnique] (QString *p) {
if (foundUnique && !runAdb({"shell", "rm", "-f", *p}))
qCDebug(androidRunWorkerLog) << "Gdbserver cleanup failed.";
delete p;
};
std::unique_ptr<QString, decltype (cleanUp)>
tempGdbServerPath(new QString("/data/local/tmp/%1"), cleanUp);
// Get a unique temp file name for gdbserver copy
int count = 0;
while (deviceFileExists(tempGdbServerPath->arg(++count))) {
if (count > GdbTempFileMaxCounter) {
qCDebug(androidRunWorkerLog) << "Can not get temporary file name";
foundUnique = false;
return false;
}
}
*tempGdbServerPath = tempGdbServerPath->arg(count);
// Copy gdbserver to temp location
if (!runAdb({"push", m_gdbserverPath , *tempGdbServerPath})) {
qCDebug(androidRunWorkerLog) << "Gdbserver upload to temp directory failed";
return false;
runAdb({"shell", "run-as", m_packageName, "rm", to});
const QByteArray data = f.readAll();
}
// Copy gdbserver from temp location to app directory
if (!runAdb({"shell", "run-as", m_packageName, "cp" , *tempGdbServerPath, "./gdbserver"})) {
qCDebug(androidRunWorkerLog) << "Gdbserver copy from temp directory failed";
return false;
}
QTC_ASSERT(runAdb({"shell", "run-as", m_packageName, "chmod", "+x", "./gdbserver"}),
qCDebug(androidRunWorkerLog) << "Gdbserver chmod +x failed.");
return true;
}
bool AndroidRunnerWorker::deviceFileExists(const QString &filePath)
{
QString output;
const bool res = runAdb({"shell", "run-as", m_packageName, QString("sh -c 'base64 -d > %1'").arg(to)},
&output, data.toBase64());
if (!res || output.contains("base64: not found"))
return false;
return runAdb({"shell", "run-as", m_packageName, "chmod", flags, to});
const bool success = runAdb({"shell", "ls", filePath, "2>/dev/null"}, &output);
return success && !output.trimmed().isEmpty();
}
bool AndroidRunnerWorker::packageFileExists(const QString &filePath)
{
QString output;
const bool success = runAdb({"shell", "run-as", m_packageName, "ls", filePath, "2>/dev/null"}, &output);
return success && !output.trimmed().isEmpty();
}
void AndroidRunnerWorker::adbKill(qint64 pid)
@@ -403,26 +445,28 @@ void AndroidRunnerWorker::asyncStartHelper()
// e.g. on Android 8 with NDK 10e
runAdb({"shell", "run-as", m_packageName, "chmod", "a+x", packageDir.trimmed()});
QString gdbServerExecutable;
QString gdbServerExecutable = "gdbserver";
QString gdbServerPrefix = "./lib/";
if (m_gdbserverPath.isEmpty() || !uploadFile(m_gdbserverPath, "gdbserver")) {
// upload failed - check for old devices
QString output;
if (runAdb({"shell", "run-as", m_packageName, "ls", "lib/"}, &output)) {
for (const auto &line: output.split('\n')) {
if (line.indexOf("gdbserver") != -1/* || line.indexOf("lldb-server") != -1*/) {
gdbServerExecutable = line.trimmed();
break;
}
}
}
if (gdbServerExecutable.isEmpty()) {
auto findGdbServer = [this, &gdbServerExecutable, gdbServerPrefix](const QString& gdbEx) {
if (!packageFileExists(gdbServerPrefix + gdbEx))
return false;
gdbServerExecutable = gdbEx;
return true;
};
if (!findGdbServer("gdbserver") && !findGdbServer("libgdbserver.so")) {
// Armv8. symlink lib is not available.
// Kill the previous instances of gdbserver. Do this before copying the gdbserver.
runAdb({"shell", "run-as", m_packageName, "killall", gdbServerExecutable});
if (!m_gdbserverPath.isEmpty() && uploadGdbServer()) {
gdbServerPrefix = "./";
} else {
emit remoteProcessFinished(tr("Cannot find/copy C++ debug server."));
return;
}
} else {
gdbServerPrefix = "./";
gdbServerExecutable = "gdbserver";
qCDebug(androidRunWorkerLog) << "Found GDB server under ./lib";
runAdb({"shell", "run-as", m_packageName, "killall", gdbServerExecutable});
}
QString debuggerServerErr;
@@ -484,7 +528,6 @@ bool AndroidRunnerWorker::startDebuggerServer(const QString &packageDir,
QString *errorStr)
{
QString gdbServerSocket = packageDir + "/debug-socket";
runAdb({"shell", "run-as", m_packageName, "killall", gdbServerExecutable});
runAdb({"shell", "run-as", m_packageName, "rm", gdbServerSocket});
QString gdbProcessErr;

6
src/plugins/android/androidrunnerworker.h
View File

@@ -47,7 +47,6 @@ public:
AndroidRunnerWorker(ProjectExplorer::RunWorker *runner, const QString &packageName);
~AndroidRunnerWorker() override;
bool uploadFile(const QString &from, const QString &to, const QString &flags = QString("+x"));
bool runAdb(const QStringList &args, QString *stdOut = nullptr, const QByteArray &writeData = {});
void adbKill(qint64 pid);
QStringList selector() const;
@@ -71,10 +70,13 @@ signals:
void remoteOutput(const QString &output);
void remoteErrorOutput(const QString &output);
protected:
private:
void asyncStartHelper();
bool startDebuggerServer(const QString &packageDir, const QString &gdbServerPrefix,
const QString &gdbServerExecutable, QString *errorStr = nullptr);
bool deviceFileExists(const QString &filePath);
bool packageFileExists(const QString& filePath);
bool uploadGdbServer();
enum class JDBState {
Idle,

2
src/plugins/autotest/testresultmodel.cpp
View File

@@ -145,7 +145,7 @@ void TestResultItem::updateResult(bool &changed, Result::Type addedChildType)
? Result::MessageTestCaseSuccess : old;
break;
default:
return;
break;
}
changed = old != newResult;
if (changed)

15
src/plugins/coreplugin/helpitem.cpp
View File

@@ -51,16 +51,6 @@ HelpItem::HelpItem(const QUrl &url, const QString &docMark, HelpItem::Category c
, m_category(category)
{}
HelpItem::HelpItem(const QUrl &url,
const QString &docMark,
HelpItem::Category category,
const QMap<QString, QUrl> &helpLinks)
: m_helpUrl(url)
, m_docMark(docMark)
, m_category(category)
, m_helpLinks(helpLinks)
{}
HelpItem::HelpItem(const QString &helpId, const QString &docMark, Category category)
: HelpItem(QStringList(helpId), docMark, category)
{}
@@ -105,6 +95,11 @@ void HelpItem::setCategory(Category cat)
HelpItem::Category HelpItem::category() const
{ return m_category; }
bool HelpItem::isEmpty() const
{
return m_helpUrl.isEmpty() && m_helpIds.isEmpty();
}
bool HelpItem::isValid() const
{
if (m_helpUrl.isEmpty() && m_helpIds.isEmpty())

3
src/plugins/coreplugin/helpitem.h
View File

@@ -59,8 +59,6 @@ public:
HelpItem(const QStringList &helpIds, const QString &docMark, Category category);
explicit HelpItem(const QUrl &url);
HelpItem(const QUrl &url, const QString &docMark, Category category);
HelpItem(const QUrl &url, const QString &docMark, Category category,
const QMap<QString, QUrl> &helpLinks);
void setHelpUrl(const QUrl &url);
const QUrl &helpUrl() const;
@@ -74,6 +72,7 @@ public:
void setCategory(Category cat);
Category category() const;
bool isEmpty() const;
bool isValid() const;
QString extractContent(bool extended) const;

2
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1714,7 +1714,7 @@ void GdbEngine::detachDebugger()
{
CHECK_STATE(InferiorStopOk);
QTC_CHECK(runParameters().startMode != AttachCore);
DebuggerCommand cmd("detach", ExitRequest);
DebuggerCommand cmd("detach", NativeCommand | ExitRequest);
cmd.callback = [this](const DebuggerResponse &) {
CHECK_STATE(InferiorStopOk);
notifyInferiorExited();

2
src/plugins/help/helpplugin.cpp
View File

@@ -652,7 +652,7 @@ void HelpPluginPrivate::requestContextHelp()
? tipHelpValue.value<HelpItem>()
: HelpItem(tipHelpValue.toString());
IContext *context = ICore::currentContextObject();
if (!tipHelp.isValid() && context)
if (tipHelp.isEmpty() && context)
context->contextHelp([this](const HelpItem &item) { showContextHelp(item); });
else
showContextHelp(tipHelp);

3
src/plugins/help/textbrowserhelpviewer.cpp
View File

@@ -430,7 +430,8 @@ void TextBrowserHelpWidget::mouseReleaseEvent(QMouseEvent *e)
bool controlPressed = e->modifiers() & Qt::ControlModifier;
const QString link = linkAt(e->pos());
if ((controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) {
if (m_parent->isActionVisible(HelpViewer::Action::NewPage)
&& (controlPressed || e->button() == Qt::MidButton) && !link.isEmpty()) {
emit m_parent->newPageRequested(QUrl(link));
return;
}

5
src/plugins/languageclient/client.cpp
View File

@@ -591,8 +591,9 @@ void Client::handleCodeActionResponse(const CodeActionRequest::Response &respons
for (const Utils::variant<Command, CodeAction> &item : *list) {
if (auto action = Utils::get_if<CodeAction>(&item))
updateCodeActionRefactoringMarker(this, *action, uri);
else if (auto command = Utils::get_if<Command>(&item))
; // todo
else if (auto command = Utils::get_if<Command>(&item)) {
Q_UNUSED(command); // todo
}
}
}
}

2
src/plugins/qmljseditor/qmljsautocompleter.cpp
View File

@@ -230,7 +230,7 @@ bool AutoCompleter::contextAllowsAutoQuotes(const QTextCursor &cursor,
}
// never insert ' into string literals, it adds spurious ' when writing contractions
if (textToInsert.at(0) == QLatin1Char('\''))
if (textToInsert.at(0) == QLatin1Char('\'') && quote != '\'')
return false;
if (textToInsert.at(0) != quote || isCompleteStringLiteral(tokenText))

3
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -185,8 +185,7 @@ bool QmlJSHoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Docum
// Use the URL, to disambiguate different versions
const HelpItem helpItem(filteredUrlMap.first(),
qName.join(QLatin1Char('.')),
HelpItem::QmlComponent,
filteredUrlMap);
HelpItem::QmlComponent);
setLastHelpItemIdentified(helpItem);
return true;
}

2
src/plugins/texteditor/texteditor.cpp
View File

@@ -8020,7 +8020,7 @@ void BaseTextEditor::setContextHelp(const HelpItem &item)
void TextEditorWidget::contextHelpItem(const IContext::HelpCallback &callback)
{
if (!d->m_contextHelpItem.isValid() && !d->m_hoverHandlers.isEmpty()) {
if (d->m_contextHelpItem.isEmpty() && !d->m_hoverHandlers.isEmpty()) {
d->m_hoverHandlers.first()->contextHelpId(this,
Text::wordStartCursor(textCursor()).position(),
callback);

2
src/tools/sdktool/adddebuggeroperation.cpp
View File

@@ -173,7 +173,7 @@ bool AddDebuggerOperation::test() const
QVariantMap AddDebuggerOperation::addDebugger(const QVariantMap &map,
const QString &id, const QString &displayName,
const quint32 &engine, const QString &binary,
int engine, const QString &binary,
const QStringList &abis, const KeyValuePairList &extra)
{
// Sanity check: Make sure autodetection source is not in use already:

4
src/tools/sdktool/adddebuggeroperation.h
View File

@@ -46,7 +46,7 @@ public:
static QVariantMap addDebugger(const QVariantMap &map,
const QString &id, const QString &displayName,
const quint32 &engine, const QString &binary,
int engine, const QString &binary,
const QStringList &abis, const KeyValuePairList &extra);
static QVariantMap initializeDebuggers();
@@ -54,7 +54,7 @@ public:
private:
QString m_id;
QString m_displayName;
quint32 m_engine = 0;
int m_engine = 0;
QString m_binary;
QStringList m_abis;
KeyValuePairList m_extra;

2
tests/system/objects.map
View File

@@ -196,6 +196,8 @@
:Send to Codepaster_CodePaster::PasteView {name='CodePaster__Internal__ViewDialog' type='CodePaster::PasteView' visible='1' windowTitle='Send to Codepaster'}
:Session Manager_ProjectExplorer::Internal::SessionDialog {name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
:Startup.contextHelpComboBox_QComboBox {container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
:Take a UI Tour.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Take a UI Tour_Utils::CheckableMessageBox'}
:Take a UI Tour_Utils::CheckableMessageBox {type='Utils::CheckableMessageBox' unnamed='1' visible='1' windowTitle='Take a UI Tour'}
:User Interface.languageBox_QComboBox {container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'}
:Widget Box_qdesigner_internal::WidgetBoxTreeWidget {container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'}
:Working Copy_Utils::BaseValidatingLineEdit {type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New Text File_ProjectExplorer::JsonWizard'}

4
tests/system/shared/project_explorer.py
View File

@@ -30,7 +30,7 @@ def switchViewTo(view):
waitFor("not QToolTip.isVisible()", 15000)
if view < ViewConstants.FIRST_AVAILABLE or view > ViewConstants.LAST_AVAILABLE:
return
tabBar = waitForObject("{type='Core::Internal::FancyTabBar' unnamed='1' visible='1' "
tabBar = waitForObject("{name='ModeSelector' type='Core::Internal::FancyTabBar' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}")
mouseMove(tabBar, 20, 20 + 52 * view)
if waitFor("QToolTip.isVisible()", 10000):
@@ -43,7 +43,7 @@ def switchViewTo(view):
test.passes("ToolTip verified")
else:
test.warning("ToolTip does not match", "Expected pattern: %s\nGot: %s" % (pattern, text))
mouseClick(waitForObject("{type='Core::Internal::FancyTabBar' unnamed='1' visible='1' "
mouseClick(waitForObject("{name='ModeSelector' type='Core::Internal::FancyTabBar' visible='1' "
"window=':Qt Creator_Core::Internal::MainWindow'}"), 20, 20 + 52 * view, 0, Qt.LeftButton)
def __kitIsActivated__(kit):

7
tests/system/shared/qtcreator.py
View File

@@ -55,7 +55,7 @@ source("../../shared/welcome.py")
source("../../shared/workarounds.py") # include this at last
# additionalParameters must be a list or tuple of strings or None
def startQC(additionalParameters=None, withPreparedSettingsPath=True):
def startQC(additionalParameters=None, withPreparedSettingsPath=True, cancelTour=True):
global SettingsPath
appWithOptions = ['"Qt Creator"' if platform.system() == 'Darwin' else "qtcreator"]
if withPreparedSettingsPath:
@@ -65,7 +65,10 @@ def startQC(additionalParameters=None, withPreparedSettingsPath=True):
if platform.system() in ('Microsoft', 'Windows'): # for hooking into native file dialog
appWithOptions.extend(('-platform', 'windows:dialogs=none'))
test.log("Starting now: %s" % ' '.join(appWithOptions))
return startApplication(' '.join(appWithOptions))
appContext = startApplication(' '.join(appWithOptions))
if cancelTour:
clickButton(waitForObject(":Take a UI Tour.Cancel_QPushButton"))
return appContext;
def startedWithoutPluginError():
try:

2
tests/system/suite_general/tst_installed_languages/test.py
View File

@@ -46,7 +46,7 @@ def main():
invokeMenuItem("File", "Exit")
waitForCleanShutdown()
snooze(4) # wait for complete unloading of Creator
startQC()
startQC(cancelTour=False)
try:
# Use Locator for menu items which wouldn't work on macOS
exitCommand = testData.field(lang, "Exit")