From 9a4700aae6d72a9b580e101ff4bb798a38068cdd Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Apr 2016 09:44:11 +0200 Subject: Git: some cleanup in gitclient.{h,cpp} Unneeded declarations, s/static const/const/, #include order, ... Change-Id: Ie7970f1a0ec1989d79bac56e9bad87852dd036ea Reviewed-by: Orgad Shaneh --- src/plugins/git/gitclient.cpp | 40 +++++++++++++++++++--------------------- src/plugins/git/gitclient.h | 3 --- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index e749a8ca93..f1d3095b38 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -36,53 +36,51 @@ #include "branchadddialog.h" #include "gerrit/gerritplugin.h" -#include - +#include #include #include -#include -#include #include +#include #include -#include +#include +#include #include #include #include #include -#include -#include + +#include #include #include -#include #include +#include +#include #include #include #include +#include #include #include #include #include -#include -#include -#include - -#include #include #include #include -#include +#include +#include #include +#include -static const char GIT_DIRECTORY[] = ".git"; -static const char graphLogFormatC[] = "%h %d %an %s %ci"; -static const char HEAD[] = "HEAD"; -static const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD"; -static const char noColorOption[] = "--no-color"; -static const char decorateOption[] = "--decorate"; -static const char showFormatC[] = +const char GIT_DIRECTORY[] = ".git"; +const char graphLogFormatC[] = "%h %d %an %s %ci"; +const char HEAD[] = "HEAD"; +const char CHERRY_PICK_HEAD[] = "CHERRY_PICK_HEAD"; +const char noColorOption[] = "--no-color"; +const char decorateOption[] = "--decorate"; +const char showFormatC[] = "--pretty=format:commit %H%n" "Author: %an <%ae>, %ad (%ar)%n" "Committer: %cn <%ce>, %cd (%cr)%n" diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index f6b0bd2821..60b2761c2f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -40,9 +40,6 @@ #include QT_BEGIN_NAMESPACE -class QCheckBox; -class QSignalMapper; -class QDebug; class QProcessEnvironment; class QMenu; QT_END_NAMESPACE -- cgit v1.2.1 From f169f51e96c0f08f713f9120ed73602b0c291c45 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 15 Apr 2016 09:48:03 +0200 Subject: C++: Fix compile warning ...with clang: cplusplus-keywordgen.cpp:74:1: warning: 'State' defined as a struct here but previously declared as a class [-Wmismatched-tags] Change-Id: Ibf95439e060a5bb32f0aae7d3f3a34c8821165bd Reviewed-by: Christian Stenger --- src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp index 8219c390e9..85bb3f2379 100644 --- a/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp +++ b/src/tools/3rdparty/cplusplus-keywordgen/cplusplus-keywordgen.cpp @@ -71,7 +71,7 @@ public: } }; -struct State { +class State { public: State() {} -- cgit v1.2.1 From bb2374d405ee629d2e478b3167ac307a1e102c33 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 10:45:32 +0200 Subject: Locator: Improved locator command help icon Using the "warning" yellow which works better against non-toolbar background. Also without the shadow. Change-Id: I30e537cbb4bd6de0377af32ec98412c153a55327 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/locator/locatorfiltersfilter.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp index c09ba186e6..ca14d00ca4 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.cpp @@ -27,8 +27,9 @@ #include "locatorfiltersfilter.h" #include "locatorwidget.h" -#include +#include #include +#include using namespace Core; using namespace Core::Internal; @@ -39,7 +40,8 @@ LocatorFiltersFilter::LocatorFiltersFilter(Locator *plugin, LocatorWidget *locatorWidget): m_plugin(plugin), m_locatorWidget(locatorWidget), - m_icon(Icons::NEXT.icon()) + m_icon(Utils::Icon({{QLatin1String(":/core/images/next.png"), Utils::Theme::IconsWarningColor}}, + Utils::Icon::Tint).pixmap()) { setId("FiltersFilter"); setDisplayName(tr("Available filters")); -- cgit v1.2.1 From 593e21e2d3fb2707763acf3407a0307a91590280 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 14 Apr 2016 15:16:39 +0200 Subject: Doc: Update Qt Quick Designer screenshots Change-Id: I8238815ecef360a8f7076e26d58dd8b8bdb3d563 Reviewed-by: Tim Jenssen --- doc/images/qmldesigner-bindings.png | Bin 3854 -> 5852 bytes doc/images/qmldesigner-connections.png | Bin 4216 -> 4606 bytes doc/images/qmldesigner-dynamicprops.png | Bin 3274 -> 4953 bytes doc/images/qmldesigner-element-properties.png | Bin 81499 -> 24008 bytes doc/images/qmldesigner-element-size.png | Bin 34286 -> 7772 bytes doc/images/qmldesigner-export-item.png | Bin 3790 -> 2435 bytes doc/images/qmldesigner-navigator-arrows.png | Bin 9976 -> 3321 bytes doc/images/qmldesigner-navigator.png | Bin 10700 -> 3475 bytes doc/images/qmldesigner-new-project.png | Bin 15278 -> 15439 bytes doc/images/qmldesigner-preview-size.png | Bin 75502 -> 21731 bytes .../qmldesigner-properties-explicit-base.png | Bin 62060 -> 16110 bytes .../qmldesigner-properties-explicit-state1.png | Bin 46113 -> 21921 bytes doc/images/qmldesigner-qml-components.png | Bin 41770 -> 10870 bytes doc/images/qmldesigner-screen-design.png | Bin 111976 -> 18315 bytes doc/images/qmldesigner-states.png | Bin 14637 -> 3097 bytes doc/images/qmldesigner-transitions.png | Bin 5123 -> 2713 bytes .../qmldesigner-uiforms-example-main-view.png | Bin 28577 -> 28914 bytes doc/images/qmldesigner-visual-editor.png | Bin 43895 -> 28301 bytes 18 files changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/images/qmldesigner-bindings.png b/doc/images/qmldesigner-bindings.png index ad29109bee..723fe3ea11 100644 Binary files a/doc/images/qmldesigner-bindings.png and b/doc/images/qmldesigner-bindings.png differ diff --git a/doc/images/qmldesigner-connections.png b/doc/images/qmldesigner-connections.png index 356fa0f0d1..6548e88e90 100644 Binary files a/doc/images/qmldesigner-connections.png and b/doc/images/qmldesigner-connections.png differ diff --git a/doc/images/qmldesigner-dynamicprops.png b/doc/images/qmldesigner-dynamicprops.png index 7807918131..04949ac681 100644 Binary files a/doc/images/qmldesigner-dynamicprops.png and b/doc/images/qmldesigner-dynamicprops.png differ diff --git a/doc/images/qmldesigner-element-properties.png b/doc/images/qmldesigner-element-properties.png index e1680dfaef..76b4ca25ce 100644 Binary files a/doc/images/qmldesigner-element-properties.png and b/doc/images/qmldesigner-element-properties.png differ diff --git a/doc/images/qmldesigner-element-size.png b/doc/images/qmldesigner-element-size.png index 63bdb533fd..47c555642f 100644 Binary files a/doc/images/qmldesigner-element-size.png and b/doc/images/qmldesigner-element-size.png differ diff --git a/doc/images/qmldesigner-export-item.png b/doc/images/qmldesigner-export-item.png index 83ba7b1afc..4dd4361490 100644 Binary files a/doc/images/qmldesigner-export-item.png and b/doc/images/qmldesigner-export-item.png differ diff --git a/doc/images/qmldesigner-navigator-arrows.png b/doc/images/qmldesigner-navigator-arrows.png index 9f8f0eb950..06d884b5c5 100644 Binary files a/doc/images/qmldesigner-navigator-arrows.png and b/doc/images/qmldesigner-navigator-arrows.png differ diff --git a/doc/images/qmldesigner-navigator.png b/doc/images/qmldesigner-navigator.png index e58152bbb6..fc168249f8 100644 Binary files a/doc/images/qmldesigner-navigator.png and b/doc/images/qmldesigner-navigator.png differ diff --git a/doc/images/qmldesigner-new-project.png b/doc/images/qmldesigner-new-project.png index 1619fd18b3..3d8e5265f0 100644 Binary files a/doc/images/qmldesigner-new-project.png and b/doc/images/qmldesigner-new-project.png differ diff --git a/doc/images/qmldesigner-preview-size.png b/doc/images/qmldesigner-preview-size.png index 9f67cc5003..63003fa46f 100644 Binary files a/doc/images/qmldesigner-preview-size.png and b/doc/images/qmldesigner-preview-size.png differ diff --git a/doc/images/qmldesigner-properties-explicit-base.png b/doc/images/qmldesigner-properties-explicit-base.png index c3e10adcef..e8f845dd22 100644 Binary files a/doc/images/qmldesigner-properties-explicit-base.png and b/doc/images/qmldesigner-properties-explicit-base.png differ diff --git a/doc/images/qmldesigner-properties-explicit-state1.png b/doc/images/qmldesigner-properties-explicit-state1.png index c33ff6c140..152c94297f 100644 Binary files a/doc/images/qmldesigner-properties-explicit-state1.png and b/doc/images/qmldesigner-properties-explicit-state1.png differ diff --git a/doc/images/qmldesigner-qml-components.png b/doc/images/qmldesigner-qml-components.png index 593c81a8ee..e4653da540 100644 Binary files a/doc/images/qmldesigner-qml-components.png and b/doc/images/qmldesigner-qml-components.png differ diff --git a/doc/images/qmldesigner-screen-design.png b/doc/images/qmldesigner-screen-design.png index a5aa8a5415..4cecbbb390 100644 Binary files a/doc/images/qmldesigner-screen-design.png and b/doc/images/qmldesigner-screen-design.png differ diff --git a/doc/images/qmldesigner-states.png b/doc/images/qmldesigner-states.png index f768bdddc9..460c810e21 100644 Binary files a/doc/images/qmldesigner-states.png and b/doc/images/qmldesigner-states.png differ diff --git a/doc/images/qmldesigner-transitions.png b/doc/images/qmldesigner-transitions.png index 1fee9d1827..66624e93d2 100644 Binary files a/doc/images/qmldesigner-transitions.png and b/doc/images/qmldesigner-transitions.png differ diff --git a/doc/images/qmldesigner-uiforms-example-main-view.png b/doc/images/qmldesigner-uiforms-example-main-view.png index 099611c10f..9fc098b9fe 100644 Binary files a/doc/images/qmldesigner-uiforms-example-main-view.png and b/doc/images/qmldesigner-uiforms-example-main-view.png differ diff --git a/doc/images/qmldesigner-visual-editor.png b/doc/images/qmldesigner-visual-editor.png index f40fd880f9..7831f615b8 100644 Binary files a/doc/images/qmldesigner-visual-editor.png and b/doc/images/qmldesigner-visual-editor.png differ -- cgit v1.2.1 From 2b05793083008865a913645e943609f97a16966c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 10:54:50 +0200 Subject: Help: Improved bookmark icon for non-toolbar This change makes the bookmark icons in the bookmark list and locator look better. Change-Id: I9d8fab31ca945ad7d93deb82942ac0f3f972e993 Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/plugins/help/helpwidget.cpp | 4 ++-- src/shared/help/helpicons.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 4def75dd98..284cfec2b6 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -159,7 +159,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_switchToHelp, cmd)); } - m_homeAction = new QAction(Icons::HOME.icon(), tr("Home"), this); + m_homeAction = new QAction(Icons::HOME_TOOLBAR.icon(), tr("Home"), this); cmd = Core::ActionManager::registerAction(m_homeAction, Constants::HELP_HOME, context); connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome); layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd)); @@ -186,7 +186,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setPopupMode(QToolButton::DelayedPopup); layout->addWidget(button); - m_addBookmarkAction = new QAction(Icons::BOOKMARK.icon(), tr("Add Bookmark"), this); + m_addBookmarkAction = new QAction(Icons::BOOKMARK_TOOLBAR.icon(), tr("Add Bookmark"), this); cmd = Core::ActionManager::registerAction(m_addBookmarkAction, Constants::HELP_ADDBOOKMARK, context); cmd->setDefaultKeySequence(QKeySequence(Core::UseMacShortcuts ? tr("Meta+M") : tr("Ctrl+M"))); connect(m_addBookmarkAction, &QAction::triggered, this, &HelpWidget::addBookmark); diff --git a/src/shared/help/helpicons.h b/src/shared/help/helpicons.h index 81230c2c78..2ecdc51292 100644 --- a/src/shared/help/helpicons.h +++ b/src/shared/help/helpicons.h @@ -32,8 +32,10 @@ namespace Help { namespace Icons { const Utils::Icon BOOKMARK({ + {QLatin1String(":/help/images/bookmark.png"), Utils::Theme::PanelTextColorMid}}, Utils::Icon::Tint); +const Utils::Icon BOOKMARK_TOOLBAR({ {QLatin1String(":/help/images/bookmark.png"), Utils::Theme::IconsBaseColor}}); -const Utils::Icon HOME({ +const Utils::Icon HOME_TOOLBAR({ {QLatin1String(":/help/images/home.png"), Utils::Theme::IconsBaseColor}}); const Utils::Icon MODE_HELP_CLASSIC( QLatin1String(":/help/images/mode_help.png")); -- cgit v1.2.1 From 62fc258ac01dc31caada235568c2e92e21d3208d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 14 Apr 2016 09:35:39 +0200 Subject: ImageViewer: Update toolbar items for split/duplicated editors The "export" button in a split/duplicated view was enabled for other image formats than svg. The image size label was empty. Fixes for all views (not just the split ones): The play button is now disabled instead of "empty" for non-movies. The size of svgs is displayed. Change-Id: I1f6a2c47f3aa06ed052ba78e5e2d1edd51a0ec69 Reviewed-by: Alessandro Portale --- src/plugins/imageviewer/imageviewer.cpp | 32 +++++++++++++++-------------- src/plugins/imageviewer/imageviewer.h | 1 + src/plugins/imageviewer/imageviewerfile.cpp | 4 ++-- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp index f3121d62d0..f279125f38 100644 --- a/src/plugins/imageviewer/imageviewer.cpp +++ b/src/plugins/imageviewer/imageviewer.cpp @@ -151,6 +151,8 @@ void ImageViewer::ctor() this, &ImageViewer::imageSizeUpdated); connect(d->file.data(), &ImageViewerFile::openFinished, d->imageView, &ImageView::createScene); + connect(d->file.data(), &ImageViewerFile::openFinished, + this, &ImageViewer::updateToolButtons); connect(d->file.data(), &ImageViewerFile::aboutToReload, d->imageView, &ImageView::reset); connect(d->file.data(), &ImageViewerFile::reloadFinished, @@ -159,12 +161,6 @@ void ImageViewer::ctor() this, &ImageViewer::updatePauseAction); connect(d->imageView, &ImageView::scaleFactorChanged, this, &ImageViewer::scaleFactorUpdate); - - connect(d->file.data(), &ImageViewerFile::openFinished, - this, [this](bool success) - { - d->ui_toolbar.toolButtonExportImage->setEnabled(success && d->file->type() == ImageViewerFile::TypeSvg); - }); } ImageViewer::~ImageViewer() @@ -188,6 +184,8 @@ Core::IEditor *ImageViewer::duplicate() { auto other = new ImageViewer(d->file); other->d->imageView->createScene(); + other->updateToolButtons(); + other->d->ui_toolbar.labelImageSize->setText(d->ui_toolbar.labelImageSize->text()); return other; } @@ -241,6 +239,12 @@ void ImageViewer::fitToScreen() d->ui_toolbar.toolButtonFitToScreen->click(); } +void ImageViewer::updateToolButtons() +{ + d->ui_toolbar.toolButtonExportImage->setEnabled(d->file->type() == ImageViewerFile::TypeSvg); + updatePauseAction(); +} + void ImageViewer::togglePlay() { d->ui_toolbar.toolButtonPlayPause->click(); @@ -254,15 +258,13 @@ void ImageViewer::playToggled() void ImageViewer::updatePauseAction() { bool isMovie = d->file->type() == ImageViewerFile::TypeMovie; - d->ui_toolbar.toolButtonPlayPause->setVisible(isMovie); - if (isMovie) { - if (d->file->isPaused()) { - d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL.pixmap()); - } else { - d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); - d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL.pixmap()); - } + if (isMovie && !d->file->isPaused()) { + d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Pause Animation")); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::INTERRUPT_SMALL.icon()); + } else { + d->ui_toolbar.toolButtonPlayPause->setToolTipBase(tr("Play Animation")); + d->ui_toolbar.toolButtonPlayPause->setIcon(Core::Icons::RUN_SMALL.icon()); + d->ui_toolbar.toolButtonPlayPause->setEnabled(isMovie); } } diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h index 5d65c6760a..d2bbb32541 100644 --- a/src/plugins/imageviewer/imageviewer.h +++ b/src/plugins/imageviewer/imageviewer.h @@ -66,6 +66,7 @@ public slots: void zoomOut(); void resetToOriginalSize(); void fitToScreen(); + void updateToolButtons(); void togglePlay(); private slots: diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp index f5192db521..031ca999d4 100644 --- a/src/plugins/imageviewer/imageviewerfile.cpp +++ b/src/plugins/imageviewer/imageviewerfile.cpp @@ -108,7 +108,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, cons if (format.startsWith("svg")) { m_tempSvgItem = new QGraphicsSvgItem(fileName); QRectF bound = m_tempSvgItem->boundingRect(); - if (bound.width() == 0 && bound.height() == 0) { + if (qFuzzyIsNull(bound.width()) && qFuzzyIsNull(bound.height())) { delete m_tempSvgItem; m_tempSvgItem = 0; if (errorString) @@ -116,7 +116,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, cons return OpenResult::CannotHandle; } m_type = TypeSvg; - emit imageSizeChanged(QSize()); + emit imageSizeChanged(m_tempSvgItem->boundingRect().size().toSize()); } else #endif if (QMovie::supportedFormats().contains(format)) { -- cgit v1.2.1 From c0fabbe169a9678eb8df0505de54fdaf9fec1a3f Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Apr 2016 18:19:45 +0200 Subject: Debugger: Add breakpoint commands for LLDB backend Commands needs to be given in Python, i.e. something like import time print time.asctime() for i in range(1, 10): print(i) works. Task-number: QTCREATORBUG-15585 Change-Id: I7724617e4bbe85a717ae78b21014e2b55c4089c8 Reviewed-by: Alexandru Croitor Reviewed-by: hjk --- share/qtcreator/debugger/lldbbridge.py | 16 ++++++++++++++++ src/plugins/debugger/breakhandler.cpp | 2 ++ src/plugins/debugger/breakhandler.h | 2 ++ src/plugins/debugger/lldb/lldbengine.cpp | 2 ++ 4 files changed, 22 insertions(+) diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index 6fd697fcc3..506f2379a8 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -160,6 +160,7 @@ lldb.SBType.__str__ = lldb.SBType.GetName class Dumper(DumperBase): def __init__(self): DumperBase.__init__(self) + lldb.theDumper = self self.outputLock = threading.Lock() self.debugger = lldb.SBDebugger.Create() @@ -1489,6 +1490,21 @@ class Dumper(DumperBase): bp.SetIgnoreCount(int(args["ignorecount"])) bp.SetCondition(self.hexdecode(args["condition"])) bp.SetEnabled(bool(args["enabled"])) + bp.SetScriptCallbackBody('\n'.join([ + "def foo(frame = frame, bp_loc = bp_loc, dict = internal_dict):", + " " + self.hexdecode(args["command"]).replace('\n', '\n '), + "from cStringIO import StringIO", + "origout = sys.stdout", + "sys.stdout = StringIO()", + "result = foo()", + "d = lldb.theDumper", + "output = d.hexencode(sys.stdout.getvalue())", + "sys.stdout = origout", + "d.report('output={channel=\"stderr\",data=\"' + output + '\"}')", + "if result is False:", + " d.reportState('continueafternextstop')", + "return True" + ])) if isinstance(bp, lldb.SBBreakpoint): bp.SetOneShot(bool(args["oneshot"])) self.reportResult(self.describeBreakpoint(bp) + extra, args) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index f49bbf6881..207cddbf27 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -733,6 +733,7 @@ PROPERTY(QString, functionName, setFunctionName) PROPERTY(BreakpointType, type, setType) PROPERTY(int, threadSpec, setThreadSpec) PROPERTY(QByteArray, condition, setCondition) +PROPERTY(QString, command, setCommand) PROPERTY(quint64, address, setAddress) PROPERTY(QString, expression, setExpression) PROPERTY(QString, message, setMessage) @@ -757,6 +758,7 @@ void Breakpoint::addToCommand(DebuggerCommand *cmd) const cmd->arg("type", type()); cmd->arg("ignorecount", ignoreCount()); cmd->arg("condition", condition().toHex()); + cmd->arg("command", command().toUtf8().toHex()); cmd->arg("function", functionName().toUtf8()); cmd->arg("oneshot", isOneShot()); cmd->arg("enabled", isEnabled()); diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 763db17ce5..150cfd4375 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -113,6 +113,8 @@ public: QString expression() const; void setExpression(const QString &expression); QString message() const; + QString command() const; + void setCommand(const QString &command); void setMessage(const QString &m); BreakpointType type() const; void setType(const BreakpointType &type); diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 196972a013..03c627e14d 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -895,6 +895,8 @@ void LldbEngine::handleStateNotification(const GdbMi &reportedState) notifyInferiorRunOk(); else if (newState == "inferiorrunfailed") notifyInferiorRunFailed(); + else if (newState == "continueafternextstop") + m_continueAtNextSpontaneousStop = true; else if (newState == "stopped") { notifyInferiorSpontaneousStop(); if (m_continueAtNextSpontaneousStop) { -- cgit v1.2.1 From 4ba5dfccf57e6c4fc2df85481d37da811aabdae1 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Apr 2016 18:55:35 +0200 Subject: Debugger: Make LLDB startup user-configurable ... by reusing GDB startup command settings Task-number: QTCREATORBUG-15584 Change-Id: I24a04ac8608f0c37374ff9c1d93d509a811d8942 Reviewed-by: Alexandru Croitor Reviewed-by: hjk --- src/plugins/debugger/lldb/lldbengine.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 03c627e14d..50de21b61c 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -283,6 +283,10 @@ void LldbEngine::startLldbStage2() m_lldbProc.write("script from lldbbridge import *\n"); m_lldbProc.write("script print(dir())\n"); m_lldbProc.write("script theDumper = Dumper()\n"); // This triggers reportState("enginesetupok") + + const QString commands = expand(stringSetting(GdbStartupCommands)); + if (!commands.isEmpty()) + m_lldbProc.write(commands.toLocal8Bit()); } void LldbEngine::setupInferior() -- cgit v1.2.1 From 84d7852c0678b76405856efb16808d3f73efc9a0 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Mon, 11 Apr 2016 13:19:52 +0200 Subject: QmlDesigner: improve code niceness Change-Id: I05ba3c6741977270c9abf9137db447c74dce025f Reviewed-by: Tim Jenssen --- .../components/propertyeditor/propertyeditorqmlbackend.cpp | 2 -- .../qmldesigner/components/propertyeditor/propertyeditorvalue.cpp | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp index 7da39cf637..ec0da2a136 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp @@ -293,10 +293,8 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q m_backendAnchorBinding.setup(qmlObjectNode.modelNode()); context()->setContextProperty(QLatin1String("anchorBackend"), &m_backendAnchorBinding); - context()->setContextProperty(QLatin1String("transaction"), m_propertyEditorTransaction.data()); - // model node m_backendModelNode.setup(qmlObjectNode.modelNode()); context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode); diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp index 5e90162cfd..7d2f60162b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.cpp @@ -148,9 +148,8 @@ void PropertyEditorValue::setValueWithEmit(const QVariant &value) void PropertyEditorValue::setValue(const QVariant &value) { if (!compareVariants(m_value, value) && - !cleverDoubleCompare(value, m_value) && - !cleverColorCompare(value, m_value)) - + !cleverDoubleCompare(value, m_value) && + !cleverColorCompare(value, m_value)) m_value = value; fixAmbigousColorNames(modelNode(), name(), &m_value); -- cgit v1.2.1 From f18d32ee1424881180ccd0ef3811d130c942db69 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 15 Apr 2016 12:49:48 +0200 Subject: CdbExt: Remove unneeded add symbol for shared pointer. Change-Id: I88da67b3c330e04befcdd0bc9074d28f400f199c Reviewed-by: Christian Stenger --- src/libs/qtcreatorcdbext/symbolgroupvalue.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp index 49e4631d9e..657babb7c0 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp +++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.cpp @@ -2852,16 +2852,14 @@ static inline bool dumpQSharedPointer(const SymbolGroupValue &v, std::wostream & str << L"(null)"; return true; } - std::ostringstream namestr; - namestr << "*(" << SymbolGroupValue::stripClassPrefixes(value.type()) << ")(" - << std::showbase << std::hex << value.pointerValue() << ')'; - SymbolGroupNode *valueNode - = v.node()->symbolGroup()->addSymbol(v.module(), namestr.str(), std::string(), &std::string()); - if (!valueNode) - return false; - str << valueNode->simpleDumpValue(v.context(), encoding); - return true; + if (knownType(value.type(), KnownTypeAutoStripPointer | KnownTypeHasClassPrefix) + & KT_HasSimpleDumper) { + str << value.node()->simpleDumpValue(v.context(), encoding); + return true; + } + + return false; } } -- cgit v1.2.1 From 9cc50a96e4c9ea1ed562e9140863933a9c5da872 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 15 Apr 2016 12:02:10 +0200 Subject: Clang: Fix updating warning config widgets on remove Problematic use case was: 1. Go to projects mode, select "Clang Code Model" 2. Click "Copy...", click "OK" and add e.g. " -Wbla" 3. Click "Remove" ==> The configuration is reset (combobox), but the warning options are not (" -Wbla" is still there). Change-Id: Ifc445a3fa0e3b3191915cf7bca220f4bef848069 Reviewed-by: Christian Stenger --- src/plugins/cpptools/clangdiagnosticconfigswidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp index 55213d4f24..bb3d55c3cc 100644 --- a/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp +++ b/src/plugins/cpptools/clangdiagnosticconfigswidget.cpp @@ -157,10 +157,12 @@ void ClangDiagnosticConfigsWidget::syncConfigChooserToModel(const Core::Id &conf connectConfigChooserCurrentIndex(); - if (configToSelectIndex != -1) + if (configToSelectIndex != -1) { m_ui->configChooserComboBox->setCurrentIndex(configToSelectIndex); - else if (previousCurrentIndex != m_ui->configChooserComboBox->currentIndex()) + } else if (previousCurrentIndex != m_ui->configChooserComboBox->currentIndex()) { + syncOtherWidgetsToComboBox(); emit currentConfigChanged(currentConfigId()); + } } void ClangDiagnosticConfigsWidget::syncOtherWidgetsToComboBox() -- cgit v1.2.1 From 532cd88dd740490400afbc565d4409e37105e200 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 6 Apr 2016 09:00:19 +0200 Subject: Squish: MSVC2015 and Build Tools are supported... ...so, expect them if they are present. Change-Id: I333bba81717d44431857a543540e5599e2de7fed Reviewed-by: Robert Loehning --- .../suite_general/tst_default_settings/test.py | 4 ++ .../testdata/win_compiler_paths.tsv | 50 ++++++++++++---------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/tests/system/suite_general/tst_default_settings/test.py b/tests/system/suite_general/tst_default_settings/test.py index 6b6dc96d69..5f77277bb0 100644 --- a/tests/system/suite_general/tst_default_settings/test.py +++ b/tests/system/suite_general/tst_default_settings/test.py @@ -189,6 +189,10 @@ def __getWinCompilers__(): if os.path.exists(compiler): parameters = testData.field(record, "displayedParameters").split(",") usedParameters = testData.field(record, "usedParameters").split(",") + idePath = testData.field(record, "IDEPath") + if len(idePath): + if not os.path.exists(os.path.abspath(os.path.join(envvar, idePath))): + continue if testData.field(record, "isSDK") == "true": for para, used in zip(parameters, usedParameters): result.append( diff --git a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv index a9a8e548e3..66149bb891 100644 --- a/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv +++ b/tests/system/suite_general/tst_default_settings/testdata/win_compiler_paths.tsv @@ -1,23 +1,27 @@ -"envvar" "path" "file" "displayName" "displayedParameters" "usedParameters" "isSDK" -"ProgramFiles" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"ProgramFiles(x86)" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"ProgramW6432" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"ProgramFiles" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"ProgramFiles(x86)" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"ProgramW6432" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" -"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 8.0" "x86" "" "false" -"VS80COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 8.0" "amd64" "amd64" "false" -"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_amd64" "x86_amd64" "false" -"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 8.0" "ia64" "ia64" "false" -"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_ia64" "x86_ia64" "false" -"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 9.0" "x86" "" "false" -"VS90COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 9.0" "amd64" "amd64" "false" -"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_amd64" "x86_amd64" "false" -"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 9.0" "ia64" "ia64" "false" -"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_ia64" "x86_ia64" "false" -"VS100COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 10.0" "x86" "" "false" -"VS100COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 10.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" -"VS110COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 11.0" "x86" "" "false" -"VS110COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 11.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" -"VS120COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 12.0" "x86" "" "false" -"VS120COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 12.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" +"envvar" "path" "file" "displayName" "displayedParameters" "usedParameters" "isSDK" "IDEPath" +"ProgramFiles" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"ProgramFiles(x86)" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"ProgramW6432" "Microsoft SDKs\Windows\v7.0\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"ProgramFiles" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"ProgramFiles(x86)" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"ProgramW6432" "Microsoft SDKs\Windows\v7.1\Bin" "SetEnv.cmd" "Microsoft Windows SDK for Windows 7" "x86,amd64,x86_amd64,ia64,x86_ia64" "/x86,/x64,/x64,/ia64,/ia64" "true" "" +"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 8.0" "x86" "" "false" "" +"VS80COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 8.0" "amd64" "amd64" "false" "" +"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_amd64" "x86_amd64" "false" "" +"VS80COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 8.0" "ia64" "ia64" "false" "" +"VS80COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 8.0" "x86_ia64" "x86_ia64" "false" "" +"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 9.0" "x86" "" "false" "" +"VS90COMNTOOLS" "..\..\VC\Bin\amd64" "vcvarsamd64.bat" "Microsoft Visual C++ Compiler 9.0" "amd64" "amd64" "false" "" +"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_amd64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_amd64" "x86_amd64" "false" "" +"VS90COMNTOOLS" "..\..\VC\Bin" "vcvars64.bat" "Microsoft Visual C++ Compiler 9.0" "ia64" "ia64" "false" "" +"VS90COMNTOOLS" "..\..\VC\Bin" "vcvarsx86_ia64.bat" "Microsoft Visual C++ Compiler 9.0" "x86_ia64" "x86_ia64" "false" "" +"VS100COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 10.0" "x86" "" "false" "" +"VS100COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 10.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" "" +"VS110COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 11.0" "x86" "" "false" "" +"VS110COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 11.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" "" +"VS120COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 12.0" "x86" "" "false" "" +"VS120COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 12.0" "x86,amd64,x86_amd64,ia64,x86_ia64" "x86,amd64,x86_amd64,ia64,x86_ia64" "false" "" +"VS140COMNTOOLS" "..\..\VC\Bin" "vcvars32.bat" "Microsoft Visual C++ Compiler 14.0" "x86" "" "false" "..\IDE\devenv.exe" +"VS140COMNTOOLS" "..\..\VC" "vcvarsall.bat" "Microsoft Visual C++ Compiler 14.0" "x86,amd64,x86_amd64,x86_arm,amd64_arm" "x86,amd64,x86_amd64,x86_arm,amd64_arm" "false" "..\IDE\devenv.exe" +"ProgramFiles" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" "" +"ProgramFiles(x86)" "Microsoft Visual C++ Build Tools" "vcbuildtools.bat" "Microsoft Visual C++ Build Tools" "x86,x64,x86_arm,x64_arm" "x86,amd64,x86_arm,amd64_arm" "false" "" -- cgit v1.2.1 From 9e63807134c5c173ae968e7383a1a78f135c90fb Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Wed, 13 Apr 2016 14:05:34 +0200 Subject: Squish: Remove workaround for fixed bug This reverts commit ca66ad3d0cc324c850426537341c24187dacd814. Task-number: QTCREATORBUG-15806 Change-Id: I2e81aa5c0fe014be6dda32b326ab3d4a1bfd9600 Reviewed-by: Christian Stenger --- tests/system/suite_debugger/tst_simple_debug/test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index acbcd4a626..205ef99cfc 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -52,9 +52,6 @@ def main(): if result: expectedBreakpointsOrder = [{os.path.join(workingDir, projectName, "main.cpp"):8}, {os.path.join(workingDir, projectName, "main.qml"):10}] - if JIRA.isBugStillOpen(15806): - test.xfail("Breakpoint in QML file won't be hit (QTCREATORBUG-15806).") - expectedBreakpointsOrder = expectedBreakpointsOrder[:-1] # Only use 4.7.4 to work around QTBUG-25187 availableConfigs = iterateBuildConfigs(len(checkedTargets), "Debug") progressBarWait() -- cgit v1.2.1 From 6e1b06659e8d5323c499ed8d39a98deb8fe92a6b Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 15 Apr 2016 15:04:28 +0200 Subject: ProjectExplorer: Initialize m_cascadeSetActive Change-Id: I94ae32c7b9cd0774205ac91b09fef5beed80f540 Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/session.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index da9132e477..116762dceb 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -79,6 +79,7 @@ public: m_sessionName(QLatin1String("default")), m_virginSession(true), m_loadingSession(false), + m_casadeSetActive(false), m_startupProject(0), m_writer(0) {} -- cgit v1.2.1 From c94deb07bdd04b2d5e21b5e2900dacb43001c85c Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 15 Apr 2016 15:02:39 +0200 Subject: Doc: Fix field name in QNX deployment topic Files to install for subproject > Files to deploy Change-Id: Iefba158ee0237ba638aceb5f73a7d61b038d59e3 Reviewed-by: Tobias Hunger --- doc/src/qnx/creator-deployment-qnx.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc index b0d3cc67f6..90c36930a9 100644 --- a/doc/src/qnx/creator-deployment-qnx.qdoc +++ b/doc/src/qnx/creator-deployment-qnx.qdoc @@ -47,7 +47,7 @@ \image qtcreator-qnx-deployment.png "Deploy to device" The files to be installed are listed in the \uicontrol {Deployment} step, - the \uicontrol {Files to install for subproject} field. The + the \uicontrol {Files to deploy} field. The \uicontrol {Local File Path} field displays the location of the file on the development PC. The \uicontrol {Remote Directory} field displays the folder where the file is installed on the device. Text in red color indicates that -- cgit v1.2.1 From 25603f9dc830f3b0f8a5eecbf236d98a06193195 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 15:29:15 +0200 Subject: Themes: New display names "Default" -> "Classic", "Default Flat" -> "Flat" Also the defaultflat.creatortheme is renamed to flat.creatortheme. The file name of the "Classic" theme remains default.creatortheme in order to make sure that who previously actively switched to another theme and back to default won't suddenly get the flat one. Change-Id: I1a1f35aded00201a685ad221b70a9b728f2be972 Reviewed-by: Tobias Hunger Reviewed-by: Orgad Shaneh --- share/qtcreator/themes/default.creatortheme | 2 +- share/qtcreator/themes/defaultflat.creatortheme | 198 ------------------------ share/qtcreator/themes/flat.creatortheme | 198 ++++++++++++++++++++++++ src/plugins/coreplugin/coreconstants.h | 2 +- 4 files changed, 200 insertions(+), 200 deletions(-) delete mode 100644 share/qtcreator/themes/defaultflat.creatortheme create mode 100644 share/qtcreator/themes/flat.creatortheme diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme index b6dcbcca12..28b7e642d6 100644 --- a/share/qtcreator/themes/default.creatortheme +++ b/share/qtcreator/themes/default.creatortheme @@ -1,5 +1,5 @@ [General] -ThemeName=Default +ThemeName=Classic PreferredStyles= [Palette] diff --git a/share/qtcreator/themes/defaultflat.creatortheme b/share/qtcreator/themes/defaultflat.creatortheme deleted file mode 100644 index c8d51b6ca7..0000000000 --- a/share/qtcreator/themes/defaultflat.creatortheme +++ /dev/null @@ -1,198 +0,0 @@ -[General] -ThemeName=Default Flat -PreferredStyles= - -[Palette] -shadowBackground=ff404244 -text=ff000000 -textDisabled=55000000 -toolBarItem=b6fbfdff -toolBarItemDisabled=60a4a6a8 -fancyBarsNormalTextColor=ffffffff -fancyBarsBoldTextColor=b6fbfdff -hoverBackground=22ffffff -selectedBackground=66000000 -normalBackground=ffffffff -alternateBackground=ff515151 -error=ffe41e25 -splitter=ff313131 - -[Colors] -BackgroundColorAlternate=alternateBackground -BackgroundColorDark=shadowBackground -BackgroundColorHover=hoverBackground -BackgroundColorNormal=normalBackground -BackgroundColorDisabled=ff444444 -BackgroundColorSelected=selectedBackground -BadgeLabelBackgroundColorChecked=ffe0e0e0 -BadgeLabelBackgroundColorUnchecked=ff808080 -BadgeLabelTextColorChecked=ff606060 -BadgeLabelTextColorUnchecked=ffffffff -CanceledSearchTextColor=ff0000 -ComboBoxArrowColor=toolBarItem -ComboBoxArrowColorDisabled=toolBarItemDisabled -ComboBoxTextColor=fancyBarsNormalTextColor -DetailsButtonBackgroundColorHover=b4ffffff -DetailsWidgetBackgroundColor=28ffffff -DockWidgetResizeHandleColor=splitter -DoubleTabWidget1stSeparatorColor=ffff0000 -DoubleTabWidget1stTabActiveTextColor=ff000000 -DoubleTabWidget1stTabBackgroundColor=ffff0000 -DoubleTabWidget1stTabInactiveTextColor=ffffffff -DoubleTabWidget2ndSeparatorColor=ffff0000 -DoubleTabWidget2ndTabActiveTextColor=ffffffff -DoubleTabWidget2ndTabBackgroundColor=ffff0000 -DoubleTabWidget2ndTabInactiveTextColor=ff000000 -EditorPlaceholderColor=ffdddddd -FancyToolBarSeparatorColor=toolBarItemDisabled -FancyTabBarBackgroundColor=shadowBackground -FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled -FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled -FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor -FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor -FancyToolButtonHoverColor=hoverBackground -FancyToolButtonSelectedColor=selectedBackground -FutureProgressBackgroundColor=shadowBackground -IconsBaseColor=toolBarItem -IconsDisabledColor=toolBarItemDisabled -IconsInfoColor=ff3099dc -IconsInfoToolBarColor=ff71b2db -IconsWarningColor=ffecbc1c -IconsWarningToolBarColor=fff2d76e -IconsErrorColor=ffdf4f4f -IconsErrorToolBarColor=ffdb6f71 -IconsRunColor=dda4d576 -IconsStopColor=ddff8c8c -IconsDebugColor=toolBarItem -IconsInterruptColor=dd7488db -IconsNavigationArrowsColor=ffebc322 -IconsBuildHammerHandleColor=dddd7710 -IconsBuildHammerHeadColor=dd989898 -IconsModeWelcomeActiveColor=ff80c342 -IconsModeEditActiveColor=ff99aaef -IconsModeDesignActiveColor=ffbb6000 -IconsModeDebugActiveColor=ff99aaef -IconsModeProjetcsActiveColor=ff80c342 -IconsModeAnalyzeActiveColor=ff43adee -IconsModeHelpActiveColor=fff4be04 -IconsCodeModelKeywordColor=ff777777 -IconsCodeModelClassColor=ffc0b550 -IconsCodeModelStructColor=ff53b053 -IconsCodeModelFunctionColor=ffd34373 -IconsCodeModelVariableColor=ff2bbbcc -IconsCodeModelEnumColor=ffc0b550 -IconsCodeModelMacroColor=ff476ba0 -IconsCodeModelAttributeColor=ff316511 -IconsCodeModelUniformColor=ff994899 -IconsCodeModelVaryingColor=ffa08833 -IconsCodeModelOverlayBackgroundColor=70ffffff -IconsCodeModelOverlayForegroundColor=ff232425 -InfoBarBackground=ffffffe1 -InfoBarText=text -MenuBarEmptyAreaBackgroundColor=shadowBackground -MenuBarItemBackgroundColor=shadowBackground -MenuBarItemTextColorDisabled=textDisabled -MenuBarItemTextColorNormal=text -MenuItemTextColorDisabled=textDisabled -MenuItemTextColorNormal=text -MiniProjectTargetSelectorBackgroundColor=shadowBackground -MiniProjectTargetSelectorBorderColor=shadowBackground -MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground -MiniProjectTargetSelectorTextColor=text -PanelStatusBarBackgroundColor=shadowBackground -PanelsWidgetSeparatorLineColor=0 -PanelTextColorDark=text -PanelTextColorMid=ff666666 -PanelTextColorLight=fancyBarsNormalTextColor -ProgressBarColorError=ffdb6f71 -ProgressBarColorFinished=dda4d576 -ProgressBarColorNormal=ff999999 -ProgressBarTitleColor=fancyBarsBoldTextColor -ProgressBarBackgroundColor=a0606060 -SplitterColor=splitter -TextColorDisabled=textDisabled -TextColorError=ffff4040 -TextColorHighlight=ffff0000 -TextColorLink=ff007af4 -TextColorLinkVisited=ffa57aff -TextColorNormal=text -TodoItemTextColor=text -ToggleButtonBackgroundColor=shadowBackground -ToolBarBackgroundColor=shadowBackground -TreeViewArrowColorNormal=hoverBackground -TreeViewArrowColorSelected=text - -OutputPanes_DebugTextColor=text -OutputPanes_ErrorMessageTextColor=ffaa0000 -OutputPanes_MessageOutput=ff0000aa -OutputPanes_NormalMessageTextColor=ff0000aa -OutputPanes_StdErrTextColor=ffaa0000 -OutputPanes_StdOutTextColor=ff000000 -OutputPanes_WarningMessageTextColor=ff808000 -OutputPanes_TestPassTextColor=ff009900 -OutputPanes_TestFailTextColor=ffa00000 -OutputPanes_TestXFailTextColor=ff28f028 -OutputPanes_TestXPassTextColor=fff02828 -OutputPanes_TestSkipTextColor=ff787878 -OutputPanes_TestWarnTextColor=ffd0bb00 -OutputPanes_TestFatalTextColor=ff640000 -OutputPanes_TestDebugTextColor=ff329696 -OutputPaneButtonFlashColor=ffff0000 -OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor -OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor - -Debugger_LogWindow_LogInput=ff00acac -Debugger_LogWindow_LogStatus=ff00875a -Debugger_LogWindow_LogTime=ffbf0303 - -Debugger_WatchItem_ValueNormal=text -Debugger_WatchItem_ValueInvalid=textDisabled -Debugger_WatchItem_ValueChanged=ffbf0303 - -Debugger_Breakpoint_TextMarkColor=ffff4040 - -Welcome_TextColor=ff000000 -Welcome_ForegroundPrimaryColor=ff404244 -Welcome_ForegroundSecondaryColor=ff727476 -Welcome_BackgroundColor=normalBackground -Welcome_ButtonBackgroundColor=normalBackground -Welcome_DividerColor=ffd6d6d6 -Welcome_HoverColor=fff6f6f6 -Welcome_LinkColor=ff5caa15 - -VcsBase_FileStatusUnknown_TextColor=ff000000 -VcsBase_FileAdded_TextColor=ff00aa00 -VcsBase_FileModified_TextColor=ff0000ee -VcsBase_FileDeleted_TextColor=ffee0000 -VcsBase_FileRenamed_TextColor=ffd77d00 - -Bookmarks_TextMarkColor=ffa0a0ff - -TextEditor_SearchResult_ScrollBarColor=ff00c000 -TextEditor_CurrentLine_ScrollBarColor=ff404040 - -ProjectExplorer_TaskError_TextMarkColor=ffff0000 -ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 - -ClangCodeModel_Error_TextMarkColor=ffff882f -ClangCodeModel_Warning_TextMarkColor=ffc6c132 - -[Flags] -ComboBoxDrawTextShadow=false -DerivePaletteFromTheme=false -DrawIndicatorBranch=true -DrawSearchResultWidgetFrame=false -DrawTargetSelectorBottom=false -DrawToolBarHighlights=false -ApplyThemePaletteGlobally=false -FlatSideBarIcons=true -FlatProjectsMode=false -FlatMenuBar=false - -[Gradients] -DetailsWidgetHeaderGradient\1\color=0 -DetailsWidgetHeaderGradient\1\pos=1 -DetailsWidgetHeaderGradient\size=1 - -[Style] -WidgetStyle=StyleFlat diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme new file mode 100644 index 0000000000..5e3f9cfc8c --- /dev/null +++ b/share/qtcreator/themes/flat.creatortheme @@ -0,0 +1,198 @@ +[General] +ThemeName=Flat +PreferredStyles= + +[Palette] +shadowBackground=ff404244 +text=ff000000 +textDisabled=55000000 +toolBarItem=b6fbfdff +toolBarItemDisabled=60a4a6a8 +fancyBarsNormalTextColor=ffffffff +fancyBarsBoldTextColor=b6fbfdff +hoverBackground=22ffffff +selectedBackground=66000000 +normalBackground=ffffffff +alternateBackground=ff515151 +error=ffe41e25 +splitter=ff313131 + +[Colors] +BackgroundColorAlternate=alternateBackground +BackgroundColorDark=shadowBackground +BackgroundColorHover=hoverBackground +BackgroundColorNormal=normalBackground +BackgroundColorDisabled=ff444444 +BackgroundColorSelected=selectedBackground +BadgeLabelBackgroundColorChecked=ffe0e0e0 +BadgeLabelBackgroundColorUnchecked=ff808080 +BadgeLabelTextColorChecked=ff606060 +BadgeLabelTextColorUnchecked=ffffffff +CanceledSearchTextColor=ff0000 +ComboBoxArrowColor=toolBarItem +ComboBoxArrowColorDisabled=toolBarItemDisabled +ComboBoxTextColor=fancyBarsNormalTextColor +DetailsButtonBackgroundColorHover=b4ffffff +DetailsWidgetBackgroundColor=28ffffff +DockWidgetResizeHandleColor=splitter +DoubleTabWidget1stSeparatorColor=ffff0000 +DoubleTabWidget1stTabActiveTextColor=ff000000 +DoubleTabWidget1stTabBackgroundColor=ffff0000 +DoubleTabWidget1stTabInactiveTextColor=ffffffff +DoubleTabWidget2ndSeparatorColor=ffff0000 +DoubleTabWidget2ndTabActiveTextColor=ffffffff +DoubleTabWidget2ndTabBackgroundColor=ffff0000 +DoubleTabWidget2ndTabInactiveTextColor=ff000000 +EditorPlaceholderColor=ffdddddd +FancyToolBarSeparatorColor=toolBarItemDisabled +FancyTabBarBackgroundColor=shadowBackground +FancyTabWidgetDisabledSelectedTextColor=toolBarItemDisabled +FancyTabWidgetDisabledUnselectedTextColor=toolBarItemDisabled +FancyTabWidgetEnabledSelectedTextColor=fancyBarsBoldTextColor +FancyTabWidgetEnabledUnselectedTextColor=fancyBarsBoldTextColor +FancyToolButtonHoverColor=hoverBackground +FancyToolButtonSelectedColor=selectedBackground +FutureProgressBackgroundColor=shadowBackground +IconsBaseColor=toolBarItem +IconsDisabledColor=toolBarItemDisabled +IconsInfoColor=ff3099dc +IconsInfoToolBarColor=ff71b2db +IconsWarningColor=ffecbc1c +IconsWarningToolBarColor=fff2d76e +IconsErrorColor=ffdf4f4f +IconsErrorToolBarColor=ffdb6f71 +IconsRunColor=dda4d576 +IconsStopColor=ddff8c8c +IconsDebugColor=toolBarItem +IconsInterruptColor=dd7488db +IconsNavigationArrowsColor=ffebc322 +IconsBuildHammerHandleColor=dddd7710 +IconsBuildHammerHeadColor=dd989898 +IconsModeWelcomeActiveColor=ff80c342 +IconsModeEditActiveColor=ff99aaef +IconsModeDesignActiveColor=ffbb6000 +IconsModeDebugActiveColor=ff99aaef +IconsModeProjetcsActiveColor=ff80c342 +IconsModeAnalyzeActiveColor=ff43adee +IconsModeHelpActiveColor=fff4be04 +IconsCodeModelKeywordColor=ff777777 +IconsCodeModelClassColor=ffc0b550 +IconsCodeModelStructColor=ff53b053 +IconsCodeModelFunctionColor=ffd34373 +IconsCodeModelVariableColor=ff2bbbcc +IconsCodeModelEnumColor=ffc0b550 +IconsCodeModelMacroColor=ff476ba0 +IconsCodeModelAttributeColor=ff316511 +IconsCodeModelUniformColor=ff994899 +IconsCodeModelVaryingColor=ffa08833 +IconsCodeModelOverlayBackgroundColor=70ffffff +IconsCodeModelOverlayForegroundColor=ff232425 +InfoBarBackground=ffffffe1 +InfoBarText=text +MenuBarEmptyAreaBackgroundColor=shadowBackground +MenuBarItemBackgroundColor=shadowBackground +MenuBarItemTextColorDisabled=textDisabled +MenuBarItemTextColorNormal=text +MenuItemTextColorDisabled=textDisabled +MenuItemTextColorNormal=text +MiniProjectTargetSelectorBackgroundColor=shadowBackground +MiniProjectTargetSelectorBorderColor=shadowBackground +MiniProjectTargetSelectorSummaryBackgroundColor=shadowBackground +MiniProjectTargetSelectorTextColor=text +PanelStatusBarBackgroundColor=shadowBackground +PanelsWidgetSeparatorLineColor=0 +PanelTextColorDark=text +PanelTextColorMid=ff666666 +PanelTextColorLight=fancyBarsNormalTextColor +ProgressBarColorError=ffdb6f71 +ProgressBarColorFinished=dda4d576 +ProgressBarColorNormal=ff999999 +ProgressBarTitleColor=fancyBarsBoldTextColor +ProgressBarBackgroundColor=a0606060 +SplitterColor=splitter +TextColorDisabled=textDisabled +TextColorError=ffff4040 +TextColorHighlight=ffff0000 +TextColorLink=ff007af4 +TextColorLinkVisited=ffa57aff +TextColorNormal=text +TodoItemTextColor=text +ToggleButtonBackgroundColor=shadowBackground +ToolBarBackgroundColor=shadowBackground +TreeViewArrowColorNormal=hoverBackground +TreeViewArrowColorSelected=text + +OutputPanes_DebugTextColor=text +OutputPanes_ErrorMessageTextColor=ffaa0000 +OutputPanes_MessageOutput=ff0000aa +OutputPanes_NormalMessageTextColor=ff0000aa +OutputPanes_StdErrTextColor=ffaa0000 +OutputPanes_StdOutTextColor=ff000000 +OutputPanes_WarningMessageTextColor=ff808000 +OutputPanes_TestPassTextColor=ff009900 +OutputPanes_TestFailTextColor=ffa00000 +OutputPanes_TestXFailTextColor=ff28f028 +OutputPanes_TestXPassTextColor=fff02828 +OutputPanes_TestSkipTextColor=ff787878 +OutputPanes_TestWarnTextColor=ffd0bb00 +OutputPanes_TestFatalTextColor=ff640000 +OutputPanes_TestDebugTextColor=ff329696 +OutputPaneButtonFlashColor=ffff0000 +OutputPaneToggleButtonTextColorChecked=fancyBarsNormalTextColor +OutputPaneToggleButtonTextColorUnchecked=fancyBarsNormalTextColor + +Debugger_LogWindow_LogInput=ff00acac +Debugger_LogWindow_LogStatus=ff00875a +Debugger_LogWindow_LogTime=ffbf0303 + +Debugger_WatchItem_ValueNormal=text +Debugger_WatchItem_ValueInvalid=textDisabled +Debugger_WatchItem_ValueChanged=ffbf0303 + +Debugger_Breakpoint_TextMarkColor=ffff4040 + +Welcome_TextColor=ff000000 +Welcome_ForegroundPrimaryColor=ff404244 +Welcome_ForegroundSecondaryColor=ff727476 +Welcome_BackgroundColor=normalBackground +Welcome_ButtonBackgroundColor=normalBackground +Welcome_DividerColor=ffd6d6d6 +Welcome_HoverColor=fff6f6f6 +Welcome_LinkColor=ff5caa15 + +VcsBase_FileStatusUnknown_TextColor=ff000000 +VcsBase_FileAdded_TextColor=ff00aa00 +VcsBase_FileModified_TextColor=ff0000ee +VcsBase_FileDeleted_TextColor=ffee0000 +VcsBase_FileRenamed_TextColor=ffd77d00 + +Bookmarks_TextMarkColor=ffa0a0ff + +TextEditor_SearchResult_ScrollBarColor=ff00c000 +TextEditor_CurrentLine_ScrollBarColor=ff404040 + +ProjectExplorer_TaskError_TextMarkColor=ffff0000 +ProjectExplorer_TaskWarn_TextMarkColor=ffffa500 + +ClangCodeModel_Error_TextMarkColor=ffff882f +ClangCodeModel_Warning_TextMarkColor=ffc6c132 + +[Flags] +ComboBoxDrawTextShadow=false +DerivePaletteFromTheme=false +DrawIndicatorBranch=true +DrawSearchResultWidgetFrame=false +DrawTargetSelectorBottom=false +DrawToolBarHighlights=false +ApplyThemePaletteGlobally=false +FlatSideBarIcons=true +FlatProjectsMode=false +FlatMenuBar=false + +[Gradients] +DetailsWidgetHeaderGradient\1\color=0 +DetailsWidgetHeaderGradient\1\pos=1 +DetailsWidgetHeaderGradient\size=1 + +[Style] +WidgetStyle=StyleFlat diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 77052130fd..8b8c2626e1 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -198,7 +198,7 @@ const char SETTINGS_ID_MIMETYPES[] = "E.MimeTypes"; const char SETTINGS_DEFAULTTEXTENCODING[] = "General/DefaultFileEncoding"; const char SETTINGS_THEME[] = "Core/CreatorTheme"; -const char DEFAULT_THEME[] = "default"; +const char DEFAULT_THEME[] = "classic"; const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)"); -- cgit v1.2.1 From 12788ffb2dafea1536efa49fd9e1b1c98898cd35 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Apr 2016 15:13:54 +0200 Subject: Debugger: Avoid looking up references too often Multiple copies of lookup requests may accumulate when stepping too quickly, outsmarting the 'all updates done' logic, keeping Locals&Expressions in the grey 'update ongoing' state. Change-Id: Icec24ce1af8d273c3439ee91800ed1f4381ee19a Reviewed-by: Ulf Hermann (cherry picked from commit c1de315d6cbf8c94888aa4598d574ee2c3db272e) --- src/plugins/debugger/qml/qmlengine.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index e60af00690..3a12d27271 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -125,7 +125,7 @@ struct LookupData QByteArray exp; }; -typedef QMultiHash LookupItems; // id -> (iname, exp) +typedef QHash LookupItems; // id -> (iname, exp) class QmlEnginePrivate : QmlDebugClient { @@ -1375,8 +1375,14 @@ void QmlEnginePrivate::lookup(const LookupItems &items) if (items.isEmpty()) return; - QList handles = items.keys(); - currentlyLookingUp += items; + QList handles; + for (auto it = items.begin(); it != items.end(); ++it) { + const int handle = it.key(); + if (!currentlyLookingUp.contains(handle)) { + currentlyLookingUp.insert(handle, it.value()); + handles.append(handle); + } + } DebuggerCommand cmd(LOOKUP); cmd.arg(HANDLES, handles); -- cgit v1.2.1 From f0b7a73f333244f143fa35708217ba469fbee094 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 15 Apr 2016 12:14:00 +0200 Subject: QmlProfiler: Properly clear any pending connections before reconnecting Otherwise we might end up waiting forever for a previous session's connection. Change-Id: I695d7a1ce21bc9720cc84436a7c4e6ba4616b0ab Reviewed-by: Joerg Bornemann --- src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index fba83df7b8..9f9fcc8001 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -112,13 +112,18 @@ void QmlProfilerClientManager::setTcpConnection(QString host, quint64 port) { d->tcpHost = host; d->tcpPort = port; + d->localSocket.clear(); disconnectClient(); + // Wait for the application to announce the port before connecting. } void QmlProfilerClientManager::setLocalSocket(QString file) { d->localSocket = file; + d->tcpHost.clear(); d->tcpPort = 0; + disconnectClient(); + // We open the server and the application connects to it, so let's do that right away. connectLocalClient(file); } -- cgit v1.2.1 From cfbb84a5f89635fc13d167a21aeb3127597ca270 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 15 Apr 2016 13:06:27 +0200 Subject: Update qbs submodule. To HEAD of 1.5 branch. Change-Id: Iefa333d9bc2a0808d0f4e42605252936908ea3d3 Reviewed-by: Joerg Bornemann --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index bc5ef731d6..e31446f563 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit bc5ef731d64edd6d2f152a7c68b6ad46efd7066c +Subproject commit e31446f563ec8fb1f23e073a97017a5661fbede9 -- cgit v1.2.1 From 2e38eec00214121d8c54196484f35fbcd075c4c9 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Apr 2016 16:45:38 +0200 Subject: Debugger: Compile fix stringSettings() macro-expands internally nowadays. Change-Id: Id702ee852b7c25b8ff7dbca0c6ada529a53a9443 Reviewed-by: hjk --- src/plugins/debugger/lldb/lldbengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 50de21b61c..283b2c87d8 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -284,7 +284,7 @@ void LldbEngine::startLldbStage2() m_lldbProc.write("script print(dir())\n"); m_lldbProc.write("script theDumper = Dumper()\n"); // This triggers reportState("enginesetupok") - const QString commands = expand(stringSetting(GdbStartupCommands)); + const QString commands = stringSetting(GdbStartupCommands); if (!commands.isEmpty()) m_lldbProc.write(commands.toLocal8Bit()); } -- cgit v1.2.1 From 441d8d29a542f96b0b244f49937f9a5f24e232c1 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 14 Apr 2016 14:46:05 +0200 Subject: TextEditor: Emit markTooltipRequested only once per line ...otherwise the same tooltip will be created over and over again, leading to a "moving tooltip widget". Change-Id: I1704bc34c458ebe1aec664d5295418ab1d2b5082 Reviewed-by: Alessandro Portale --- src/plugins/texteditor/texteditor.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 35d8222c74..71733bc377 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -370,6 +370,7 @@ public: int extraAreaSelectionAnchorBlockNumber; int extraAreaToggleMarkBlockNumber; int extraAreaHighlightFoldedBlockNumber; + int extraAreaPreviousMarkTooltipRequestedLine; TextEditorOverlay *m_overlay; TextEditorOverlay *m_snippetOverlay; @@ -489,6 +490,7 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent) extraAreaSelectionAnchorBlockNumber(-1), extraAreaToggleMarkBlockNumber(-1), extraAreaHighlightFoldedBlockNumber(-1), + extraAreaPreviousMarkTooltipRequestedLine(-1), m_overlay(0), m_snippetOverlay(0), m_searchResultOverlay(0), @@ -5078,6 +5080,8 @@ void TextEditorWidget::showDefaultContextMenu(QContextMenuEvent *e, Id menuConte void TextEditorWidget::extraAreaLeaveEvent(QEvent *) { + d->extraAreaPreviousMarkTooltipRequestedLine = -1; + // fake missing mouse move event from Qt QMouseEvent me(QEvent::MouseMove, QPoint(-1, -1), Qt::NoButton, 0, 0); extraAreaMouseEvent(&me); @@ -5136,7 +5140,9 @@ void TextEditorWidget::extraAreaMouseEvent(QMouseEvent *e) if (inMarkArea) { //Find line by cursor position int line = cursor.blockNumber() + 1; - emit markTooltipRequested(this, mapToGlobal(e->pos()), line); + if (d->extraAreaPreviousMarkTooltipRequestedLine != line) + emit markTooltipRequested(this, mapToGlobal(e->pos()), line); + d->extraAreaPreviousMarkTooltipRequestedLine = line; } if (e->buttons() & Qt::LeftButton && !d->m_markDragStart.isNull()) { -- cgit v1.2.1 From 70e3665c8619658320592564c795a442f40c8299 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 8 Apr 2016 11:36:42 +0200 Subject: Clang: Forward clangbackend output to qDebug instead of stdout/stderr Now the output of the clangbackend can be viewed with DebugView on Windows. Downside is that qDebug() will append newlines. This can't be turned off easily. We accept that. Change-Id: I7d68bfcf05780c8bcb4a05a538d2d1542a6a6f22 Reviewed-by: Alessandro Portale --- src/libs/clangbackendipc/connectionclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/clangbackendipc/connectionclient.cpp b/src/libs/clangbackendipc/connectionclient.cpp index c6c29458aa..e64519e1bb 100644 --- a/src/libs/clangbackendipc/connectionclient.cpp +++ b/src/libs/clangbackendipc/connectionclient.cpp @@ -233,12 +233,12 @@ void ConnectionClient::printLocalSocketError(QLocalSocket::LocalSocketError sock void ConnectionClient::printStandardOutput() { - QTextStream(stdout) << stdOutPrefixer.prefix(process_->readAllStandardOutput()); + qDebug("%s", stdOutPrefixer.prefix(process_->readAllStandardOutput()).constData()); } void ConnectionClient::printStandardError() { - QTextStream(stderr) << stdErrPrefixer.prefix(process_->readAllStandardError()); + qDebug("%s", stdErrPrefixer.prefix(process_->readAllStandardError()).constData()); } void ConnectionClient::finishProcess() -- cgit v1.2.1 From ffe0d98e5bff268cbcaca2ad419db12b873c24c7 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 17:11:41 +0200 Subject: Themes: Fix loading of the default theme This patially reverts commit 25603f9dc830f3b0f8a5eecbf236d98a06193195. Ouch. That change had so much mess per line. Sorry everyone. Change-Id: I9e02965c6a12670766fa36eab5dc6ad45131955d Reviewed-by: hjk --- src/plugins/coreplugin/coreconstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 8b8c2626e1..77052130fd 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -198,7 +198,7 @@ const char SETTINGS_ID_MIMETYPES[] = "E.MimeTypes"; const char SETTINGS_DEFAULTTEXTENCODING[] = "General/DefaultFileEncoding"; const char SETTINGS_THEME[] = "Core/CreatorTheme"; -const char DEFAULT_THEME[] = "classic"; +const char DEFAULT_THEME[] = "default"; const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)"); -- cgit v1.2.1 From 6116b111e535764f19a6de283256ec3f0885c28d Mon Sep 17 00:00:00 2001 From: Sergey Belyashov Date: Mon, 4 Apr 2016 10:05:16 +0300 Subject: Update Russian translation Change-Id: I39ccb765e37e2d9ff2d080ff7cf92518f6a203c9 Reviewed-by: Denis Shienkov Reviewed-by: Anton Kudryavtsev Reviewed-by: Oswald Buddenhagen --- share/qtcreator/translations/qtcreator_ru.ts | 226 ++++++++++++++------------- 1 file changed, 117 insertions(+), 109 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 06a6914e40..84944ea4b4 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -341,7 +341,7 @@ The process "%1" crashed. - Процесс «%1» завершился крахом. + Процесс «%1» аварийно завершился. Another application with the same package id but signed with different certificate already exists. @@ -791,7 +791,7 @@ Do you want to uninstall the existing package? "%1" died. - «%1» завершился крахом. + «%1» аварийно завершился. Unable to start "%1". @@ -3633,8 +3633,8 @@ For example, "Revision: 15" will leave the branch at revision 15. CMakeProjectManager::CMakeBuildStep - Qt Creator needs a cmake tool set up to build. Configure a cmake tool in the kit options. - Для сборки необходимо, чтобы была задана утилита cmake. Задайте её в настройках комлекта. + Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options. + Для сборки необходимо, чтобы была задана утилита CMake. Задайте её в настройках комлекта. @@ -3790,7 +3790,7 @@ For example, "Revision: 15" will leave the branch at revision 15. *** cmake process crashed! - *** процесс cmake завершился крахом! + *** процесс cmake аварийно завершился! *** cmake process exited with exit code %1. @@ -4172,9 +4172,9 @@ For example, "Revision: 15" will leave the branch at revision 15.ClangStaticAnalyzer The chosen file "%1" seems to point to an icecc binary not suitable for analyzing. -Please set a real clang executable. +Please set a real Clang executable. Кажется, выбранный файл «%1» указывает на программу icecc непригодную для анализа. -Укажите реальную программу clang. +Укажите реальный исполняемый файл Clang. @@ -4203,7 +4203,7 @@ Please set a real clang executable. Сообщение: - Extended Message: + Extended message: Подробное сообщение: @@ -4248,7 +4248,7 @@ Please set a real clang executable. ClangStaticAnalyzer::Internal::ClangStaticAnalyzerDiagnosticView - Suppress this diagnostic + Suppress This Diagnostic Подавить эту диагностику @@ -4262,8 +4262,8 @@ Please set a real clang executable. ClangStaticAnalyzer::Internal::ClangStaticAnalyzerPlugin - Clang Static Analyzer Settings - Настройки статического анализатора Clang + Clang Static Analyzer + Статический анализатор Clang @@ -4328,8 +4328,8 @@ Please set a real clang executable. К следующей проблеме. - Clang Static Analyzer uses the analyzer from the clang project to find bugs. - Статический анализатор Clang использует анализатор из проекта clang для поиска проблем. + Clang Static Analyzer uses the analyzer from the Clang project to find bugs. + Статический анализатор Clang использует анализатор из проекта Clang для поиска ошибок. Clang Static Analyzer @@ -4356,7 +4356,7 @@ Please set a real clang executable. Запустить статический анализатор Clang. - Clang Static Analyzer running. + Clang Static Analyzer is running. Статический анализатор Clang работает. @@ -4382,10 +4382,6 @@ Please set a real clang executable. Form - - Suppressed Diagnostics: - Подавляемые диагностики: - Remove Selected Удалить выбранное @@ -4394,6 +4390,10 @@ Please set a real clang executable. Remove All Удалить всё + + Suppressed diagnostics: + Подавляемые диагностики: + ClangStaticAnalyzer::Internal::SuppressedDiagnosticsModel @@ -7037,18 +7037,10 @@ Do you want to kill it? Recent &Files Недавние фа&йлы - - &Save - &Сохранить - Save Сохранить - - Save &As... - Сохранить &как... - Ctrl+Shift+S Ctrl+Shift+S @@ -7811,7 +7803,7 @@ Do you want to kill it? Automatically creates temporary copies of modified files. If Qt Creator is restarted after a crash or power failure, it asks whether to recover the auto-saved content. - Автоматически создавать копии изменённых файлов. Если работа Qt Creator завершилась в результате краха или сбоя питания, то при перезапуске он предложит восстановить их содержимое. + Автоматически создавать копии изменённых файлов. Если работа Qt Creator завершится аварийно или из-за сбоя питания, то при перезапуске он предложит восстановить их содержимое. Auto-save modified files @@ -8007,7 +7999,7 @@ Do you want to kill it? "%1" crashed. - «%1» завершился аварийно. + «%1» аварийно завершился. "%1" failed (exit code %2). @@ -11498,11 +11490,11 @@ Affected are breakpoints %1 Crashed process %1 - Завершившийся крахом процесс %1 + Аварийно завершившийся процесс %1 Attaching to crashed process %1 - Подключение к завершившемуся крахом процессу %1 + Подключение к аварийно завершившемуся процессу %1 Process Already Under Debugger Control @@ -12248,7 +12240,7 @@ Qt Creator не может подключиться к нему. The gdb process crashed some time after starting successfully. - Процесс gdb завершился крахом через некоторое время после успешного запуска. + Процесс gdb аварийно завершился через некоторое время после успешного запуска. The gdb process was ended forcefully @@ -12913,7 +12905,7 @@ markers in the source code editor. The LLDB process crashed some time after starting successfully. - Процесс LLDB завершился крахом через некоторое время после успешного старта. + Процесс LLDB аварийно завершился через некоторое время после успешного старта. An error occurred when attempting to write to the LLDB process. For example, the process may not be running, or it may have closed its input channel. @@ -13304,10 +13296,6 @@ Do you want to retry? QML Debugger disconnected. Отладчик QML отключён. - - Context: - Контекст: - Debugger::Internal::QmlInspectorAgent @@ -16176,7 +16164,7 @@ will also disable the following plugins: %1 crashed. - %1 завершился крахом. + %1 аварийно завершился. %1 returned %2. @@ -16455,7 +16443,7 @@ Partial names can be used if they are unambiguous. %1 crashed. - %1 завершился крахом. + %1 аварийно завершился. %1 returned %2. @@ -18259,7 +18247,7 @@ Leave empty to search through the file system. Ref: %1 %2 - Ссылка: %1 + Ссылка: %1 %2 @@ -19140,7 +19128,7 @@ Would you like to overwrite it? Ctrl+0 - Fit To Screen + Fit to Screen На весь экран @@ -20009,80 +19997,80 @@ Ids must begin with a lowercase letter. Polish - Полировка + Полировка Wait - Ожидание + Ожидание GUI Thread Sync - Синхронизация с потоком GUI + Синхронизация с потоком GUI Render Thread Sync - Синхронизация с потоком рендера + Синхронизация с потоком рендера Render - Рендер + Рендер Swap - Переключение + Переключение Render Preprocess - Рендер - преобработка + Рендер - преобработка Render Update - Рендер - обновление + Рендер - обновление Render Bind - Рендер - привязка + Рендер - привязка Render Render - Рендер - рендеринг + Рендер - рендеринг Material Compile - Компиляция материала + Компиляция материала Glyph Render - Отрисовка глифов + Отрисовка глифов Glyph Upload - Выгрузка глифов + Выгрузка глифов Texture Bind - Текстуры - привязка + Текстуры - привязка Texture Convert - Текстуры - преобразование + Текстуры - преобразование Texture Swizzle не знаю, как выбор/обмен цветовых каналов перевести на русский - Текстуры - смешивание + Текстуры - смешивание Texture Upload - Текстуры - выгрузка + Текстуры - выгрузка Texture Mipmap - Текстуры - мипмамминг + Текстуры - мипмамминг Texture Delete - Текстуры - удаление + Текстуры - удаление @@ -20738,7 +20726,7 @@ Ids must begin with a lowercase letter. Выбор особого каталога настроек - Config Path: + Config path: Путь к настройкам: @@ -21801,6 +21789,10 @@ Ids must begin with a lowercase letter. Name of current build Имя текущей сборки + + The currently active run configuration's name. + Имя текущей активной конфигурации запуска. + ProjectExplorer::AbiWidget @@ -21833,7 +21825,7 @@ Ids must begin with a lowercase letter. The process "%1" crashed. - Процесс «%1» завершился крахом. + Процесс «%1» завершился аварийно. Could not start process "%1" %2 @@ -21984,7 +21976,7 @@ Ids must begin with a lowercase letter. The process crashed. - Процесс завершился крахом. + Процесс аварийно завершился. The process returned exit code %1: @@ -22504,7 +22496,7 @@ Ids must begin with a lowercase letter. Remote process crashed: %1 - Внешний процесс завершился крахом: %1 + Внешний процесс аварийно завершился: %1 Remote process failed; exit code was %1. @@ -23482,8 +23474,8 @@ Ids must begin with a lowercase letter. Запускается %1... - %1 crashed - %1 завершился крахом + %1 crashed. + %1 аварийно завершился. %1 exited with code %2 @@ -25874,6 +25866,10 @@ Please close all running instances of your application before starting a build.< The name of the currently active kit. Название активного комплекта. + + The currently active run configuration's name. + Имя текущей активной конфигурации запуска. + Cancel Build && Unload Отменить сборку и выгрузить @@ -26411,6 +26407,10 @@ These files are preserved. ProjectExplorer::SshDeviceProcess + + Internal error + Внутренняя ошибка + Failed to kill remote process: %1 Не удалось завершить удалённый процесс: %1 @@ -26436,7 +26436,7 @@ These files are preserved. Error: Process listing command crashed: %1 - Ошибка: Команда вывода списка завершилась крахом: %1 + Ошибка: Команда вывода списка аварийно завершилась: %1 Process listing command failed with exit code %1. @@ -26696,7 +26696,7 @@ These files are preserved. %1 crashed - %1 завершился крахом + %1 аварийно завершился %1 exited with code %2 @@ -26839,15 +26839,15 @@ Maybe raise the timeout? Ожидается целочисленный элемент. - An error occurred with the clang static analyzer process. + An error occurred with the Clang Static Analyzer process. Возникла ошибка при статическом анализе Clang. - Clang static analyzer crashed. - Статический анализ Clang завершился крахом. + Clang Static Analyzer crashed. + Статический анализ Clang аварийно завершился. - Clang static analyzer finished with exit code: %1. + Clang Static Analyzer finished with exit code: %1. Статический анализ Clang завершился с кодом %1. @@ -26873,7 +26873,7 @@ Output: The SFTP server crashed: %1. - Сервер SFTP завершился крахом: %1. + Сервер SFTP аварийно завершился: %1. Unexpected packet of type %1. @@ -27598,6 +27598,10 @@ Output: Parsing of .qbs files has failed. Не удалось обработать файлы .qbs. + + Error retrieving run environment: %1 + Не удалось получить среду запуска: %1 + Qbs Run Configuration Конфигурация выполнения Qbs @@ -28941,8 +28945,8 @@ Neither the path to the library nor the path to its includes is added to the .pr Формы - StateCharts - Диаграммы состояний + State charts + Диаграммы состояний Resources @@ -29457,7 +29461,7 @@ Neither the path to the library nor the path to its includes is added to the .pr Qt Quick emulation layer crashed - Слой эмуляции Qt Quick завершился крахом + Слой эмуляции Qt Quick аварийно завершился @@ -29709,17 +29713,17 @@ Neither the path to the library nor the path to its includes is added to the .pr Show property editor warnings Показывать предупреждения редактора свойств - - Forward puppet output: - Перенаправление вывода: - Show warn exceptions Предупреждающие исключения - Debug puppet: - Отладка эмулятора: + Forward QML emulation layer output: + Перенаправление вывода эмулятора QML: + + + Debug QML emulation layer: + Отладка эмулятора QML: @@ -29822,11 +29826,11 @@ This is independent of the visibility property in QML. QML Emulation Layer (QML Puppet) Crashed - Слой эмуляции QML (QML Puppet) завершился крахом + Слой эмуляции QML (QML Puppet) аварийно завершился You are recording a puppet stream and the emulations layer crashed. It is recommended to reopen the Qt Quick Designer and start again. - Эмуляция завершилась крахом при записи puppet-потока. Рекомендуется переоткрыть Qt Quick Designer и запустить запись снова. + Эмуляция аварийно завершилась при записи puppet-потока. Рекомендуется переоткрыть Qt Quick Designer и запустить запись снова. @@ -31687,13 +31691,21 @@ references to elements in other files, loops, and so on.) Профайлер QML (внешний) - A Qml Profiler analysis is still in progress. + A QML Profiler analysis is still in progress. Выполняется профилирование QML. - Start Qml Profiler analysis. + Start QML Profiler analysis. Начать профилирование QML. + + Disable Profiling + Отключить профилирование + + + Enable Profiling + Включить профилирование + %1 s %1 сек @@ -31734,14 +31746,6 @@ Do you want to save the data first? Hide or show event categories. Показ или скрытие категорий событий. - - Disable profiling - Отключить профилирование - - - Enable profiling - Включить профилирование - QmlProfiler::Internal::QmlProfilerTraceView @@ -32078,12 +32082,12 @@ Do you want to save the data first? QmlProfilerExtension::Internal::QmlProfilerExtensionPlugin - Action triggered + Action Triggered Действие сработало - This is an action from QmlProfilerExtension. - Это действие из QmlProfilerExtension. + This is an action from QML Profiler Extension. + Это действие из расширения QML Profiler. @@ -33765,6 +33769,10 @@ In addition, device connectivity will be tested. RemoteLinux::Internal::RemoteLinuxEnvironmentReader + + Error: No device + Ошибка: Нет устройства + Error: %1 Ошибка: %1 @@ -33872,7 +33880,7 @@ In addition, device connectivity will be tested. Remote process crashed. - Удалённый процесс завершился крахом. + Удалённый процесс аварийно завершился. Unexpected output from remote process: "%1" @@ -37470,8 +37478,8 @@ Will not be applied to whitespace in comments and strings. Удалить - To-Do Settings - Настройки To-Do + To-Do + To-Do @@ -38789,7 +38797,7 @@ Will not be applied to whitespace in comments and strings. Valgrind::Internal::CallgrindTool - Valgrind Function Profile uses the Callgrind tool to record function calls when a program runs. + Valgrind Function Profiler uses the Callgrind tool to record function calls when a program runs. Профайлер функций Valgrind использует утилиту Callgrind для записи вызовов функций при работе программы. @@ -38869,9 +38877,17 @@ Will not be applied to whitespace in comments and strings. Цены, относительные к родительской - Show costs relative to parent functions inclusive cost. + Show costs relative to parent function's inclusive cost. Показывать цены относительно общей цены вызвавшей функции. + + Remove template parameter lists when displaying function names. + Убирать списки шаблонных параметров при отображении имён функций. + + + Select This Function in the Analyzer Output + Выбрать эту функцию в выводе анализатора + Cost Format Формат цены @@ -38880,10 +38896,6 @@ Will not be applied to whitespace in comments and strings. Enable cycle detection to properly handle recursive or circular function calls. Включить определение циклов для корректной обработки рекурсивных и циклических вызовов. - - This removes template parameter lists when displaying function names. - Убирает списки шаблонных параметров при отображении имён функций. - Show Project Costs Only Показать только цены проекта @@ -38924,10 +38936,6 @@ Will not be applied to whitespace in comments and strings. Parsing failed. Не удалось обработать. - - Select this Function in the Analyzer Output - Выберите эту функцию в выводе анализатора - Populating... Заполнение... -- cgit v1.2.1 From fa5e9e90945c1584097b2357a7046981a1a9da6d Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 13 Apr 2016 23:40:55 +0200 Subject: ProParser: Remove unused files These files are relicts from the old pro editor. Change-Id: I803d0491357ba73453b0a98f53bf6472be47364e Reviewed-by: Alessandro Portale --- src/shared/proparser/images/append.png | Bin 514 -> 0 bytes src/shared/proparser/images/other.png | Bin 1499 -> 0 bytes src/shared/proparser/images/profile.png | Bin 452 -> 0 bytes src/shared/proparser/images/remove.png | Bin 497 -> 0 bytes src/shared/proparser/images/scope.png | Bin 350 -> 0 bytes src/shared/proparser/images/set.png | Bin 473 -> 0 bytes src/shared/proparser/images/value.png | Bin 599 -> 0 bytes src/shared/proparser/proiteminfo.xml | 109 -------------------------------- src/shared/proparser/proparser.qrc | 10 --- 9 files changed, 119 deletions(-) delete mode 100644 src/shared/proparser/images/append.png delete mode 100644 src/shared/proparser/images/other.png delete mode 100644 src/shared/proparser/images/profile.png delete mode 100644 src/shared/proparser/images/remove.png delete mode 100644 src/shared/proparser/images/scope.png delete mode 100644 src/shared/proparser/images/set.png delete mode 100644 src/shared/proparser/images/value.png delete mode 100644 src/shared/proparser/proiteminfo.xml diff --git a/src/shared/proparser/images/append.png b/src/shared/proparser/images/append.png deleted file mode 100644 index 5ae826e56c..0000000000 Binary files a/src/shared/proparser/images/append.png and /dev/null differ diff --git a/src/shared/proparser/images/other.png b/src/shared/proparser/images/other.png deleted file mode 100644 index 044ce1ebb8..0000000000 Binary files a/src/shared/proparser/images/other.png and /dev/null differ diff --git a/src/shared/proparser/images/profile.png b/src/shared/proparser/images/profile.png deleted file mode 100644 index 4a24ce3c2f..0000000000 Binary files a/src/shared/proparser/images/profile.png and /dev/null differ diff --git a/src/shared/proparser/images/remove.png b/src/shared/proparser/images/remove.png deleted file mode 100644 index 039f05a005..0000000000 Binary files a/src/shared/proparser/images/remove.png and /dev/null differ diff --git a/src/shared/proparser/images/scope.png b/src/shared/proparser/images/scope.png deleted file mode 100644 index eefcb59954..0000000000 Binary files a/src/shared/proparser/images/scope.png and /dev/null differ diff --git a/src/shared/proparser/images/set.png b/src/shared/proparser/images/set.png deleted file mode 100644 index 69a8fe0523..0000000000 Binary files a/src/shared/proparser/images/set.png and /dev/null differ diff --git a/src/shared/proparser/images/value.png b/src/shared/proparser/images/value.png deleted file mode 100644 index 433cd527f4..0000000000 Binary files a/src/shared/proparser/images/value.png and /dev/null differ diff --git a/src/shared/proparser/proiteminfo.xml b/src/shared/proparser/proiteminfo.xml deleted file mode 100644 index 0224bb166d..0000000000 --- a/src/shared/proparser/proiteminfo.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - win32 - Windows - - - - unix - Unix - - - - mac - Mac - - - - TARGET - Output Target - This specifies the name of the target file. - - - - TEMPLATE - Output Template - This variable contains the name of the template to use when generating the project. - - app - Application - - - lib - Library - - - subdirs - Subdirectories - - - - - HEADERS - Header Files - Defines the header files for the project - - - - SOURCES - Source Files - Defines the source files for the project - - - - INCLUDEPATH - Include Path - Defines the include path for the project - - - - FORMS - Form Files - Defines the form files for the project - - - - RESOURCES - Resource Files - Defines the resource files for the project - - - - QT - Qt Modules - The values stored in the QT variable control which of the Qt modules are used by your project. - - core - QtCore module - - - gui - QtGui module - - - network - QtNetwork module - - - opengl - QtOpenGL module - - - sql - QtSql module - - - svg - QtSvg module - - - xml - QtXml module - - - qt3support - Qt3Support module - - - diff --git a/src/shared/proparser/proparser.qrc b/src/shared/proparser/proparser.qrc index ab5a8a720d..9193eaa31c 100644 --- a/src/shared/proparser/proparser.qrc +++ b/src/shared/proparser/proparser.qrc @@ -1,14 +1,4 @@ - - images/profile.png - images/scope.png - images/value.png - images/other.png - images/set.png - images/append.png - images/remove.png - proiteminfo.xml - spec_pre.prf spec_post.prf -- cgit v1.2.1 From b915acbabefa8de5089aed29ba4bb8447124ff6c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 17 Apr 2016 22:47:57 +0300 Subject: Qbs: Enable UpdateInfo It was refactored in 13fcf5ad3c3705ae87556b2072889daa519ff1b3. Change-Id: I05d35795618d82024a2f587fc299c9f5829080dd Reviewed-by: Jake Petroules --- src/plugins/updateinfo/updateinfo.qbs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index 2a875c4d7f..5253039dbc 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -3,8 +3,6 @@ import qbs 1.0 QtcPlugin { name: "UpdateInfo" - condition: false // Severely broken atm. - Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Utils" } -- cgit v1.2.1 From 3d85b826f04fbe5042e4146e309d14673f69396c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 17 Apr 2016 22:43:53 +0300 Subject: Project: Remove obsolete commented out updateinfo This plugin is now built by default. Change-Id: Ib85dd7e12bca2e72bc456ef8db1bbb0eaba2401d Reviewed-by: Eike Ziller --- src/plugins/plugins.pro | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index c087ff2669..a69da758ec 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -79,11 +79,7 @@ exists($$LLVM_INSTALL_DIR) { isEmpty(IDE_PACKAGE_MODE) { SUBDIRS += \ - helloworld #\ - #updateinfo -#} else:!isEmpty(UPDATEINFO_ENABLE) { -# SUBDIRS += \ -# updateinfo + helloworld } for(p, SUBDIRS) { -- cgit v1.2.1 From 2b0e6dd7bbf838bae276bdb693de007098ce904d Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 15 Apr 2016 13:10:21 +0200 Subject: Doc: Update screenshots related to finding Change-Id: I647858522af44d5f2bc22ffd735dedb4df07a73c Reviewed-by: Alessandro Portale --- doc/images/qtcreator-locator-customize.png | Bin 15647 -> 17110 bytes doc/images/qtcreator-refactoring-find.png | Bin 7108 -> 9887 bytes doc/images/qtcreator-refactoring-replace.png | Bin 11614 -> 19564 bytes ...tcreator-refactoring-virtual-function-dialog.png | Bin 24631 -> 15185 bytes doc/images/qtcreator-search-allprojects.png | Bin 6393 -> 6551 bytes doc/images/qtcreator-search-cpp-symbols.png | Bin 7823 -> 8088 bytes doc/images/qtcreator-searchresults.png | Bin 14068 -> 8141 bytes doc/src/editors/creator-editors.qdoc | 2 +- 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/images/qtcreator-locator-customize.png b/doc/images/qtcreator-locator-customize.png index 01aaab0a76..c9899959df 100644 Binary files a/doc/images/qtcreator-locator-customize.png and b/doc/images/qtcreator-locator-customize.png differ diff --git a/doc/images/qtcreator-refactoring-find.png b/doc/images/qtcreator-refactoring-find.png index 288b51a030..d2524de7ec 100644 Binary files a/doc/images/qtcreator-refactoring-find.png and b/doc/images/qtcreator-refactoring-find.png differ diff --git a/doc/images/qtcreator-refactoring-replace.png b/doc/images/qtcreator-refactoring-replace.png index 8cf98e94d1..4c62c5f065 100644 Binary files a/doc/images/qtcreator-refactoring-replace.png and b/doc/images/qtcreator-refactoring-replace.png differ diff --git a/doc/images/qtcreator-refactoring-virtual-function-dialog.png b/doc/images/qtcreator-refactoring-virtual-function-dialog.png index b761f33db1..6fd776c9cd 100644 Binary files a/doc/images/qtcreator-refactoring-virtual-function-dialog.png and b/doc/images/qtcreator-refactoring-virtual-function-dialog.png differ diff --git a/doc/images/qtcreator-search-allprojects.png b/doc/images/qtcreator-search-allprojects.png index 8cecbf686e..f78038af4b 100644 Binary files a/doc/images/qtcreator-search-allprojects.png and b/doc/images/qtcreator-search-allprojects.png differ diff --git a/doc/images/qtcreator-search-cpp-symbols.png b/doc/images/qtcreator-search-cpp-symbols.png index 706ec20ade..9f34e8f621 100644 Binary files a/doc/images/qtcreator-search-cpp-symbols.png and b/doc/images/qtcreator-search-cpp-symbols.png differ diff --git a/doc/images/qtcreator-searchresults.png b/doc/images/qtcreator-searchresults.png index 0b9c06cae8..02835cbb4b 100644 Binary files a/doc/images/qtcreator-searchresults.png and b/doc/images/qtcreator-searchresults.png differ diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc index e1a803ab40..64b8fa167f 100644 --- a/doc/src/editors/creator-editors.qdoc +++ b/doc/src/editors/creator-editors.qdoc @@ -1507,7 +1507,7 @@ \li \uicontrol {All Projects} searches files matching the defined file pattern in all currently open projects. - For example, to search for \c previewer only in \c {.cpp} + For example, to search for a string only in \c {.cpp} and \c {.h} files, enter in \uicontrol {File pattern} \c {*.cpp,*.h}. -- cgit v1.2.1 From a2170bd690229c681faceb8d95b29f9405f7b5ea Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 15 Apr 2016 14:11:04 +0200 Subject: Doc: Explain Model Editor > Export Diagram command Update screenshots. Change-Id: I794c424837e22392541138142410fc7a07c68af1 Reviewed-by: Jochen Becher Reviewed-by: Leena Miettinen --- doc/images/qtcreator-modeleditor-classes.png | Bin 44699 -> 24015 bytes doc/images/qtcreator-modeleditor-packages.png | Bin 18251 -> 18444 bytes doc/images/qtcreator-modeleditor.png | Bin 35657 -> 24681 bytes doc/src/editors/creator-modeling.qdoc | 3 +++ 4 files changed, 3 insertions(+) diff --git a/doc/images/qtcreator-modeleditor-classes.png b/doc/images/qtcreator-modeleditor-classes.png index f85430190f..182a1596e8 100644 Binary files a/doc/images/qtcreator-modeleditor-classes.png and b/doc/images/qtcreator-modeleditor-classes.png differ diff --git a/doc/images/qtcreator-modeleditor-packages.png b/doc/images/qtcreator-modeleditor-packages.png index 67170bc53f..50ba8f86d6 100644 Binary files a/doc/images/qtcreator-modeleditor-packages.png and b/doc/images/qtcreator-modeleditor-packages.png differ diff --git a/doc/images/qtcreator-modeleditor.png b/doc/images/qtcreator-modeleditor.png index de936c26e8..52a404f59d 100644 Binary files a/doc/images/qtcreator-modeleditor.png and b/doc/images/qtcreator-modeleditor.png differ diff --git a/doc/src/editors/creator-modeling.qdoc b/doc/src/editors/creator-modeling.qdoc index de6afd6afb..588b722a21 100644 --- a/doc/src/editors/creator-modeling.qdoc +++ b/doc/src/editors/creator-modeling.qdoc @@ -87,6 +87,9 @@ the editor to copy all elements to the clipboard by using 300 dpi. Then paste the diagram to an application that can print images. + To save diagrams as images, select \uicontrol Tools > + \uicontrol {Model Editor} > \uicontrol {Export Diagram}. + \section1 Creating Models To create models: -- cgit v1.2.1 From 02a0c6f4867748c14e501be2ceb27301e5e08d47 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 18 Apr 2016 07:14:58 +0200 Subject: AutoTest: Ignore nullptr documents It could happen that Qml related docs have not been added to the QmlJSModelManager when trying to use them on our side. Just ignore them when this happens as they will be added manually as they will get added automatically when parsing the respective main cpp file. Change-Id: I25c4b6d9159ad4ff8def3148c2a04356380fbd27 Reviewed-by: David Schulz --- src/plugins/autotest/testcodeparser.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index 7fb0fc1897..da95b7273e 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -434,6 +434,8 @@ static void checkQmlDocumentForTestCode(QFutureInterface future const QmlJS::Document::Ptr &qmlJSDoc, const QString &proFile = QString()) { + if (qmlJSDoc.isNull()) + return; QmlJS::AST::Node *ast = qmlJSDoc->ast(); QTC_ASSERT(ast, return); TestQmlVisitor qmlVisitor(qmlJSDoc); -- cgit v1.2.1 From 20110d1e3604cbfb3c56e370fb38f47f60ea217d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 Apr 2016 07:11:06 +0200 Subject: AutoTest: Fix possible crash when using SymbolFinder Task-number: QTCREATORBUG-16062 Change-Id: If8e6d2d30c1e036b38c3b030296ae051fd046759 Reviewed-by: Nikolai Kosjar --- src/plugins/autotest/testvisitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testvisitor.cpp b/src/plugins/autotest/testvisitor.cpp index a816aa33eb..d766cc0fdc 100644 --- a/src/plugins/autotest/testvisitor.cpp +++ b/src/plugins/autotest/testvisitor.cpp @@ -82,7 +82,7 @@ bool TestVisitor::visit(CPlusPlus::Class *symbol) CPlusPlus::Function *functionDefinition = m_symbolFinder.findMatchingDefinition( func, CppTools::CppModelManager::instance()->snapshot(), true); - if (functionDefinition) { + if (functionDefinition && functionDefinition->fileId()) { locationAndType.m_name = QString::fromUtf8(functionDefinition->fileName()); locationAndType.m_line = functionDefinition->line(); locationAndType.m_column = functionDefinition->column() - 1; -- cgit v1.2.1 From 88476a1435a5bc504929061bd0fa7d2c663d9bc7 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 15 Apr 2016 17:58:32 +0200 Subject: QmlProfiler: Disable run controls after they are finished Disabled runControls would still receive and send signals, confusing the profiler state. Also, connect lambdas with receiver argument where possible. Change-Id: I0cd43456d3462efe402e9d68792b67314e9b6e0b Task-number: QTCREATORBUG-16073 Reviewed-by: Joerg Bornemann --- src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 2 +- src/plugins/qmlprofiler/qmlprofilertool.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index ec78fe1c75..2443e2eb38 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -101,7 +101,7 @@ QmlProfilerRunControl::QmlProfilerRunControl(RunConfiguration *runConfiguration, QmlProfilerRunControl::~QmlProfilerRunControl() { - if (d->m_profilerState) + if (d->m_running && d->m_profilerState) stop(); delete d; } diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index e4d04b8656..02410623ec 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -333,12 +333,13 @@ AnalyzerRunControl *QmlProfilerTool::createRunControl(RunConfiguration *runConfi } auto runControl = new QmlProfilerRunControl(runConfiguration, this); - connect(runControl, &RunControl::finished, [this, runControl] { + connect(runControl, &RunControl::finished, this, [this, runControl] { d->m_toolBusy = false; updateRunActions(); + disconnect(d->m_stopAction, &QAction::triggered, runControl, &QmlProfilerRunControl::stop); }); - connect(d->m_stopAction, &QAction::triggered, runControl, [runControl] { runControl->stop(); }); + connect(d->m_stopAction, &QAction::triggered, runControl, &QmlProfilerRunControl::stop); updateRunActions(); return runControl; -- cgit v1.2.1 From a24ce30425d78a68247c5f79d75f45535e7952f0 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 16 Apr 2016 01:15:48 +0200 Subject: Debugger: Remove QML application Zoom (for now) It does not work. Change-Id: I8340d6b130d3d7e1e8f1531fe4cd2b6cd9319c7b Reviewed-by: Ulf Hermann --- src/plugins/debugger/debuggerplugin.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 6d4e34cd0d..8a34798fb4 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1686,13 +1686,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, cmd = ActionManager::registerAction(qmlSelectDummyAction, Constants::QML_SELECTTOOL); debugMenu->addAction(cmd); - auto qmlZoomDummyAction = new QAction(tr("Zoom"), this); - qmlZoomDummyAction->setCheckable(true); - qmlZoomDummyAction->setIcon(Core::Icons::ZOOM_TOOLBAR.icon()); - qmlZoomDummyAction->setEnabled(false); - cmd = ActionManager::registerAction(qmlZoomDummyAction, Constants::QML_ZOOMTOOL); - debugMenu->addAction(cmd); - debugMenu->addSeparator(); // Don't add '1' to the string as it shows up in the shortcut dialog. @@ -1810,7 +1803,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, // qmlToolbar.addAction(qmlShowAppOnTopDummyAction); // qmlToolbar.addWidget(new StyledSeparator); // qmlToolbar.addAction(qmlSelectDummyAction); -// qmlToolbar.addAction(qmlZoomDummyAction); // qmlToolbar.addWidget(new StyledSeparator); Perspective basePerspective({}, { -- cgit v1.2.1 From b7fabb290bdae023bb0a26e07e3ddba1c2d9d6d5 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Apr 2016 12:23:23 +0200 Subject: RemoteLinux: Relax port gathering We might encounter the situation that protocol is given as IPv6 but the consumer of the free port information decides to open an IPv4(only) port. As a result the next IPv6 scan will report the port again as open (in IPv6 namespace), while the same port in IPv4 namespace might still be blocked, and re-use of this port fails. Err on the safe side, and consider ports taken in either space as blocked. Change-Id: I2e4be40ab4df5398e26e197c12408efe905b1a2f Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/linuxdevice.cpp | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 6f960c0786..6675a2aeb4 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -123,27 +123,26 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod { QByteArray commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const { - QString procFilePath; - int addressLength; - if (protocol == QAbstractSocket::IPv4Protocol) { - procFilePath = QLatin1String("/proc/net/tcp"); - addressLength = 8; - } else { - procFilePath = QLatin1String("/proc/net/tcp6"); - addressLength = 32; - } - return QString::fromLatin1("sed " - "'s/.*: [[:xdigit:]]\\{%1\\}:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' %2") - .arg(addressLength).arg(procFilePath).toUtf8(); + // We might encounter the situation that protocol is given IPv6 + // but the consumer of the free port information decides to open + // an IPv4(only) port. As a result the next IPv6 scan will + // report the port again as open (in IPv6 namespace), while the + // same port in IPv4 namespace might still be blocked, and + // re-use of this port fails. + // GDBserver behaves exactly like this. + + Q_UNUSED(protocol) + + // /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6 + return "sed -e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*"; } QList usedPorts(const QByteArray &output) const { QList ports; QList portStrings = output.split('\n'); - portStrings.removeFirst(); foreach (const QByteArray &portString, portStrings) { - if (portString.isEmpty()) + if (portString.size() != 4) continue; bool ok; const int port = portString.toInt(&ok, 16); -- cgit v1.2.1 From 7339761c6a80e3667965c0c6b0e06385b846cb3c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 15 Apr 2016 23:16:50 +0200 Subject: Bookmarks: New Bookmark icon Using Theme::Bookmarks_TextMarkColor so that it is consistent with the scrollbar markers. Change-Id: I2cd6b787a61c2a5bf3a7f684c026006ca0417591 Reviewed-by: David Schulz Reviewed-by: Alessandro Portale --- src/plugins/bookmarks/bookmarkmanager.cpp | 4 +++- src/plugins/bookmarks/bookmarks.qrc | 1 + src/plugins/bookmarks/images/bookmark.png | Bin 913 -> 131 bytes src/plugins/bookmarks/images/bookmark@2x.png | Bin 0 -> 162 bytes src/tools/icons/qtcreatoricons.svg | 21 ++++++++++++++++++++- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/plugins/bookmarks/images/bookmark@2x.png diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index ec9c2f7f49..ee92b9ab8e 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -318,7 +319,8 @@ void BookmarkView::gotoBookmark(const QModelIndex &index) //// BookmarkManager::BookmarkManager() : - m_bookmarkIcon(QLatin1String(":/bookmarks/images/bookmark.png")), + m_bookmarkIcon(Utils::Icon({{QLatin1String(":/bookmarks/images/bookmark.png"), + Theme::Bookmarks_TextMarkColor}}, Icon::Tint).pixmap()), m_selectionModel(new QItemSelectionModel(this, this)) { connect(ICore::instance(), &ICore::contextChanged, diff --git a/src/plugins/bookmarks/bookmarks.qrc b/src/plugins/bookmarks/bookmarks.qrc index f0a890bf37..764b398555 100644 --- a/src/plugins/bookmarks/bookmarks.qrc +++ b/src/plugins/bookmarks/bookmarks.qrc @@ -1,5 +1,6 @@ images/bookmark.png + images/bookmark@2x.png diff --git a/src/plugins/bookmarks/images/bookmark.png b/src/plugins/bookmarks/images/bookmark.png index 7b2e5fd0ce..05f4eec541 100644 Binary files a/src/plugins/bookmarks/images/bookmark.png and b/src/plugins/bookmarks/images/bookmark.png differ diff --git a/src/plugins/bookmarks/images/bookmark@2x.png b/src/plugins/bookmarks/images/bookmark@2x.png new file mode 100644 index 0000000000..903acddbd8 Binary files /dev/null and b/src/plugins/bookmarks/images/bookmark@2x.png differ diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 68647b9c9e..f9055648a5 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -3106,7 +3106,7 @@ style="fill:#ffffff;fill-opacity:1" /> @@ -3146,6 +3146,25 @@ cy="576" r="6" /> + + + + Date: Fri, 15 Apr 2016 16:35:45 +0200 Subject: Debugger: Use -exec-return when asked for Change-Id: Ib3ab40d3180494fae21040bd3337adcce7816de3 Reviewed-by: Christian Stenger --- src/plugins/debugger/gdb/gdbengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 09155358ad..2251a0d3ab 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -2233,7 +2233,7 @@ void GdbEngine::executeReturn() setTokenBarrier(); notifyInferiorRunRequested(); showStatusMessage(tr("Immediate return from function requested..."), 5000); - runCommand({"-exec-finish", RunRequest, CB(handleExecuteReturn)}); + runCommand({"-exec-return", RunRequest, CB(handleExecuteReturn)}); } void GdbEngine::handleExecuteReturn(const DebuggerResponse &response) -- cgit v1.2.1 From d37aaeb69a579072267c51a170417ebc03e883ea Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 18 Apr 2016 11:53:58 +0200 Subject: Doc: Describe general build and run options Update screenshot. Change-Id: Icdab88b6eba9d1bb421271a66b3485ddfb80fe0c Reviewed-by: Tobias Hunger --- doc/images/qtcreator-project-options-deploy.png | Bin 50058 -> 24416 bytes doc/src/howto/creator-ui.qdoc | 12 ++++++++++++ .../creator-projects-builds-customizing.qdoc | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/doc/images/qtcreator-project-options-deploy.png b/doc/images/qtcreator-project-options-deploy.png index d4c0f8cad2..d921afe180 100644 Binary files a/doc/images/qtcreator-project-options-deploy.png and b/doc/images/qtcreator-project-options-deploy.png differ diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index 7ec6f935c0..adb348bc56 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -451,6 +451,13 @@ Select toolbar buttons to run applications, to attach the debugger to the running application, and to stop running or debugging. + To specify settings for displaying application output, select + \uicontrol Tools > \uicontrol Options > \uicontrol {Build & Run} > + \uicontrol General. You can select whether to open the + \uicontrol{Application Output} pane on output when running or debugging + applications, to clear old output on a new run, to word-wrap output, and to + limit output to the specified number of lines. + \section2 Compile Output The \uicontrol{Compile Output} pane provides all output from the compiler. @@ -464,6 +471,11 @@ Select the \uicontrol {Cancel Build} button to cancel the build. + To specify whether to open the \uicontrol {Compile Output} pane on output + when building applications, select \uicontrol Tools > \uicontrol Options > + \uicontrol {Build & Run} > \uicontrol General, and then select the + \uicontrol {Open Compile Output pane when building} check box. + \section2 Debugger Console In the \uicontrol {Debugger Console}, you can type JavaScript expressions and use them to get diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index 3b1b601660..be8f94fe1d 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -47,4 +47,13 @@ \image qtcreator-project-options-deploy.png "Project General Options" + On Windows, you can use \c jom instead of \c nmake for building the project + to distribute the compilation process to multiple CPU cores. You can download + \c jom from \l{http://download.qt.io/official_releases/jom}{Qt Downloads}. + To use \c jom, select the \uicontrol {Use jom instead of nmake} check box. + Deselect the check box if you experience build problems. + + You can specify the default build directory in the + \uicontrol {Default build directory} field using \QC variables (2). + */ -- cgit v1.2.1 From 802543c09dff3aad4797c45c7e90f4f024992b47 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 18 Apr 2016 11:44:58 +0200 Subject: Doc: Blogs and Qt Account can be accessed from Welcome mode Change-Id: I5571d2428e8f7b86e8092e94d11847bd90a8ed2f Reviewed-by: Eike Ziller --- doc/src/howto/creator-ui.qdoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-ui.qdoc index adb348bc56..ae8c6b2ba0 100644 --- a/doc/src/howto/creator-ui.qdoc +++ b/doc/src/howto/creator-ui.qdoc @@ -47,7 +47,9 @@ \li Open tutorials and example projects - \li Read news from the online community and Qt labs + \li Read news from the online community and Qt blogs + + \li Create or manage a Qt Account \endlist -- cgit v1.2.1 From b2e048c10e19c245621b2fd4b475ad09aba18cb2 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 17 Apr 2016 23:44:13 +0300 Subject: Debugger: Fix language context actions ... again Task-number: QTCREATORBUG-16099 Change-Id: Ie0a902a3161ca72cf78695639598eac5fdcbace5 Reviewed-by: Christian Stenger Reviewed-by: hjk --- src/plugins/debugger/debuggerplugin.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 8a34798fb4..42fc00a867 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2370,6 +2370,7 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine) engine->watchHandler()->resetWatchers(); m_localsView->hideProgressIndicator(); + updateActiveLanguages(); } static void changeFontSize(QWidget *widget, qreal size) -- cgit v1.2.1 From ad55631cdf898f0af6a9d0734c5f7a5889399da6 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Apr 2016 15:01:12 +0200 Subject: Debugger: Add safety net to avoid infinite lookups Do not lookup the same item twice without intermediate stepping. Dumpers could announce the existence of children but when asked for them bail out or produced similar inconsistent output. Better not depend on it. Task-number: QTCREATORBUG-15352 Change-Id: I38532d08bb438b12b6eb202a06ff610670b1069f Reviewed-by: Eike Ziller Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerengine.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 5a2c36452e..92dd21b994 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -282,6 +282,7 @@ public slots: void resetLocation() { + m_lookupRequests.clear(); m_locationTimer.stop(); m_locationMark.reset(); m_stackHandler.resetLocation(); @@ -337,6 +338,9 @@ public: Utils::FileInProjectFinder m_fileFinder; QByteArray m_qtNamespace; + + // Safety net to avoid infinite lookups. + QSet m_lookupRequests; // FIXME: Integrate properly. }; @@ -2011,6 +2015,23 @@ bool DebuggerEngine::canHandleToolTip(const DebuggerToolTipContext &context) con void DebuggerEngine::updateItem(const QByteArray &iname) { + if (d->m_lookupRequests.contains(iname)) { + showMessage(QString::fromLatin1("IGNORING REPEATED REQUEST TO EXPAND " + iname)); + WatchHandler *handler = watchHandler(); + WatchItem *item = handler->findItem(iname); + if (!item->hasChildren()) { + handler->notifyUpdateStarted({iname}); + item->setValue(decodeData({}, "notaccessible")); + item->setHasChildren(false); + item->outdated = false; + item->update(); + handler->notifyUpdateFinished(); + return; + } + // We could legitimately end up here after expanding + closing + re-expaning an item. + } + d->m_lookupRequests.insert(iname); + UpdateParameters params; params.partialVariable = iname; doUpdateLocals(params); -- cgit v1.2.1 From 334017be56d91bc6535bde8fe68b2bdb055ab950 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 15 Apr 2016 11:40:15 +0200 Subject: Debugger: Properly clean up dock widgets We call setParent(0) on the dock widgets, not on the actual operation widgets. In order to find out which ones we need to delete we need to check both the operations and the dock widgets. Change-Id: Ia6fde9bc1737aab6b6ad5497b27e805bcd67d0ab Task-number: QTCREATORBUG-16074 Reviewed-by: hjk --- src/plugins/debugger/debuggermainwindow.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 6441fd0176..0b523eb40f 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -81,12 +81,16 @@ DebuggerMainWindow::~DebuggerMainWindow() { // As we have to setParent(0) on dock widget that are not selected, // we keep track of all and make sure we don't leak any + foreach (QDockWidget *dock, m_dockForDockId) { + if (dock && !dock->parentWidget()) + delete dock; + } + foreach (const Perspective &perspective, m_perspectiveForPerspectiveId) { foreach (const Perspective::Operation &operation, perspective.operations()) { if (operation.widget && !operation.widget->parentWidget()) { - // These are from inactive perspectives. We call setParent(0) when deactivating - // a perspective so that the widgets can't be accidentally enabled in the wrong - // perspectives. That's why we have to delete them manually here. + // These are from perspectives that never got enabled. We've taken ownership for + // those, so we need to delete them. delete operation.widget; } } -- cgit v1.2.1 From 104b434c8d39079f08f89dae52b52567cac35c8e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 18 Apr 2016 10:24:54 +0200 Subject: AutoTest: Fix processing of output In case a (Qt) test process produces output that does not belong to the standard test output we might ended without processable output at all. Avoid this by just handling the output that is given on stdout for now. Change-Id: If5ee70140b95cb61422e58a7610b7fe2d09915c2 Reviewed-by: David Schulz --- src/plugins/autotest/testoutputreader.cpp | 7 +++++++ src/plugins/autotest/testoutputreader.h | 1 + src/plugins/autotest/testrunner.cpp | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/autotest/testoutputreader.cpp b/src/plugins/autotest/testoutputreader.cpp index 693a897e83..639c962b06 100644 --- a/src/plugins/autotest/testoutputreader.cpp +++ b/src/plugins/autotest/testoutputreader.cpp @@ -137,6 +137,13 @@ TestOutputReader::TestOutputReader(const QFutureInterface &future , m_buildDir(buildDirectory) { connect(m_testApplication, &QProcess::readyRead, this, &TestOutputReader::processOutput); + connect(m_testApplication, &QProcess::readyReadStandardError, + this, &TestOutputReader::processStdError); +} + +void TestOutputReader::processStdError() +{ + qWarning() << "Ignored plain output:" << m_testApplication->readAllStandardError(); } QtTestOutputReader::QtTestOutputReader(const QFutureInterface &futureInterface, diff --git a/src/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h index 1c557d9dd7..facb69b601 100644 --- a/src/plugins/autotest/testoutputreader.h +++ b/src/plugins/autotest/testoutputreader.h @@ -49,6 +49,7 @@ public: protected: virtual void processOutput() = 0; + virtual void processStdError(); QFutureInterface m_futureInterface; QProcess *m_testApplication; // not owned QString m_buildDir; diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index c82bf911c8..9d412ec447 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -137,7 +137,6 @@ static void performTestRun(QFutureInterface &futureInterface, } QProcess testProcess; - testProcess.setReadChannelMode(QProcess::MergedChannels); testProcess.setReadChannel(QProcess::StandardOutput); futureInterface.setProgressRange(0, testCaseCount); -- cgit v1.2.1 From bd406e3cd01fbfcb06e9066ace00dd27c4dd7318 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 18 Apr 2016 13:04:53 +0200 Subject: Test: Fix typo in gmock detection message Change-Id: I8c95b5279349b92f232c26f57ade91f5b51e3b55 Reviewed-by: Nikolai Kosjar --- tests/unit/unittest/gmock_dependency.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/unittest/gmock_dependency.pri b/tests/unit/unittest/gmock_dependency.pri index 0dbd28acbe..a78f11b6a8 100644 --- a/tests/unit/unittest/gmock_dependency.pri +++ b/tests/unit/unittest/gmock_dependency.pri @@ -29,7 +29,7 @@ isEmpty(GOOGLETEST_DIR) { } requires(exists($$GTEST_SRC_DIR):exists($$GMOCK_SRC_DIR)) -!exists($$GTEST_SRC_DIR):message("No gmock is found! To enabe unit tests set GOOGLETEST_DIR") +!exists($$GTEST_SRC_DIR):message("No gmock is found! To enable unit tests set GOOGLETEST_DIR") DEFINES += \ GTEST_HAS_STD_INITIALIZER_LIST_ \ -- cgit v1.2.1 From 7c0e76aee415300b4c391fca191164321e78b035 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 14 Apr 2016 17:34:00 +0200 Subject: AutoTest: Inform user when tests did crash If a test crashes for whatever reason one did not get any information about this so far. Add an explicit fatal for such cases. Change-Id: Ica2aec4b30f38d29acfe170526f4468aa6577887 Reviewed-by: David Schulz --- src/plugins/autotest/testrunner.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp index 9d412ec447..93554d76a1 100644 --- a/src/plugins/autotest/testrunner.cpp +++ b/src/plugins/autotest/testrunner.cpp @@ -220,6 +220,10 @@ static void performTestRun(QFutureInterface &futureInterface, eventLoop.processEvents(); } } + if (testProcess.exitStatus() == QProcess::CrashExit) { + futureInterface.reportResult(TestResultPtr(new FaultyTestResult(Result::MessageFatal, + QString::fromLatin1("Test for project \"%1\" crashed.").arg(testConfiguration->displayName())))); + } if (canceledByTimeout) { if (testProcess.state() != QProcess::NotRunning) { -- cgit v1.2.1 From 397ebcac92ad9ca620ef280b8fc6c7f697c6e28b Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 16 Apr 2016 20:59:42 +0200 Subject: Debugger: Enabled state of "Threads:" label depends on thread combobox ...and making sure that items of a disabled combobox are visibly disabled. This prevents users from clicking on the Threads label before debugging even started. Change-Id: I59cc9b7e875fe8c126a9ee4221ff9d8322e4b1a8 Reviewed-by: hjk --- src/plugins/coreplugin/manhattanstyle.cpp | 11 +++++++---- src/plugins/debugger/debuggerplugin.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp index 913ca572d3..7233e6d5c5 100644 --- a/src/plugins/coreplugin/manhattanstyle.cpp +++ b/src/plugins/coreplugin/manhattanstyle.cpp @@ -245,7 +245,10 @@ QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false) pal.setBrush(QPalette::All, QPalette::WindowText, color); pal.setBrush(QPalette::All, QPalette::ButtonText, color); pal.setBrush(QPalette::All, QPalette::Foreground, color); - color.setAlpha(100); + if (lightColored) + color.setAlpha(100); + else + color = creatorTheme()->color(Theme::IconsDisabledColor); pal.setBrush(QPalette::Disabled, QPalette::WindowText, color); pal.setBrush(QPalette::Disabled, QPalette::ButtonText, color); pal.setBrush(QPalette::Disabled, QPalette::Foreground, color); @@ -740,9 +743,9 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt painter->setPen(StyleHelper::toolBarDropShadowColor()); painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, text); } - if (!(option->state & State_Enabled)) - painter->setOpacity(0.8); - painter->setPen(creatorTheme()->color(Theme::ComboBoxTextColor)); + painter->setPen(creatorTheme()->color((option->state & State_Enabled) + ? Theme::ComboBoxTextColor + : Theme::IconsDisabledColor)); painter->drawText(editRect.adjusted(1, 0, -1, 0), Qt::AlignLeft | Qt::AlignVCenter, text); painter->restore(); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 42fc00a867..89e9023aa4 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -966,6 +966,7 @@ public: QIcon m_locationMarkIcon; + QLabel *m_threadLabel = 0; QComboBox *m_threadBox = 0; BaseTreeView *m_breakView = 0; @@ -1788,7 +1789,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, } toolbar.addWidget(new StyledSeparator); - toolbar.addWidget(new QLabel(tr("Threads:"))); + + m_threadLabel = new QLabel(tr("Threads:")); + toolbar.addWidget(m_threadLabel); m_threadBox = new QComboBox; m_threadBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); @@ -2489,6 +2492,8 @@ void DebuggerPluginPrivate::setInitialState() action(AutoDerefPointers)->setEnabled(true); action(ExpandStack)->setEnabled(false); + + m_threadLabel->setEnabled(false); } void DebuggerPluginPrivate::updateState(DebuggerEngine *engine) @@ -2586,6 +2591,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine) m_attachToUnstartedApplication->setEnabled(true); m_threadBox->setEnabled(state == InferiorStopOk || state == InferiorUnrunnable); + m_threadLabel->setEnabled(m_threadBox->isEnabled()); const bool isCore = engine->runParameters().startMode == AttachCore; const bool stopped = state == InferiorStopOk; -- cgit v1.2.1 From ed6f4133e8b8cae72aaae8ad29af425d5e910cff Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 18 Apr 2016 13:09:49 +0200 Subject: AutoTest: Fix marking for removal for second level items Items that will be marked for possible removal on first level forgot to mark their childrens which led to keeping them when sweeping although they should get removed if they were not found again. Change-Id: Ib364823ee60d31370331b090c776799ca5f663bf Reviewed-by: David Schulz --- src/plugins/autotest/testtreemodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index fa69cafe42..4701e126a6 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -631,7 +631,7 @@ void TestTreeModel::markForRemoval(const QString &filePath) TestTreeItem *child = root->childItem(childRow); // Qt + named Quick Tests if (child->filePath() == filePath) { - child->markForRemoval(true); + child->markForRemovalRecursively(true); } else { // unnamed Quick Tests and GTest and Qt Tests with separated source/header int grandChildRow = child->childCount() - 1; -- cgit v1.2.1 From 65046c2003605c57ed67cb5d2dfd1244527c3d75 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 18 Mar 2016 15:03:26 +0100 Subject: Core: Set "Flat" as default theme If qtcreator.ini does not have a [Core]CreatorTheme entry (user did not manually change the theme before), "flat" will now be the default. Change-Id: I0351668db3dcacada14d55ce1a5be194e04190f3 Reviewed-by: Tobias Hunger Reviewed-by: Eike Ziller Reviewed-by: Leena Miettinen --- src/plugins/coreplugin/coreconstants.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 77052130fd..0098fc4601 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -198,7 +198,7 @@ const char SETTINGS_ID_MIMETYPES[] = "E.MimeTypes"; const char SETTINGS_DEFAULTTEXTENCODING[] = "General/DefaultFileEncoding"; const char SETTINGS_THEME[] = "Core/CreatorTheme"; -const char DEFAULT_THEME[] = "default"; +const char DEFAULT_THEME[] = "flat"; const char ALL_FILES_FILTER[] = QT_TRANSLATE_NOOP("Core", "All Files (*)"); -- cgit v1.2.1 From 9a35b121ee4a1eec5ae7e9afb111e541b0b3f146 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 18 Apr 2016 11:12:05 +0200 Subject: C++: Fix accessing invalid file id of Symbol Symbol::_fileId can be null if the Symbol was created with a null translation unit. That is the case for temporary symbols created for lookup purposes (CreateBindings has a _control with no translation unit and thus creates symbols with no fileId). Task-number: QTCREATORBUG-15967 Change-Id: Iee518b39ba3b636fe1658e74179db3aad054d6f2 Reviewed-by: Orgad Shaneh --- src/libs/3rdparty/cplusplus/Symbol.cpp | 4 +-- .../cplusplus/checksymbols/tst_checksymbols.cpp | 29 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/libs/3rdparty/cplusplus/Symbol.cpp b/src/libs/3rdparty/cplusplus/Symbol.cpp index ae20b14bb7..e98b33a8a7 100644 --- a/src/libs/3rdparty/cplusplus/Symbol.cpp +++ b/src/libs/3rdparty/cplusplus/Symbol.cpp @@ -191,10 +191,10 @@ const StringLiteral *Symbol::fileId() const } const char *Symbol::fileName() const -{ return fileId()->chars(); } +{ return _fileId ? _fileId->chars() : ""; } unsigned Symbol::fileNameLength() const -{ return fileId()->size(); } +{ return _fileId ? _fileId->size() : 0; } const Name *Symbol::unqualifiedName() const { diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp index d2de76e4d8..cf26114d9a 100644 --- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp +++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp @@ -219,6 +219,8 @@ private slots: void test_checksymbols_infiniteLoop_data(); void test_checksymbols_infiniteLoop(); + void test_checkForValidSymbolFileId(); + void test_parentOfBlock(); void findField(); @@ -1165,6 +1167,33 @@ void tst_CheckSymbols::test_checksymbols_infiniteLoop() TestCase::runCheckSymbols(document1, snapshot); } +void tst_CheckSymbols::test_checkForValidSymbolFileId() +{ + const QByteArray contents = + "constexpr int parent_of(const int f) { return 1; }\n" + "\n" + "template struct wrapper { const T* ptr; };\n" + "template struct Dummy;\n" + "\n" + "namespace impl {\n" + " template \n" + " struct dummy_impl {\n" + " wrapper> parent;\n" + " };\n" + "}\n" + "\n" + "template \n" + "struct Dummy : impl::dummy_impl {};\n" + "\n" + "void client()\n" + "{\n" + " wrapper> a;\n" + " a.ptr->parent.ptr;\n" + "}\n"; + + BaseTestCase tc(contents); +} + void tst_CheckSymbols::test_parentOfBlock() { const QByteArray source = "void C::f()\n" -- cgit v1.2.1 From 4c9a5d50885c78a60fdffb45547ad2e52d1cd4b3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Sat, 16 Apr 2016 22:31:19 +0200 Subject: Debugger: Fix "jumping" status label There are two layout stretches with equal stretch factors fighting against each other. That makes the status label which is positioned between the stretches jump around with changing content length. This change increases the factor of the last stretch, which causes the label position to stay constant. Change-Id: I4e98d8b1fd6876f707911d1e90fa90165c8c2ff1 Reviewed-by: hjk --- src/plugins/debugger/debuggermainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 0b523eb40f..c8fc6ee330 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -158,7 +158,7 @@ void DebuggerMainWindow::finalizeSetup() hbox->addWidget(m_perspectiveChooser); hbox->addWidget(m_controlsStackWidget); hbox->addWidget(m_statusLabel); - hbox->addStretch(); + hbox->addStretch(1); hbox->addWidget(new Utils::StyledSeparator); hbox->addWidget(viewButton); -- cgit v1.2.1 From 00a7f3864b59f1488634bacd78b1d1c071c87bd9 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 18 Apr 2016 14:44:22 +0200 Subject: ProjectExplorerSettings: Do not reset options to defaults Do not reset project explorer options that are not managed via the options page to default values when applying changes. This effected "Restore last saved session" only at this time. Task-number: QTCREATORBUG-15197 Change-Id: Ie9577c14cc7e3d57093036078ae930cdb3768517 Reviewed-by: Tim Jenssen --- .../projectexplorersettingspage.cpp | 58 +++++++++++----------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 6660ea5df7..19b0ac462e 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -67,7 +67,7 @@ private: void setJomVisible(bool); Ui::ProjectExplorerSettingsPageUi m_ui; - QUuid m_environmentId; + mutable ProjectExplorerSettings m_settings; }; ProjectExplorerSettingsWidget::ProjectExplorerSettingsWidget(QWidget *parent) : @@ -97,39 +97,37 @@ void ProjectExplorerSettingsWidget::setJomVisible(bool v) ProjectExplorerSettings ProjectExplorerSettingsWidget::settings() const { - ProjectExplorerSettings pes; - pes.buildBeforeDeploy = m_ui.buildProjectBeforeDeployCheckBox->isChecked(); - pes.deployBeforeRun = m_ui.deployProjectBeforeRunCheckBox->isChecked(); - pes.saveBeforeBuild = m_ui.saveAllFilesCheckBox->isChecked(); - pes.showCompilerOutput = m_ui.showCompileOutputCheckBox->isChecked(); - pes.showRunOutput = m_ui.showRunOutputCheckBox->isChecked(); - pes.showDebugOutput = m_ui.showDebugOutputCheckBox->isChecked(); - pes.cleanOldAppOutput = m_ui.cleanOldAppOutputCheckBox->isChecked(); - pes.mergeStdErrAndStdOut = m_ui.mergeStdErrAndStdOutCheckBox->isChecked(); - pes.wrapAppOutput = m_ui.wrapAppOutputCheckBox->isChecked(); - pes.useJom = m_ui.jomCheckbox->isChecked(); - pes.prompToStopRunControl = m_ui.promptToStopRunControlCheckBox->isChecked(); - pes.maxAppOutputLines = m_ui.maxAppOutputBox->value(); - pes.environmentId = m_environmentId; - pes.stopBeforeBuild = ProjectExplorerSettings::StopBeforeBuild(m_ui.stopBeforeBuildComboBox->currentIndex()); - return pes; + m_settings.buildBeforeDeploy = m_ui.buildProjectBeforeDeployCheckBox->isChecked(); + m_settings.deployBeforeRun = m_ui.deployProjectBeforeRunCheckBox->isChecked(); + m_settings.saveBeforeBuild = m_ui.saveAllFilesCheckBox->isChecked(); + m_settings.showCompilerOutput = m_ui.showCompileOutputCheckBox->isChecked(); + m_settings.showRunOutput = m_ui.showRunOutputCheckBox->isChecked(); + m_settings.showDebugOutput = m_ui.showDebugOutputCheckBox->isChecked(); + m_settings.cleanOldAppOutput = m_ui.cleanOldAppOutputCheckBox->isChecked(); + m_settings.mergeStdErrAndStdOut = m_ui.mergeStdErrAndStdOutCheckBox->isChecked(); + m_settings.wrapAppOutput = m_ui.wrapAppOutputCheckBox->isChecked(); + m_settings.useJom = m_ui.jomCheckbox->isChecked(); + m_settings.prompToStopRunControl = m_ui.promptToStopRunControlCheckBox->isChecked(); + m_settings.maxAppOutputLines = m_ui.maxAppOutputBox->value(); + m_settings.stopBeforeBuild = ProjectExplorerSettings::StopBeforeBuild(m_ui.stopBeforeBuildComboBox->currentIndex()); + return m_settings; } void ProjectExplorerSettingsWidget::setSettings(const ProjectExplorerSettings &pes) { - m_ui.buildProjectBeforeDeployCheckBox->setChecked(pes.buildBeforeDeploy); - m_ui.deployProjectBeforeRunCheckBox->setChecked(pes.deployBeforeRun); - m_ui.saveAllFilesCheckBox->setChecked(pes.saveBeforeBuild); - m_ui.showCompileOutputCheckBox->setChecked(pes.showCompilerOutput); - m_ui.showRunOutputCheckBox->setChecked(pes.showRunOutput); - m_ui.showDebugOutputCheckBox->setChecked(pes.showDebugOutput); - m_ui.cleanOldAppOutputCheckBox->setChecked(pes.cleanOldAppOutput); - m_ui.mergeStdErrAndStdOutCheckBox->setChecked(pes.mergeStdErrAndStdOut); - m_ui.wrapAppOutputCheckBox->setChecked(pes.wrapAppOutput); - m_ui.jomCheckbox->setChecked(pes.useJom); - m_ui.promptToStopRunControlCheckBox->setChecked(pes.prompToStopRunControl); - m_ui.maxAppOutputBox->setValue(pes.maxAppOutputLines); - m_environmentId = pes.environmentId; + m_settings = pes; + m_ui.buildProjectBeforeDeployCheckBox->setChecked(m_settings.buildBeforeDeploy); + m_ui.deployProjectBeforeRunCheckBox->setChecked(m_settings.deployBeforeRun); + m_ui.saveAllFilesCheckBox->setChecked(m_settings.saveBeforeBuild); + m_ui.showCompileOutputCheckBox->setChecked(m_settings.showCompilerOutput); + m_ui.showRunOutputCheckBox->setChecked(m_settings.showRunOutput); + m_ui.showDebugOutputCheckBox->setChecked(m_settings.showDebugOutput); + m_ui.cleanOldAppOutputCheckBox->setChecked(m_settings.cleanOldAppOutput); + m_ui.mergeStdErrAndStdOutCheckBox->setChecked(m_settings.mergeStdErrAndStdOut); + m_ui.wrapAppOutputCheckBox->setChecked(m_settings.wrapAppOutput); + m_ui.jomCheckbox->setChecked(m_settings.useJom); + m_ui.promptToStopRunControlCheckBox->setChecked(m_settings.prompToStopRunControl); + m_ui.maxAppOutputBox->setValue(m_settings.maxAppOutputLines); m_ui.stopBeforeBuildComboBox->setCurrentIndex(pes.stopBeforeBuild); } -- cgit v1.2.1 From aa4a0d8920d47f3f3c18436c7c81f1ed3bca244b Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 18 Apr 2016 16:47:04 +0200 Subject: iOS: Qt 5.7 changed the CONFIG values for device vs simulator builds This is a quick fix, just adding the new values. It would be nicer to make them depend on the actual Qt version, but that seems to be a bit more involved. Task-number: QTCREATORBUG-16102 Change-Id: I2dbd0e76f90e7aeabb0c354fe54a6a0eb041454e Reviewed-by: Tobias Hunger Reviewed-by: Vikas Pachdha --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 1a7906cff7..8c00e092bc 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -843,10 +843,11 @@ QStringList QMakeStepConfig::toArguments() const else if (archConfig == PPC64) arguments << QLatin1String("CONFIG+=ppc64"); + // TODO: make that depend on the actual Qt version that is used if (osType == IphoneSimulator) - arguments << QLatin1String("CONFIG+=iphonesimulator"); + arguments << QLatin1String("CONFIG+=iphonesimulator") << QLatin1String("CONFIG+=simulator") /*since Qt 5.7*/; else if (osType == IphoneOS) - arguments << QLatin1String("CONFIG+=iphoneos"); + arguments << QLatin1String("CONFIG+=iphoneos") << QLatin1String("CONFIG+=device") /*since Qt 5.7*/; if (linkQmlDebuggingQQ2) arguments << QLatin1String("CONFIG+=qml_debug"); -- cgit v1.2.1 From bb8f8b56f130c16b63a0da6c644ae8f3a3b158d9 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 15 Apr 2016 12:37:57 +0200 Subject: iOS: Better error messages for starting service and transferring app. Change-Id: I1d5e0102c87e43594c35f997c293d5b7a2e5e81b Reviewed-by: Vikas Pachdha Reviewed-by: Eike Ziller --- src/tools/iostool/iosdevicemanager.cpp | 436 ++++++++++++++++----------------- 1 file changed, 218 insertions(+), 218 deletions(-) diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp index 579b10ddc1..c99ba36306 100644 --- a/src/tools/iostool/iosdevicemanager.cpp +++ b/src/tools/iostool/iosdevicemanager.cpp @@ -129,6 +129,219 @@ typedef am_res_t (MDEV_API *USBMuxConnectByPortPtr)(unsigned int, int, ServiceSo } // anonymous namespace +static QString mobileDeviceErrorString(am_res_t code) +{ + static const char *errorStrings[] = { + "kAMDSuccess", // 0x0 + "kAMDUndefinedError", // 0xe8000001 + "kAMDBadHeaderError", + "kAMDNoResourcesError", + "kAMDReadError", + "kAMDWriteError", + "kAMDUnknownPacketError", + "kAMDInvalidArgumentError", + "kAMDNotFoundError", + "kAMDIsDirectoryError", + "kAMDPermissionError", + "kAMDNotConnectedError", + "kAMDTimeOutError", + "kAMDOverrunError", + "kAMDEOFError", + "kAMDUnsupportedError", + "kAMDFileExistsError", + "kAMDBusyError", + "kAMDCryptoError", + "kAMDInvalidResponseError", + "kAMDMissingKeyError", + "kAMDMissingValueError", + "kAMDGetProhibitedError", + "kAMDSetProhibitedError", + "kAMDRemoveProhibitedError", + "kAMDImmutableValueError", + "kAMDPasswordProtectedError", + "kAMDMissingHostIDError", + "kAMDInvalidHostIDError", + "kAMDSessionActiveError", + "kAMDSessionInactiveError", + "kAMDMissingSessionIDError", + "kAMDInvalidSessionIDError", + "kAMDMissingServiceError", + "kAMDInvalidServiceError", + "kAMDInvalidCheckinError", + "kAMDCheckinTimeoutError", + "kAMDMissingPairRecordError", + "kAMDInvalidActivationRecordError", + "kAMDMissingActivationRecordError", + "kAMDWrongDroidError", + "kAMDSUVerificationError", + "kAMDSUPatchError", + "kAMDSUFirmwareError", + "kAMDProvisioningProfileNotValid", + "kAMDSendMessageError", + "kAMDReceiveMessageError", + "kAMDMissingOptionsError", + "kAMDMissingImageTypeError", + "kAMDDigestFailedError", + "kAMDStartServiceError", + "kAMDInvalidDiskImageError", + "kAMDMissingDigestError", + "kAMDMuxError", + "kAMDApplicationAlreadyInstalledError", + "kAMDApplicationMoveFailedError", + "kAMDApplicationSINFCaptureFailedError", + "kAMDApplicationSandboxFailedError", + "kAMDApplicationVerificationFailedError", + "kAMDArchiveDestructionFailedError", + "kAMDBundleVerificationFailedError", + "kAMDCarrierBundleCopyFailedError", + "kAMDCarrierBundleDirectoryCreationFailedError", + "kAMDCarrierBundleMissingSupportedSIMsError", + "kAMDCommCenterNotificationFailedError", + "kAMDContainerCreationFailedError", + "kAMDContainerP0wnFailedError", + "kAMDContainerRemovalFailedError", + "kAMDEmbeddedProfileInstallFailedError", + "kAMDErrorError", + "kAMDExecutableTwiddleFailedError", + "kAMDExistenceCheckFailedError", + "kAMDInstallMapUpdateFailedError", + "kAMDManifestCaptureFailedError", + "kAMDMapGenerationFailedError", + "kAMDMissingBundleExecutableError", + "kAMDMissingBundleIdentifierError", + "kAMDMissingBundlePathError", + "kAMDMissingContainerError", + "kAMDNotificationFailedError", + "kAMDPackageExtractionFailedError", + "kAMDPackageInspectionFailedError", + "kAMDPackageMoveFailedError", + "kAMDPathConversionFailedError", + "kAMDRestoreContainerFailedError", + "kAMDSeatbeltProfileRemovalFailedError", + "kAMDStageCreationFailedError", + "kAMDSymlinkFailedError", + "kAMDiTunesArtworkCaptureFailedError", + "kAMDiTunesMetadataCaptureFailedError", + "kAMDAlreadyArchivedError", + "kAMDServiceLimitError", + "kAMDInvalidPairRecordError", + "kAMDServiceProhibitedError", + "kAMDCheckinSetupFailedError", + "kAMDCheckinConnectionFailedError", + "kAMDCheckinReceiveFailedError", + "kAMDCheckinResponseFailedError", + "kAMDCheckinSendFailedError", + "kAMDMuxCreateListenerError", + "kAMDMuxGetListenerError", + "kAMDMuxConnectError", + "kAMDUnknownCommandError", + "kAMDAPIInternalError", + "kAMDSavePairRecordFailedError", + "kAMDCheckinOutOfMemoryError", + "kAMDDeviceTooNewError", + "kAMDDeviceRefNoGood", + "kAMDCannotTranslateError", + "kAMDMobileImageMounterMissingImageSignature", + "kAMDMobileImageMounterResponseCreationFailed", + "kAMDMobileImageMounterMissingImageType", + "kAMDMobileImageMounterMissingImagePath", + "kAMDMobileImageMounterImageMapLoadFailed", + "kAMDMobileImageMounterAlreadyMounted", + "kAMDMobileImageMounterImageMoveFailed", + "kAMDMobileImageMounterMountPathMissing", + "kAMDMobileImageMounterMountPathNotEmpty", + "kAMDMobileImageMounterImageMountFailed", + "kAMDMobileImageMounterTrustCacheLoadFailed", + "kAMDMobileImageMounterDigestFailed", + "kAMDMobileImageMounterDigestCreationFailed", + "kAMDMobileImageMounterImageVerificationFailed", + "kAMDMobileImageMounterImageInfoCreationFailed", + "kAMDMobileImageMounterImageMapStoreFailed", + "kAMDBonjourSetupError", + "kAMDDeviceOSVersionTooLow", + "kAMDNoWifiSyncSupportError", + "kAMDDeviceFamilyNotSupported", + "kAMDEscrowLockedError", + "kAMDPairingProhibitedError", + "kAMDProhibitedBySupervision", + "kAMDDeviceDisconnectedError", + "kAMDTooBigError", + "kAMDPackagePatchFailedError", + "kAMDIncorrectArchitectureError", + "kAMDPluginCopyFailedError", + "kAMDBreadcrumbFailedError", + "kAMDBreadcrumbUnlockError", + "kAMDGeoJSONCaptureFailedError", + "kAMDNewsstandArtworkCaptureFailedError", + "kAMDMissingCommandError", + "kAMDNotEntitledError", + "kAMDMissingPackagePathError", + "kAMDMissingContainerPathError", + "kAMDMissingApplicationIdentifierError", + "kAMDMissingAttributeValueError", + "kAMDLookupFailedError", + "kAMDDictCreationFailedError", + "kAMDUserDeniedPairingError", + "kAMDPairingDialogResponsePendingError", + "kAMDInstallProhibitedError", + "kAMDUninstallProhibitedError", + "kAMDFMiPProtectedError", + "kAMDMCProtected", + "kAMDMCChallengeRequired", + "kAMDMissingBundleVersionError" // 0xe800009c + }; + + CFStringRef key = NULL; + static const size_t errorStringLast = ((sizeof(errorStrings) / sizeof(char *)) - 1) | 0xe8000000; + if (code <= errorStringLast) { + // Mask off some bits to get an index into the known error names array + key = QString::fromLatin1(errorStrings[code & ~0xe8000000]).toCFString(); + } else { + // Some errors don't have constant names; check a few other known error codes + switch (code) { + case 0xe8008015: + key = CFSTR("A valid provisioning profile for this executable was not found."); + break; + case 0xe8008016: + key = CFSTR("The executable was signed with invalid entitlements."); + break; + case 0xe8008017: + key = CFSTR("A signed resource has been added, modified, or deleted."); + break; + case 0xe8008018: + key = CFSTR("The identity used to sign the executable is no longer valid."); + break; + case 0xe8008019: + key = CFSTR("The application does not have a valid signature."); + break; + case 0xe800801c: + key = CFSTR("The signature was not valid."); + break; + default: + return QString(); + } + + CFRetain(key); + } + + CFURLRef url = QUrl::fromLocalFile( + QStringLiteral("/System/Library/PrivateFrameworks/MobileDevice.framework")).toCFURL(); + CFBundleRef mobileDeviceBundle = CFBundleCreate(kCFAllocatorDefault, url); + CFRelease(url); + + QString s; + if (mobileDeviceBundle) { + CFStringRef str = CFCopyLocalizedStringFromTableInBundle(key, CFSTR("Localizable"), + mobileDeviceBundle, nil); + + s = QString::fromCFString(str); + CFRelease(str); + } + + CFRelease(key); + return s; +} + namespace Ios { namespace Internal { @@ -770,9 +983,9 @@ bool CommandSession::startService(const QString &serviceName, ServiceSocket &fd) if (!connectDevice()) return false; CFStringRef cfsService = serviceName.toCFString(); - if (am_res_t error = lib()->deviceStartService(device, cfsService, &fd, 0)) { - addError(QString::fromLatin1("startService on device %1 failed, AMDeviceStartService returned %2") - .arg(deviceId).arg(error)); + if (am_res_t error = lib()->deviceStartService(device, cfsService, 0, &fd)) { + addError(QString::fromLatin1("Starting service \"%1\" on device %2 failed, AMDeviceStartService returned %3 (0x%4)") + .arg(serviceName).arg(deviceId).arg(mobileDeviceErrorString(error)).arg(QString::number(error, 16))); failure = true; fd = -1; } @@ -1045,219 +1258,6 @@ QString AppOpSession::commandName() return QString::fromLatin1("TransferAppSession(%1, %2)").arg(deviceId, bundlePath); } -static QString mobileDeviceErrorString(am_res_t code) -{ - static const char *errorStrings[] = { - "kAMDSuccess", // 0x0 - "kAMDUndefinedError", // 0xe8000001 - "kAMDBadHeaderError", - "kAMDNoResourcesError", - "kAMDReadError", - "kAMDWriteError", - "kAMDUnknownPacketError", - "kAMDInvalidArgumentError", - "kAMDNotFoundError", - "kAMDIsDirectoryError", - "kAMDPermissionError", - "kAMDNotConnectedError", - "kAMDTimeOutError", - "kAMDOverrunError", - "kAMDEOFError", - "kAMDUnsupportedError", - "kAMDFileExistsError", - "kAMDBusyError", - "kAMDCryptoError", - "kAMDInvalidResponseError", - "kAMDMissingKeyError", - "kAMDMissingValueError", - "kAMDGetProhibitedError", - "kAMDSetProhibitedError", - "kAMDRemoveProhibitedError", - "kAMDImmutableValueError", - "kAMDPasswordProtectedError", - "kAMDMissingHostIDError", - "kAMDInvalidHostIDError", - "kAMDSessionActiveError", - "kAMDSessionInactiveError", - "kAMDMissingSessionIDError", - "kAMDInvalidSessionIDError", - "kAMDMissingServiceError", - "kAMDInvalidServiceError", - "kAMDInvalidCheckinError", - "kAMDCheckinTimeoutError", - "kAMDMissingPairRecordError", - "kAMDInvalidActivationRecordError", - "kAMDMissingActivationRecordError", - "kAMDWrongDroidError", - "kAMDSUVerificationError", - "kAMDSUPatchError", - "kAMDSUFirmwareError", - "kAMDProvisioningProfileNotValid", - "kAMDSendMessageError", - "kAMDReceiveMessageError", - "kAMDMissingOptionsError", - "kAMDMissingImageTypeError", - "kAMDDigestFailedError", - "kAMDStartServiceError", - "kAMDInvalidDiskImageError", - "kAMDMissingDigestError", - "kAMDMuxError", - "kAMDApplicationAlreadyInstalledError", - "kAMDApplicationMoveFailedError", - "kAMDApplicationSINFCaptureFailedError", - "kAMDApplicationSandboxFailedError", - "kAMDApplicationVerificationFailedError", - "kAMDArchiveDestructionFailedError", - "kAMDBundleVerificationFailedError", - "kAMDCarrierBundleCopyFailedError", - "kAMDCarrierBundleDirectoryCreationFailedError", - "kAMDCarrierBundleMissingSupportedSIMsError", - "kAMDCommCenterNotificationFailedError", - "kAMDContainerCreationFailedError", - "kAMDContainerP0wnFailedError", - "kAMDContainerRemovalFailedError", - "kAMDEmbeddedProfileInstallFailedError", - "kAMDErrorError", - "kAMDExecutableTwiddleFailedError", - "kAMDExistenceCheckFailedError", - "kAMDInstallMapUpdateFailedError", - "kAMDManifestCaptureFailedError", - "kAMDMapGenerationFailedError", - "kAMDMissingBundleExecutableError", - "kAMDMissingBundleIdentifierError", - "kAMDMissingBundlePathError", - "kAMDMissingContainerError", - "kAMDNotificationFailedError", - "kAMDPackageExtractionFailedError", - "kAMDPackageInspectionFailedError", - "kAMDPackageMoveFailedError", - "kAMDPathConversionFailedError", - "kAMDRestoreContainerFailedError", - "kAMDSeatbeltProfileRemovalFailedError", - "kAMDStageCreationFailedError", - "kAMDSymlinkFailedError", - "kAMDiTunesArtworkCaptureFailedError", - "kAMDiTunesMetadataCaptureFailedError", - "kAMDAlreadyArchivedError", - "kAMDServiceLimitError", - "kAMDInvalidPairRecordError", - "kAMDServiceProhibitedError", - "kAMDCheckinSetupFailedError", - "kAMDCheckinConnectionFailedError", - "kAMDCheckinReceiveFailedError", - "kAMDCheckinResponseFailedError", - "kAMDCheckinSendFailedError", - "kAMDMuxCreateListenerError", - "kAMDMuxGetListenerError", - "kAMDMuxConnectError", - "kAMDUnknownCommandError", - "kAMDAPIInternalError", - "kAMDSavePairRecordFailedError", - "kAMDCheckinOutOfMemoryError", - "kAMDDeviceTooNewError", - "kAMDDeviceRefNoGood", - "kAMDCannotTranslateError", - "kAMDMobileImageMounterMissingImageSignature", - "kAMDMobileImageMounterResponseCreationFailed", - "kAMDMobileImageMounterMissingImageType", - "kAMDMobileImageMounterMissingImagePath", - "kAMDMobileImageMounterImageMapLoadFailed", - "kAMDMobileImageMounterAlreadyMounted", - "kAMDMobileImageMounterImageMoveFailed", - "kAMDMobileImageMounterMountPathMissing", - "kAMDMobileImageMounterMountPathNotEmpty", - "kAMDMobileImageMounterImageMountFailed", - "kAMDMobileImageMounterTrustCacheLoadFailed", - "kAMDMobileImageMounterDigestFailed", - "kAMDMobileImageMounterDigestCreationFailed", - "kAMDMobileImageMounterImageVerificationFailed", - "kAMDMobileImageMounterImageInfoCreationFailed", - "kAMDMobileImageMounterImageMapStoreFailed", - "kAMDBonjourSetupError", - "kAMDDeviceOSVersionTooLow", - "kAMDNoWifiSyncSupportError", - "kAMDDeviceFamilyNotSupported", - "kAMDEscrowLockedError", - "kAMDPairingProhibitedError", - "kAMDProhibitedBySupervision", - "kAMDDeviceDisconnectedError", - "kAMDTooBigError", - "kAMDPackagePatchFailedError", - "kAMDIncorrectArchitectureError", - "kAMDPluginCopyFailedError", - "kAMDBreadcrumbFailedError", - "kAMDBreadcrumbUnlockError", - "kAMDGeoJSONCaptureFailedError", - "kAMDNewsstandArtworkCaptureFailedError", - "kAMDMissingCommandError", - "kAMDNotEntitledError", - "kAMDMissingPackagePathError", - "kAMDMissingContainerPathError", - "kAMDMissingApplicationIdentifierError", - "kAMDMissingAttributeValueError", - "kAMDLookupFailedError", - "kAMDDictCreationFailedError", - "kAMDUserDeniedPairingError", - "kAMDPairingDialogResponsePendingError", - "kAMDInstallProhibitedError", - "kAMDUninstallProhibitedError", - "kAMDFMiPProtectedError", - "kAMDMCProtected", - "kAMDMCChallengeRequired", - "kAMDMissingBundleVersionError" // 0xe800009c - }; - - CFStringRef key = NULL; - static const size_t errorStringLast = ((sizeof(errorStrings) / sizeof(char *)) - 1) | 0xe8000000; - if (code <= errorStringLast) { - // Mask off some bits to get an index into the known error names array - key = QString::fromLatin1(errorStrings[code & ~0xe8000000]).toCFString(); - } else { - // Some errors don't have constant names; check a few other known error codes - switch (code) { - case 0xe8008015: - key = CFSTR("A valid provisioning profile for this executable was not found."); - break; - case 0xe8008016: - key = CFSTR("The executable was signed with invalid entitlements."); - break; - case 0xe8008017: - key = CFSTR("A signed resource has been added, modified, or deleted."); - break; - case 0xe8008018: - key = CFSTR("The identity used to sign the executable is no longer valid."); - break; - case 0xe8008019: - key = CFSTR("The application does not have a valid signature."); - break; - case 0xe800801c: - key = CFSTR("The signature was not valid."); - break; - default: - return QString(); - } - - CFRetain(key); - } - - CFURLRef url = QUrl::fromLocalFile( - QStringLiteral("/System/Library/PrivateFrameworks/MobileDevice.framework")).toCFURL(); - CFBundleRef mobileDeviceBundle = CFBundleCreate(kCFAllocatorDefault, url); - CFRelease(url); - - QString s; - if (mobileDeviceBundle) { - CFStringRef str = CFCopyLocalizedStringFromTableInBundle(key, CFSTR("Localizable"), - mobileDeviceBundle, nil); - - s = QString::fromCFString(str); - CFRelease(str); - } - - CFRelease(key); - return s; -} - bool AppOpSession::installApp() { ServiceSocket fd; @@ -1269,8 +1269,8 @@ bool AppOpSession::installApp() if (am_res_t error = lib()->deviceTransferApplication(fd, cfsBundlePath, 0, &appTransferSessionCallback, static_cast(this))) { - addError(QString::fromLatin1("TransferAppSession(%1,%2) failed, AMDeviceTransferApplication returned %3") - .arg(bundlePath, deviceId).arg(error)); + addError(QString::fromLatin1("TransferAppSession(%1,%2) failed, AMDeviceTransferApplication returned %3 (0x%4)") + .arg(bundlePath, deviceId).arg(mobileDeviceErrorString(error)).arg(error)); failure = true; } progressBase += 100; -- cgit v1.2.1 From 211894d3482180356cbde2ab233afd863b4f59c3 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 15 Apr 2016 10:40:33 +0200 Subject: Clang: Tests: Fix compilation with clang-3.6 using stdlib When using stdlib (default on Linux) and compiling with "-std=c++14", errors like the following occurr. Avoid them by not requiring c++14. $ clang --version Ubuntu clang version 3.6.0-2ubuntu1~trusty1 (tags/RELEASE_360/final) (based on LLVM 3.6.0) Target: x86_64-pc-linux-gnu Thread model: posix $ cat clangtest.cpp #include $ clang -std=c++11 -fsyntax-only clangtest.cpp # Fine with c++11/stdlibc++ $ clang -std=c++14 -fsyntax-only clangtest.cpp # Ops with c++14/stdlibc++ In file included from clangtest.cpp:1: In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/algorithm:62: In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/bits/stl_algo.h:65: In file included from /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/random:39: /usr/bin/../lib/gcc/x86_64-linux-gnu/4.8/../../../../include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace using ::gets; ~~^ 1 error generated. $ clang -std=c++14 -stdlib=libc++ -fsyntax-only clangtest.cpp # Fine with c++14/libc++ See also https://llvm.org/bugs/show_bug.cgi?id=18402. Change-Id: I2ab3ea837b80196b51d8816ee8aa26a4a531e939 Reviewed-by: Christian Stenger --- tests/unit/echoserver/echoserver.pro | 2 +- tests/unit/unittest/unittest.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/echoserver/echoserver.pro b/tests/unit/echoserver/echoserver.pro index 39a280db11..ad2a02ad11 100644 --- a/tests/unit/echoserver/echoserver.pro +++ b/tests/unit/echoserver/echoserver.pro @@ -3,7 +3,7 @@ QT += core network QT -= gui TARGET = echo -CONFIG += console c++14 +CONFIG += console c++11 CONFIG -= app_bundle TEMPLATE = app diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index 577e7fc359..922354975f 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -6,7 +6,7 @@ include(creator_dependency.pri) include(benchmark_dependency.pri) QT += core network testlib widgets -CONFIG += console c++14 testcase object_parallel_to_source +CONFIG += console c++11 testcase object_parallel_to_source CONFIG -= app_bundle OBJECTS_DIR = $$OUT_PWD/obj # workaround for qmake bug in object_parallel_to_source -- cgit v1.2.1 From 4edc105da331ca503a61837ec57fa87f04e53bdd Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 20 Apr 2016 07:45:09 +0200 Subject: Editor: Check if text codec pointer is valid. Fixes a crash when collecting codecs for opions page and a unsupported icu is used. Task-number: QTCREATORBUG-16114 Change-Id: I4081748f636602670e37465750862d4da4a14941 Reviewed-by: Eike Ziller --- src/plugins/texteditor/behaviorsettingswidget.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/plugins/texteditor/behaviorsettingswidget.cpp b/src/plugins/texteditor/behaviorsettingswidget.cpp index f3410915e4..718ea5e6e9 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.cpp +++ b/src/plugins/texteditor/behaviorsettingswidget.cpp @@ -63,14 +63,15 @@ BehaviorSettingsWidget::BehaviorSettingsWidget(QWidget *parent) if (firstNonNegative != mibs.end()) std::rotate(mibs.begin(), firstNonNegative, mibs.end()); foreach (int mib, mibs) { - QTextCodec *codec = QTextCodec::codecForMib(mib); - QString compoundName = QLatin1String(codec->name()); - foreach (const QByteArray &alias, codec->aliases()) { - compoundName += QLatin1String(" / "); - compoundName += QString::fromLatin1(alias); + if (QTextCodec *codec = QTextCodec::codecForMib(mib)) { + QString compoundName = QLatin1String(codec->name()); + foreach (const QByteArray &alias, codec->aliases()) { + compoundName += QLatin1String(" / "); + compoundName += QString::fromLatin1(alias); + } + d->m_ui.encodingBox->addItem(compoundName); + d->m_codecs.append(codec); } - d->m_ui.encodingBox->addItem(compoundName); - d->m_codecs.append(codec); } // Qt5 doesn't list the system locale (QTBUG-34283), so add it manually -- cgit v1.2.1 From ac04a91820a0aef0cfa14c2e47202876289eaac3 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 20 Apr 2016 11:04:31 +0200 Subject: Flat theme: Make some icon colors opaque Transparency channel plus shadow create more artifacts than benefits. This change removes sets the alpha to ff and changes the rgb values so, that the icons still look exactly as before on the standard toolbar background. Te icons will however be better visible on other backgrounds such as menus. Change-Id: Idbf2c5c838bad615844ebf2eb63d104f8939b991 Reviewed-by: Alessandro Portale --- share/qtcreator/themes/flat.creatortheme | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme index 5e3f9cfc8c..8affc8eb38 100644 --- a/share/qtcreator/themes/flat.creatortheme +++ b/share/qtcreator/themes/flat.creatortheme @@ -61,13 +61,13 @@ IconsWarningColor=ffecbc1c IconsWarningToolBarColor=fff2d76e IconsErrorColor=ffdf4f4f IconsErrorToolBarColor=ffdb6f71 -IconsRunColor=dda4d576 -IconsStopColor=ddff8c8c +IconsRunColor=ff93be6c +IconsStopColor=ffe27f7f IconsDebugColor=toolBarItem -IconsInterruptColor=dd7488db +IconsInterruptColor=ff6a7bc3 IconsNavigationArrowsColor=ffebc322 -IconsBuildHammerHandleColor=dddd7710 -IconsBuildHammerHeadColor=dd989898 +IconsBuildHammerHandleColor=ffc26b14 +IconsBuildHammerHeadColor=ff868687 IconsModeWelcomeActiveColor=ff80c342 IconsModeEditActiveColor=ff99aaef IconsModeDesignActiveColor=ffbb6000 -- cgit v1.2.1 From de7e36383fb0d2b9a63293ecbc0cd953f7700f7a Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 8 Apr 2016 11:00:17 +0200 Subject: Doc: update the Transitions example ...to use the new Qt logo Change-Id: I111d070c2ae40b71e650d78bd15d360328b474e3 Reviewed-by: Tim Jenssen --- doc/examples/transitions/MainForm.ui.qml | 108 +++++---------- doc/examples/transitions/main.cpp | 50 ------- doc/examples/transitions/main.qml | 158 ++++++++-------------- doc/examples/transitions/qt-logo.png | Bin 5149 -> 1519 bytes doc/images/qmldesigner-tutorial-quick-toolbar.png | Bin 12094 -> 45054 bytes doc/images/qmldesigner-tutorial-topleftrect.png | Bin 28318 -> 81599 bytes doc/images/qmldesigner-tutorial-ui-ready.png | Bin 0 -> 100941 bytes doc/images/qmldesigner-tutorial-user-icon.png | Bin 27033 -> 71024 bytes doc/images/qmldesigner-tutorial.png | Bin 4909 -> 9904 bytes doc/src/qtquick/qtquick-app-tutorial.qdoc | 16 ++- 10 files changed, 94 insertions(+), 238 deletions(-) create mode 100644 doc/images/qmldesigner-tutorial-ui-ready.png diff --git a/doc/examples/transitions/MainForm.ui.qml b/doc/examples/transitions/MainForm.ui.qml index f599b842a3..61a0e92b29 100644 --- a/doc/examples/transitions/MainForm.ui.qml +++ b/doc/examples/transitions/MainForm.ui.qml @@ -1,79 +1,38 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Controls 1.4 -import QtQuick.Layouts 1.2 +import QtQuick 2.6 +import QtQuick.Controls 1.5 +import QtQuick.Layouts 1.3 Item { + id: page width: 640 height: 480 + property alias mouseArea1: mouseArea1 + property alias mouseArea3: mouseArea3 + property alias mouseArea2: mouseArea2 property alias bottomLeftRect: bottomLeftRect property alias middleRightRect: middleRightRect property alias topLeftRect: topLeftRect property alias icon: icon - property alias mouseArea1: mouseArea1 - property alias mouseArea2: mouseArea2 - property alias mouseArea3: mouseArea3 + + Image { + id: icon + x: 10 + y: 20 + source: "qt-logo.png" + } Rectangle { id: topLeftRect - width: 46 - height: 55 + width: 55 + height: 41 color: "#00000000" - radius: 6 + radius: 0 + border.color: "#808080" anchors.left: parent.left anchors.leftMargin: 10 anchors.top: parent.top anchors.topMargin: 20 - border.color: "#808080" + border.width: 1 MouseArea { id: mouseArea1 @@ -83,12 +42,12 @@ Item { Rectangle { id: middleRightRect - x: 6 + x: -8 y: 6 - width: 46 - height: 55 + width: 55 + height: 41 color: "#00000000" - radius: 6 + radius: 0 anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right anchors.rightMargin: 10 @@ -96,32 +55,27 @@ Item { id: mouseArea2 anchors.fill: parent } + border.width: 1 border.color: "#808080" } Rectangle { id: bottomLeftRect - x: 0 - y: 4 - width: 46 - height: 55 + y: -2 + width: 55 + height: 41 color: "#00000000" - radius: 6 + radius: 0 anchors.bottom: parent.bottom anchors.bottomMargin: 20 + anchors.left: parent.left + anchors.leftMargin: 10 MouseArea { id: mouseArea3 anchors.fill: parent } - anchors.left: parent.left + border.width: 1 border.color: "#808080" - anchors.leftMargin: 10 } - Image { - id: icon - x: 10 - y: 20 - source: "qt-logo.png" - } } diff --git a/doc/examples/transitions/main.cpp b/doc/examples/transitions/main.cpp index 618e0f3da8..d76049d67e 100644 --- a/doc/examples/transitions/main.cpp +++ b/doc/examples/transitions/main.cpp @@ -1,53 +1,3 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - #include #include diff --git a/doc/examples/transitions/main.qml b/doc/examples/transitions/main.qml index 113cb551b0..b2d6928de4 100644 --- a/doc/examples/transitions/main.qml +++ b/doc/examples/transitions/main.qml @@ -1,122 +1,72 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.5 -import QtQuick.Controls 1.4 +import QtQuick 2.6 +import QtQuick.Controls 1.5 import QtQuick.Dialogs 1.2 ApplicationWindow { visible: true - title: qsTr("Transitions") width: 330 height: 330 + title: qsTr("Transitions") MainForm { anchors.fill: parent id: page mouseArea1 { - onClicked: stateGroup.state = ' ' - } - mouseArea2 { - onClicked: stateGroup.state = 'State1' - } - mouseArea3 { - onClicked: stateGroup.state = 'State2' - } + onClicked: stateGroup.state = ' ' + } + mouseArea2 { + onClicked: stateGroup.state = 'State1' + } + mouseArea3 { + onClicked: stateGroup.state = 'State2' + } } StateGroup { - id: stateGroup - states: [ - State { - name: "State1" + id: stateGroup + states: [ + State { + name: "State1" - PropertyChanges { - target: page.icon - x: page.middleRightRect.x - y: page.middleRightRect.y - } - }, - State { - name: "State2" + PropertyChanges { + target: page.icon + x: page.middleRightRect.x + y: page.middleRightRect.y + } + }, + State { + name: "State2" - PropertyChanges { - target: page.icon - x: page.bottomLeftRect.x - y: page.bottomLeftRect.y + PropertyChanges { + target: page.icon + x: page.bottomLeftRect.x + y: page.bottomLeftRect.y + } } - } - ] - transitions: [ - Transition { - from: "*"; to: "State1" - NumberAnimation { - easing.type: Easing.OutBounce - properties: "x,y"; - duration: 1000 - } - }, - Transition { - from: "*"; to: "State2" - NumberAnimation { - properties: "x,y"; - easing.type: Easing.InOutQuad; - duration: 2000 - } - }, - Transition { - NumberAnimation { - properties: "x,y"; - duration: 200 + ] + transitions: [ + Transition { + from: "*"; to: "State1" + NumberAnimation { + easing.type: Easing.OutBounce + properties: "x,y"; + duration: 1000 + } + }, + Transition { + from: "*"; to: "State2" + NumberAnimation { + properties: "x,y"; + easing.type: Easing.InOutQuad; + duration: 2000 + } + }, + Transition { + NumberAnimation { + properties: "x,y"; + duration: 200 + } } - } - ] - } - } + ] + } +} diff --git a/doc/examples/transitions/qt-logo.png b/doc/examples/transitions/qt-logo.png index 14ddf2a028..f465822ed0 100644 Binary files a/doc/examples/transitions/qt-logo.png and b/doc/examples/transitions/qt-logo.png differ diff --git a/doc/images/qmldesigner-tutorial-quick-toolbar.png b/doc/images/qmldesigner-tutorial-quick-toolbar.png index 48ffc07c35..51c3616eaa 100644 Binary files a/doc/images/qmldesigner-tutorial-quick-toolbar.png and b/doc/images/qmldesigner-tutorial-quick-toolbar.png differ diff --git a/doc/images/qmldesigner-tutorial-topleftrect.png b/doc/images/qmldesigner-tutorial-topleftrect.png index 3cc9d64c8e..b4e0d22f05 100644 Binary files a/doc/images/qmldesigner-tutorial-topleftrect.png and b/doc/images/qmldesigner-tutorial-topleftrect.png differ diff --git a/doc/images/qmldesigner-tutorial-ui-ready.png b/doc/images/qmldesigner-tutorial-ui-ready.png new file mode 100644 index 0000000000..3a3b311081 Binary files /dev/null and b/doc/images/qmldesigner-tutorial-ui-ready.png differ diff --git a/doc/images/qmldesigner-tutorial-user-icon.png b/doc/images/qmldesigner-tutorial-user-icon.png index 2e3f84ee0c..ee3a14485e 100644 Binary files a/doc/images/qmldesigner-tutorial-user-icon.png and b/doc/images/qmldesigner-tutorial-user-icon.png differ diff --git a/doc/images/qmldesigner-tutorial.png b/doc/images/qmldesigner-tutorial.png index a70f2860b6..3cf47bc2fe 100644 Binary files a/doc/images/qmldesigner-tutorial.png and b/doc/images/qmldesigner-tutorial.png differ diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/qtquick-app-tutorial.qdoc index 85bc3ff248..7f122c3311 100644 --- a/doc/src/qtquick/qtquick-app-tutorial.qdoc +++ b/doc/src/qtquick/qtquick-app-tutorial.qdoc @@ -74,8 +74,11 @@ \li In the \uicontrol Navigator, select \uicontrol RowLayout and press \key Delete to delete it. + \li Select \uicontrol Item in the navigator, and enter \e page in the + \uicontrol Id field. + \li In \uicontrol Library > \uicontrol Resources, select qt-logo.png and - drag and drop it to the \uicontrol Item in the navigator. + drag and drop it to the \e page in the navigator. \image qmldesigner-tutorial-user-icon.png "Image properties" @@ -101,8 +104,8 @@ \li In the \uicontrol Id field, enter \e topLeftRect. - \li In the \uicontrol Size field, set \uicontrol W to \e 46 and - \uicontrol H to \e 55, for the rectangle size to match the image + \li In the \uicontrol Size field, set \uicontrol W to \e 55 and + \uicontrol H to \e 41, for the rectangle size to match the image size. \li In the \uicontrol Color field, click the @@ -113,9 +116,6 @@ \li In the \uicontrol {Border color} field, set the border color to \e #808080. - \li In the \uicontrol Radius field, select \e 6 to create rounded - corners for the rectangle. - \li Click \uicontrol {Layout}, and then click the top and left anchor buttons to anchor the rectangle to the top left corner of the page. @@ -187,6 +187,8 @@ the \uicontrol Edit mode to add animation to the application, as described in the following section. + \image qmldesigner-tutorial-ui-ready.png "Transitions UI" + \section1 Adding Application Logic The new project wizard adds boilerplate code to the \e main.qml file to @@ -207,7 +209,7 @@ \quotefromfile transitions/main.qml \skipto ApplicationWindow - \printuntil height + \printuntil title \li Specify an id for the MainForm type to be able to use the properties that you exported in \e MainForm.ui.qml: -- cgit v1.2.1 From 5dc690f234ec7bb5dcdb11a610a4ecbee6dc4d64 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 20 Apr 2016 12:37:58 +0200 Subject: More change log Change-Id: I23e3a81425f1cb32d02d8520a2d4804b9d6b9a04 Reviewed-by: Leena Miettinen Reviewed-by: Orgad Shaneh --- dist/changes-4.0.0.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dist/changes-4.0.0.md b/dist/changes-4.0.0.md index 64d309e295..57ce375c7e 100644 --- a/dist/changes-4.0.0.md +++ b/dist/changes-4.0.0.md @@ -20,6 +20,7 @@ General * Fixed issues with HiDPI (QTCREATORBUG-15222) * Fixed that switching theme did not switch editor color scheme (QTCREATORBUG-15229) +* Fixed crash when double clicking wizard (QTCREATORBUG-15968) Editing @@ -28,15 +29,20 @@ Editing * Added `Go to Previous Split or Window` * Fixed whitespace cleaning for mixed tabs and spaces configurations (QTCREATORBUG-7994) +* Fixed download of highlighting files (QTCREATORBUG-15997) +* Fixed crash when cutting text from multiple splits (QTCREATORBUG-16046) Help * Fixed issues with scrolling to right position (QTCREATORBUG-15548) +* Fixed images overlapping text with older Qt documentation (QTCREATORBUG-15887) +* Fixed fallback font (QTCREATORBUG-15887) QMake Projects * Added wizard for creating `Qt Labs Controls Application` * Added support for `STATECHARTS` +* Fixed crash when switching session while project is read (QTCREATORBUG-15993) CMake Projects @@ -62,6 +68,7 @@ Qt Support C++ Support * Fixed issue with negative enum values +* Fixed completion of Doxygen tags (QTCREATORBUG-9373, QTCREATORBUG-15143) * Clang code model * Simplified activation (it is now active if the plugin is enabled) * Added customizable configurations for warnings (global and per project) @@ -71,16 +78,23 @@ C++ Support QML Support * Fixed various issues with QML/JS Console (QTCREATORBUG-14931) +* Fixed resolution of `alias` directives in `.qrc` files Debugging -* Added pretty printers for `std::set`, `std::map` and `std::multimap` - (for simple types of keys and values) +* Added pretty printers for `std::set`, `std::map`, `std::multimap` + (for simple types of keys and values), `std::valarray` and `QBitArray` * Improved performance for watches * Improved visualization of `QByteArray` and `char[]` with non-printable values (QTCREATORBUG-15549) * CDB * Fixed showing value of `std::[w]string` (QTCREATORBUG-15016) +* GDB + * Fixed import of system pretty printer (QTCREATORBUG-15923) + * Fixed changing display format for `float` (QTCREATORBUG-12800) +* LLDB + * Fixed issues with Xcode 7.3 + (QTCREATORBUG-15965, QTCREATORBUG-15945, QTCREATORBUG-15949) QML Profiler @@ -95,6 +109,7 @@ QML Profiler Clang Static Analyzer * Fixed analyzing with MinGW tool chain settings +* Fixed that Clang was run with default target instead of project target Test Integration @@ -102,6 +117,7 @@ Test Integration * Fixed resolution of source file of failed test on Windows (QTCREATORBUG-15667) * Fixed that additional output of passing tests was ignored * Fixed test detection with CMake projects (QTCREATORBUG-15813) +* Fixed crash while editing test (QTCREATORBUG-16062) * Google Test * Added support for typed tests * Fixed parsing of file and line information -- cgit v1.2.1