diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-01 14:47:56 +0200 |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-06-04 11:29:38 +0000 |
commit | a942de570e2288afa33b9b0b7a54db13e4a56892 (patch) | |
tree | 6b3a1651b248172371789e2df9abb56659fe133d | |
parent | 6d199358d79f91508a38749b8b2cb71248b9a0b3 (diff) |
wasm: wip/webassembly <-> 5.11 diff minimization
Fix whitespace and formatting issues, remove extra
code.
Change-Id: Ic98f8e386a4bff4ed3570ad23372a787f949ba35
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
-rw-r--r-- | examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp | 3 | ||||
-rw-r--r-- | src/corelib/io/qurlidna.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qelapsedtimer_unix.cpp | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qeventloop.h | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.cpp | 1 | ||||
-rw-r--r-- | src/corelib/plugin/qlibrary.h | 1 | ||||
-rw-r--r-- | src/opengl/qglframebufferobject.cpp | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 1 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 10 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 8 |
11 files changed, 10 insertions, 26 deletions
diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp index a2a834889f..90f5f1a6b3 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/main.cpp @@ -49,7 +49,6 @@ ****************************************************************************/ #include <QtWidgets> -#include <QtPlugin> int main(int argc, char *argv[]) { @@ -61,7 +60,7 @@ int main(int argc, char *argv[]) QObject::connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit())); QVBoxLayout *layout = new QVBoxLayout; - //layout->addWidget(textEdit); + layout->addWidget(textEdit); layout->addWidget(quitButton); QWidget window; diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index 39a5a81fe3..2f8bd91f6e 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -42,7 +42,6 @@ #include <QtCore/qstringlist.h> #include <algorithm> -#include <QDebug> QT_BEGIN_NAMESPACE @@ -2485,7 +2484,6 @@ static int nextDotDelimiter(const QString &domain, int from = 0) QString qt_ACE_do(const QString &domain, AceOperation op, AceLeadingDot dot) { - qDebug() << Q_FUNC_INFO << domain; if (domain.isEmpty()) return domain; diff --git a/src/corelib/kernel/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp index 4ef113a637..e166d4e3d2 100644 --- a/src/corelib/kernel/qelapsedtimer_unix.cpp +++ b/src/corelib/kernel/qelapsedtimer_unix.cpp @@ -48,7 +48,6 @@ #include <time.h> #endif #include <unistd.h> -#include <QDebug> #include <qatomic.h> #include "private/qcore_unix_p.h" diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index 6f3968ed83..eb1348220b 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -70,7 +70,6 @@ public: bool processEvents(ProcessEventsFlags flags = AllEvents); void processEvents(ProcessEventsFlags flags, int maximumTime); - int exec(ProcessEventsFlags flags = AllEvents); void exit(int returnCode = 0); bool isRunning() const; diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 016b67d790..7a8aa61ee2 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1459,6 +1459,7 @@ QThread *QObject::thread() const void QObject::moveToThread(QThread *targetThread) { Q_D(QObject); + if (d->threadData->thread == targetThread) { // object is already in this thread return; diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 0e7db25f60..fe60d36277 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -45,6 +45,7 @@ #ifndef Q_OS_HTML5 QT_REQUIRE_CONFIG(library); #endif + QT_BEGIN_NAMESPACE class QLibraryPrivate; diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index aa392b9d65..5bfc23a338 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -582,7 +582,7 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth_buffer); funcs.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, - GL_RENDERBUFFER, stencil_buffer); + GL_RENDERBUFFER, stencil_buffer); #else if (samples != 0) { funcs.glRenderbufferStorageMultisample(GL_RENDERBUFFER, samples, diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 96af6728c0..37c631483a 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -314,7 +314,6 @@ QGraphicsScenePrivate::QGraphicsScenePrivate() lastDropAction(Qt::IgnoreAction), style(0) { - qRegisterMetaType<QList<QRectF> >("QList<QRectF>"); } /*! diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index bf4ab25204..41f9d69c12 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -120,8 +120,6 @@ #include <QtPlatformHeaders/qxcbwindowfunctions.h> -#include <iostream> - // widget/widget data creation count //#define QWIDGET_EXTRA_DEBUG //#define ALIEN_DEBUG @@ -1957,9 +1955,9 @@ void QWidgetPrivate::syncBackingStore() void QWidgetPrivate::syncBackingStore(const QRegion ®ion) { - if (paintOnScreen()) { + if (paintOnScreen()) repaint_sys(region); - } else if (QWidgetBackingStore *bs = maybeBackingStore()) { + else if (QWidgetBackingStore *bs = maybeBackingStore()) { bs->sync(q_func(), region); } } diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 5c3557d3ec..3b093283cd 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -67,8 +67,6 @@ # include <qpa/qplatformnativeinterface.h> #endif -#include <iostream> - QT_BEGIN_NAMESPACE extern QRegion qt_dirtyRegion(QWidget *); @@ -1107,12 +1105,9 @@ bool QWidgetBackingStore::syncAllowed() */ void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedRegion) { - QTLWExtra *tlwExtra = tlw->d_func()->maybeTopData(); if (!tlw->isVisible() || !tlwExtra || tlwExtra->inTopLevelResize) - { return; - } if (!exposedWidget || !exposedWidget->internalWinId() || !exposedWidget->isVisible() || !exposedWidget->testAttribute(Qt::WA_Mapped) || !exposedWidget->updatesEnabled() || exposedRegion.isEmpty()) { @@ -1133,7 +1128,6 @@ void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedReg if (syncAllowed()) doSync(); - } /*! @@ -1160,7 +1154,6 @@ void QWidgetBackingStore::sync() if (syncAllowed()) doSync(); - } void QWidgetBackingStore::doSync() @@ -1645,11 +1638,8 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn) QWidgetBackingStore::unflushPaint(q, toBePainted); #endif - abort(); - if (Q_UNLIKELY(q->paintingActive())) qWarning("QWidget::repaint: It is dangerous to leave painters active on a widget outside of the PaintEvent"); - } diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index efaf63072e..1f3057b008 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -1080,10 +1080,10 @@ void QWidgetWindow::handleContextMenuEvent(QContextMenuEvent *e) void QWidgetWindow::updateObjectName() { -// QString name = m_widget->objectName(); -// if (name.isEmpty()) -// name = QString::fromUtf8(m_widget->metaObject()->className()) + QLatin1String("Class"); - QString name = QLatin1String("Window"); + QString name = m_widget->objectName(); + if (name.isEmpty()) + name = QString::fromUtf8(m_widget->metaObject()->className()) + QLatin1String("Class"); + name += QLatin1String("Window"); setObjectName(name); } |