Merge commit 'origin/4.6' into 4.6-ce

3 files changed, 28 insertions, 1 deletions

diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
index ddd5579..b99760e 100644
--- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp
@@ -321,7 +321,7 @@ struct RefCounted
         instanceCount.ref();
     }
 
-    RefCounted(RefCounted const &other)
+    RefCounted(RefCounted const &)
         : ref(0)
     {
         instanceCount.ref();
@@ -335,6 +335,7 @@ struct RefCounted
 
     RefCounted &operator=(RefCounted const &)
     {
+        return *this;
     }
 
     QAtomicInt ref;
diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp
index 78f9fcb..31e8b3e 100644
--- a/tests/manual/windowflags/previewwindow.cpp
+++ b/tests/manual/windowflags/previewwindow.cpp
@@ -103,8 +103,18 @@ PreviewWindow::PreviewWindow(QWidget *parent)
     closeButton = new QPushButton(tr("&Close"));
     connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
 
+    showNormalButton = new QPushButton(tr("Show normal"));
+    connect(showNormalButton, SIGNAL(clicked()), this, SLOT(showNormal()));
+    showMaximizedButton = new QPushButton(tr("Show maximized"));
+    connect(showMaximizedButton, SIGNAL(clicked()), this, SLOT(showMaximized()));
+    showFullScreenButton = new QPushButton(tr("Show fullscreen"));
+    connect(showFullScreenButton, SIGNAL(clicked()), this, SLOT(showFullScreen()));
+
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(textEdit);
+    layout->addWidget(showNormalButton);
+    layout->addWidget(showMaximizedButton);
+    layout->addWidget(showFullScreenButton);
     layout->addWidget(closeButton);
     setLayout(layout);
 
@@ -129,8 +139,18 @@ PreviewDialog::PreviewDialog(QWidget *parent)
     closeButton = new QPushButton(tr("&Close"));
     connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
 
+    showNormalButton = new QPushButton(tr("Show normal"));
+    connect(showNormalButton, SIGNAL(clicked()), this, SLOT(showNormal()));
+    showMaximizedButton = new QPushButton(tr("Show maximized"));
+    connect(showMaximizedButton, SIGNAL(clicked()), this, SLOT(showMaximized()));
+    showFullScreenButton = new QPushButton(tr("Show fullscreen"));
+    connect(showFullScreenButton, SIGNAL(clicked()), this, SLOT(showFullScreen()));
+
     QVBoxLayout *layout = new QVBoxLayout;
     layout->addWidget(textEdit);
+    layout->addWidget(showNormalButton);
+    layout->addWidget(showMaximizedButton);
+    layout->addWidget(showFullScreenButton);
     layout->addWidget(closeButton);
     setLayout(layout);
 
diff --git a/tests/manual/windowflags/previewwindow.h b/tests/manual/windowflags/previewwindow.h
index fdd21d7..fbf822b 100644
--- a/tests/manual/windowflags/previewwindow.h
+++ b/tests/manual/windowflags/previewwindow.h
@@ -62,6 +62,9 @@ public:
 private:
     QTextEdit *textEdit;
     QPushButton *closeButton;
+    QPushButton *showNormalButton;
+    QPushButton *showMaximizedButton;
+    QPushButton *showFullScreenButton;
 };
 
 class PreviewDialog : public QDialog
@@ -76,6 +79,9 @@ public:
 private:
     QTextEdit *textEdit;
     QPushButton *closeButton;
+    QPushButton *showNormalButton;
+    QPushButton *showMaximizedButton;
+    QPushButton *showFullScreenButton;
 };
 
 #endif