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

Merge remote-tracking branch 'origin/4.8' into 4.9

Browse Source 
Change-Id: I216c7dcbef1e840751332e7a6558c9d633444af3
This commit is contained in:
Eike Ziller
2019-02-07 10:03:28 +01:00
parent 0f40b1fb5c 14f66e0eb5
commit a0969a3c09
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/app-Info.plist
View File

@@ -254,5 +254,23 @@
<string>@SHORT_VERSION@</string>
<key>LSMinimumSystemVersion</key>
<string>@MACOSX_DEPLOYMENT_TARGET@</string>
</dict>
</plist>
<key>NSAppleEventsUsageDescription</key>
<string>This application wants to run AppleScript.</string>
<key>NSBluetoothPeripheralUsageDescription</key>
<string>A user application wants to access bluetooth.</string>
<key>NSCalendarsUsageDescription</key>
<string>A user application wants to access calendars.</string>
<key>NSCameraUsageDescription</key>
<string>A user application wants to access the camera.</string>
<key>NSContactsUsageDescription</key>
<string>A user application wants to access contacts.</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>A user application wants to access location information.</string>
<key>NSMicrophoneUsageDescription</key>
<string>A user application wants to access the microphone.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>A user application wants write access to the photo library.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>A user application wants to access the photo library.</string>
<key>NSRemindersUsageDescription</key>
<string>A user application wants to access the reminders.</string>

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

@@ -692,7 +692,8 @@ public:
QTextCursor m_pendingLinkUpdate;
QTextCursor m_lastLinkUpdate;
QRegExp m_searchExpr;
QRegularExpression m_searchExpr;
QString m_findText;
FindFlags m_findFlags;
void highlightSearchResults(const QTextBlock &block, const PaintEventData &data) const;
QTimer m_delayedUpdateTimer;
@@ -3715,7 +3716,7 @@ QTextBlock TextEditorWidgetPrivate::foldedBlockAt(const QPoint &pos, QRect *box)
void TextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block, const PaintEventData &data) const
{
if (m_searchExpr.isEmpty())
if (m_searchExpr.pattern().isEmpty())
return;
int blockPosition = block.position();
@@ -3734,10 +3735,11 @@ void TextEditorWidgetPrivate::highlightSearchResults(const QTextBlock &block, co
.toTextCharFormat(C_SEARCH_RESULT).background().color().darker(120);
while (idx < text.length()) {
idx = m_searchExpr.indexIn(text, idx + l);
if (idx < 0)
const QRegularExpressionMatch match = m_searchExpr.match(text, idx + 1);
if (!match.hasMatch())
break;
l = m_searchExpr.matchedLength();
idx = match.capturedStart();
l = match.capturedLength();
if (l == 0)
break;
if ((m_findFlags & FindWholeWords)
@@ -4332,7 +4334,7 @@ void TextEditorWidgetPrivate::paintSearchResultOverlay(const PaintEventData &dat
QPainter &painter) const
{
m_searchResultOverlay->clear();
if (m_searchExpr.isEmpty())
if (m_searchExpr.pattern().isEmpty())
return;
const int margin = 5;
@@ -5335,7 +5337,7 @@ void TextEditorWidgetPrivate::slotUpdateRequest(const QRect &r, int dy)
m_extraArea->scroll(0, dy);
} else if (r.width() > 4) { // wider than cursor width, not just cursor blinking
m_extraArea->update(0, r.y(), m_extraArea->width(), r.height());
if (!m_searchExpr.isEmpty()) {
if (!m_searchExpr.pattern().isEmpty()) {
const int m = m_searchResultOverlay->dropShadowWidth();
q->viewport()->update(r.adjusted(-m, -m, m, m));
}
@@ -6350,13 +6352,16 @@ void TextEditorWidgetPrivate::clearLink()
void TextEditorWidgetPrivate::highlightSearchResultsSlot(const QString &txt, FindFlags findFlags)
{
if (m_searchExpr.pattern() == txt)
const QString pattern = (findFlags & FindRegularExpression) ? txt
: QRegularExpression::escape(txt);
const QRegularExpression::PatternOptions options
= (findFlags & FindCaseSensitively) ? QRegularExpression::NoPatternOption
: QRegularExpression::CaseInsensitiveOption;
if (m_searchExpr.pattern() == pattern && m_searchExpr.patternOptions() == options)
return;
m_searchExpr.setPattern(txt);
m_searchExpr.setPatternSyntax((findFlags & FindRegularExpression) ?
QRegExp::RegExp : QRegExp::FixedString);
m_searchExpr.setCaseSensitivity((findFlags & FindCaseSensitively) ?
Qt::CaseSensitive : Qt::CaseInsensitive);
m_searchExpr.setPattern(pattern);
m_searchExpr.setPatternOptions(options);
m_findText = txt;
m_findFlags = findFlags;
m_delayedUpdateTimer.start(50);
@@ -6414,7 +6419,7 @@ void TextEditorWidgetPrivate::highlightSearchResultsInScrollBar()
m_searchWatcher = nullptr;
}
const QString &txt = m_searchExpr.pattern();
const QString &txt = m_findText;
if (txt.isEmpty())
return;

2
tests/system/suite_debugger/tst_simple_analyze/test.py
View File

@@ -103,7 +103,7 @@ def performTest(workingDir, projectName, availableConfigs):
compareEventsTab(model, "events_qt%s.tsv" % qtVersion)
test.compare(dumpItems(model, column=colPercent)[0], '100 %')
# cannot run following test on colShortest (unstable)
for i in [colTotal, colMean, colMedian, colLongest]:
for i in [colMean, colMedian, colLongest]:
for item in dumpItems(model, column=i)[2:5]:
test.verify(item.endswith('ms'), "Verify that '%s' ends with 'ms'" % item)
for i in [colTotal, colMean, colMedian, colLongest, colShortest]: