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

Merge remote-tracking branch 'origin/4.11' into 4.12

Browse Source 
Change-Id: I8cc80483cdb10309bf73aba5cfab52c1d90e1bbc
This commit is contained in:
Eike Ziller
2020-02-26 08:14:47 +01:00
parent a8cca1b89a 8625bbfe5a
commit fa59e02f89
8 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/installer/mac/entitlements.plist vendored Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.debugger</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
</dict>
</plist>

4
scripts/common.py
View File

@@ -238,5 +238,7 @@ def codesign(app_path):
lambda ff: ff.endswith('.dylib'))
codesign = codesign_call()
if is_mac_platform() and codesign:
entitlements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'dist',
'installer', 'mac', 'entitlements.plist')
# sign the whole bundle
subprocess.check_call(codesign + ['--deep', app_path])
subprocess.check_call(codesign + ['--deep', app_path, '--entitlements', entitlements_path])

7
share/qtcreator/templates/wizards/classes/python/file.py
View File

@@ -21,6 +21,7 @@ from PyQt5 import QtQuick
@endif
@endif
@if '%{Base}'
class %{Class}(%{Base}):
@else
@@ -29,11 +30,9 @@ class %{Class}:
def __init__(self):
@if '%{Base}' === 'QWidget'
QtWidgets.QWidget.__init__(self)
@endif
@if '%{Base}' === 'QMainWindow'
@elif '%{Base}' === 'QMainWindow'
QtWidgets.QMainWindow.__init__(self)
@if '%{Base}' === 'QQuickItem'
@elif '%{Base}' === 'QQuickItem'
QtQuick.QQuickItem.__init__(self)
@endif
pass

2
share/qtcreator/templates/wizards/classes/python/wizard.json
View File

@@ -46,7 +46,7 @@
"data":
{
"items": [ { "trKey": "<Custom>", "value": "" },
"QObject", "QWidget", "QMainWindow", "QDeclarativeItem" ]
"QObject", "QWidget", "QMainWindow", "QDeclarativeItem", "QQuickItem" ]
}
},
{

2
share/qtcreator/templates/wizards/files/python/file.py
View File

@@ -1,4 +1,4 @@
# This Python file uses the following encoding: utf-8
# if__name__ == "__main__":
# if __name__ == "__main__":
# pass

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

@@ -475,7 +475,7 @@ void Client::documentContentsChanged(TextEditor::TextDocument *document,
int charsRemoved,
int charsAdded)
{
if (!m_openedDocument.contains(document))
if (!m_openedDocument.contains(document) || !reachable())
return;
const QString method(DidChangeTextDocumentNotification::methodName);
TextDocumentSyncKind syncKind = m_serverCapabilities.textDocumentSyncKindHelper();
@@ -912,11 +912,12 @@ bool Client::reset()
m_responseHandlers.clear();
m_clientInterface->resetBuffer();
updateEditorToolBar(m_openedDocument.keys());
m_openedDocument.clear();
m_serverCapabilities = ServerCapabilities();
m_dynamicCapabilities.reset();
for (const DocumentUri &uri : m_diagnostics.keys())
removeDiagnostics(uri);
for (TextEditor::TextDocument *document : m_openedDocument.keys())
document->disconnect(this);
for (TextEditor::TextDocument *document : m_resetAssistProvider.keys())
resetAssistProviders(document);
return true;

3
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -366,6 +366,8 @@ void LanguageClientManager::clientFinished(Client *client)
client->log(tr("Unexpectedly finished. Restarting in %1 seconds.").arg(restartTimeoutS),
Core::MessageManager::Flash);
QTimer::singleShot(restartTimeoutS * 1000, client, [client]() { startClient(client); });
for (TextEditor::TextDocument *document : m_clientForDocument.keys(client))
client->deactivateDocument(document);
} else {
if (unexpectedFinish && !m_shuttingDown)
client->log(tr("Unexpectedly finished."), Core::MessageManager::Flash);
@@ -397,6 +399,7 @@ void LanguageClientManager::editorOpened(Core::IEditor *editor)
if (!widget)
return;
if (Client *client = clientForDocument(widget->textDocument()))
if (client->reachable())
client->cursorPositionChanged(widget);
});
});

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

@@ -5472,7 +5472,7 @@ void TextEditorWidget::mouseMoveEvent(QMouseEvent *e)
column += (e->pos().x() - cursorRect().center().x()) / QFontMetricsF(font()).horizontalAdvance(QLatin1Char(' '));
d->m_blockSelection.positionBlock = cursor.blockNumber();
d->m_blockSelection.positionColumn = column;
d->m_blockSelection.positionColumn = qMax(0, column);
doSetTextCursor(d->m_blockSelection.selection(d->m_document.data()), true);
viewport()->update();
@@ -7166,7 +7166,7 @@ void TextEditorWidget::rewrapParagraph()
QString currentWord;
for (const QChar &ch : qAsConst(selectedText)) {
if (ch.isSpace()) {
if (ch.isSpace() && ch != QChar::Nbsp) {
if (!currentWord.isEmpty()) {
currentLength += currentWord.length() + 1;
@@ -8057,10 +8057,10 @@ QTextCursor TextBlockSelection::cursor(const TextDocument *baseTextDocument,
void TextBlockSelection::fromPostition(int positionBlock, int positionColumn,
int anchorBlock, int anchorColumn)
{
this->positionBlock = positionBlock;
this->positionColumn = positionColumn;
this->anchorBlock = anchorBlock;
this->anchorColumn = anchorColumn;
this->positionBlock = QTC_GUARD(positionBlock >= 0) ? positionBlock : 0;
this->positionColumn = QTC_GUARD(positionColumn >= 0) ? positionColumn : 0;
this->anchorBlock = QTC_GUARD(anchorBlock >= 0) ? anchorBlock : 0;
this->anchorColumn = QTC_GUARD(anchorColumn >= 0) ? anchorColumn : 0;
}
bool TextEditorWidget::inFindScope(const QTextCursor &cursor)