From 6e770638d20124802345fa5224c24e8c9d0f1d68 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 3 Nov 2016 18:24:22 +0100 Subject: remove dependencies from sync.profile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the CI obtains them from the qt5 super repo nowadays. Change-Id: I030c3c28510163bc7c35f82808b3882e68e51857 Reviewed-by: Jędrzej Nowacki --- sync.profile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/sync.profile b/sync.profile index 28a3d1b9a..9dcaf8ce7 100644 --- a/sync.profile +++ b/sync.profile @@ -19,16 +19,3 @@ "QDesignerExportWidget" => "QtUiPlugin/QDesignerExportWidget" } ); -# Module dependencies. -# Every module that is required to build this module should have one entry. -# Each of the module version specifiers can take one of the following values: -# - A specific Git revision. -# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) -# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) -# -%dependencies = ( - "qtbase" => "", - "qtxmlpatterns" => "", - "qtdeclarative" => "", - "qtactiveqt" => "", -); -- cgit v1.2.1 From c84dcdd59af82b972b0dee115e95e8aa91b28c50 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 2 Nov 2016 15:47:02 +0100 Subject: pixeltool: Check whether initial geometry is applicable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When changing primary screens of multi-monitor-setups on Windows, out-of-screen positions might be saved which make it impossible to bring the tool back and also cause crashes when no screen is found for grabbbing. Check the saved position when reading the settings and check if a screen can be obtained for grabbing. Change-Id: I69ec677e144306290a4ee7a3e84f87dd600ff086 Reviewed-by: Morten Johan Sørvig --- src/pixeltool/qpixeltool.cpp | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp index b381c2e9c..8b3fe29ea 100644 --- a/src/pixeltool/qpixeltool.cpp +++ b/src/pixeltool/qpixeltool.cpp @@ -56,6 +56,18 @@ QT_BEGIN_NAMESPACE +static QPoint initialPos(const QSettings &settings, const QSize &initialSize) +{ + const QDesktopWidget *desktopWidget = QApplication::desktop(); + const QPoint defaultPos = desktopWidget->availableGeometry().topLeft(); + const QPoint savedPos = + settings.value(QLatin1String("position"), QVariant(defaultPos)).toPoint(); + const int savedScreen = desktopWidget->screenNumber(savedPos); + return savedScreen >= 0 + && desktopWidget->availableGeometry(savedScreen).intersects(QRect(savedPos, initialSize)) + ? savedPos : defaultPos; +} + QPixelTool::QPixelTool(QWidget *parent) : QWidget(parent) , m_freeze(false) @@ -75,7 +87,7 @@ QPixelTool::QPixelTool(QWidget *parent) m_zoom = settings.value(QLatin1String("zoom"), 4).toInt(); m_initialSize = settings.value(QLatin1String("initialSize"), QSize(250, 200)).toSize(); - move(settings.value(QLatin1String("position")).toPoint()); + move(initialPos(settings, m_initialSize)); setMouseTracking(true); setAttribute(Qt::WA_NoBackground); @@ -431,11 +443,14 @@ void QPixelTool::grabScreen() int x = mousePos.x() - w/2; int y = mousePos.y() - h/2; + const QBrush darkBrush = palette().color(QPalette::Dark); const QDesktopWidget *desktopWidget = QApplication::desktop(); - - QScreen *screen = QGuiApplication::screens().at(desktopWidget->screenNumber(this)); - m_buffer = screen->grabWindow(desktopWidget->winId(), x, y, w, h); - + if (QScreen *screen = QGuiApplication::screens().value(desktopWidget->screenNumber(this), Q_NULLPTR)) { + m_buffer = screen->grabWindow(desktopWidget->winId(), x, y, w, h); + } else { + m_buffer = QPixmap(w, h); + m_buffer.fill(darkBrush.color()); + } QRegion geom(x, y, w, h); QRect screenRect; for (int i = 0; i < desktopWidget->numScreens(); ++i) @@ -446,7 +461,7 @@ void QPixelTool::grabScreen() QPainter p(&m_buffer); p.translate(-x, -y); p.setPen(Qt::NoPen); - p.setBrush(palette().color(QPalette::Dark)); + p.setBrush(darkBrush); p.drawRects(rects); } -- cgit v1.2.1 From 0e735daf4530f6f7972f2368535dd3cff2eeb3e3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 16 Nov 2016 13:23:13 +0100 Subject: Qt Designer: Remove unused variable Fix warning: widgetbox\widgetboxtreewidget.cpp:70:20: warning: 'qtLogoC' defined but not used [-Wunused-variable] static const char *qtLogoC = "qtlogo.png"; Amends change 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9. Change-Id: I4908a067c654d706f24d0afafd99142241ad3f69 Reviewed-by: Jarek Kobus --- src/designer/src/components/widgetbox/widgetboxtreewidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index d331617d4..24f52b9bc 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -72,7 +72,6 @@ static const char *defaultTypeValueC = "default"; static const char *customValueC = "custom"; static const char *iconPrefixC = "__qt_icon__"; static const char *scratchPadValueC = "scratchpad"; -static const char *qtLogoC = "qtlogo.png"; static const char *invisibleNameC = "[invisible]"; enum TopLevelRole { NORMAL_ITEM, SCRATCHPAD_ITEM, CUSTOM_ITEM }; -- cgit v1.2.1