4 files changed, 41 insertions, 2 deletions

diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp
index 77e8abc927..202a5f9580 100644
--- a/examples/network/dnslookup/dnslookup.cpp
+++ b/examples/network/dnslookup/dnslookup.cpp
@@ -50,7 +50,7 @@
 
 static void usage() {
     printf("Qt DNS example - performs DNS lookups\n"
-           "Usage: dnslookup [-t <type>] name\n\n");
+           "Usage: dnslookup [-t <type>] [-s nameserver] name\n\n");
 }
 
 DnsManager::DnsManager()
@@ -93,6 +93,17 @@ void DnsManager::execute()
             return;
         }
     }
+    if (args.size() > 1 && args.first() == "-s") {
+        args.takeFirst();
+        const QString ns = args.takeFirst();
+        QHostAddress nameserver(ns);
+        if (nameserver.isNull() || nameserver.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) {
+            printf("Bad nameserver address: %s\n", qPrintable(ns));
+            QCoreApplication::instance()->quit();
+            return;
+        }
+        dns->setNameserver(nameserver);
+    }
     if (args.isEmpty()) {
         usage();
         QCoreApplication::instance()->quit();
diff --git a/examples/network/network.pro b/examples/network/network.pro
index be4ccdbddf..8ed72315e2 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -23,7 +23,7 @@ qtHaveModule(widgets) {
                 multicastsender
 
     # no QProcess
-    !vxworks:!qnx:SUBDIRS += network-chat
+    !vxworks:!qnx:!winrt:SUBDIRS += network-chat
 
     contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
     contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
diff --git a/examples/widgets/widgets/spinboxes/window.cpp b/examples/widgets/widgets/spinboxes/window.cpp
index acce642ec6..7c2f6e45bc 100644
--- a/examples/widgets/widgets/spinboxes/window.cpp
+++ b/examples/widgets/widgets/spinboxes/window.cpp
@@ -94,6 +94,16 @@ void Window::createSpinBoxes()
     priceSpinBox->setValue(99);
 //! [4] //! [5]
 
+    groupSeparatorSpinBox = new QSpinBox;
+    groupSeparatorSpinBox->setRange(-99999999, 99999999);
+    groupSeparatorSpinBox->setValue(1000);
+    groupSeparatorSpinBox->setGroupSeparatorShown(true);
+    QCheckBox *groupSeparatorChkBox = new QCheckBox;
+    groupSeparatorChkBox->setText(tr("Show group separator"));
+    groupSeparatorChkBox->setChecked(true);
+    connect(groupSeparatorChkBox, &QCheckBox::toggled, groupSeparatorSpinBox,
+            &QSpinBox::setGroupSeparatorShown);
+
     QLabel *hexLabel = new QLabel(tr("Enter a value between "
         "%1 and %2:").arg('-' + QString::number(31, 16)).arg(QString::number(31, 16)));
     QSpinBox *hexSpinBox = new QSpinBox;
@@ -111,6 +121,8 @@ void Window::createSpinBoxes()
     spinBoxLayout->addWidget(priceSpinBox);
     spinBoxLayout->addWidget(hexLabel);
     spinBoxLayout->addWidget(hexSpinBox);
+    spinBoxLayout->addWidget(groupSeparatorChkBox);
+    spinBoxLayout->addWidget(groupSeparatorSpinBox);
     spinBoxesGroup->setLayout(spinBoxLayout);
 }
 //! [5]
@@ -237,6 +249,17 @@ void Window::createDoubleSpinBoxes()
 //! [17]
             this, SLOT(changePrecision(int)));
 
+    groupSeparatorSpinBox_d = new QDoubleSpinBox;
+    groupSeparatorSpinBox_d->setRange(-99999999, 99999999);
+    groupSeparatorSpinBox_d->setDecimals(2);
+    groupSeparatorSpinBox_d->setValue(1000.00);
+    groupSeparatorSpinBox_d->setGroupSeparatorShown(true);
+    QCheckBox *groupSeparatorChkBox = new QCheckBox;
+    groupSeparatorChkBox->setText(tr("Show group separator"));
+    groupSeparatorChkBox->setChecked(true);
+    connect(groupSeparatorChkBox, &QCheckBox::toggled, groupSeparatorSpinBox_d,
+            &QDoubleSpinBox::setGroupSeparatorShown);
+
 //! [18]
     QVBoxLayout *spinBoxLayout = new QVBoxLayout;
     spinBoxLayout->addWidget(precisionLabel);
@@ -247,6 +270,8 @@ void Window::createDoubleSpinBoxes()
     spinBoxLayout->addWidget(scaleSpinBox);
     spinBoxLayout->addWidget(priceLabel);
     spinBoxLayout->addWidget(priceSpinBox);
+    spinBoxLayout->addWidget(groupSeparatorChkBox);
+    spinBoxLayout->addWidget(groupSeparatorSpinBox_d);
     doubleSpinBoxesGroup->setLayout(spinBoxLayout);
 }
 //! [18]
diff --git a/examples/widgets/widgets/spinboxes/window.h b/examples/widgets/widgets/spinboxes/window.h
index ef7af04f59..32622c2c24 100644
--- a/examples/widgets/widgets/spinboxes/window.h
+++ b/examples/widgets/widgets/spinboxes/window.h
@@ -45,6 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 class QDateTimeEdit;
+class QSpinBox;
 class QDoubleSpinBox;
 class QGroupBox;
 class QLabel;
@@ -75,6 +76,8 @@ private:
     QGroupBox *editsGroup;
     QGroupBox *doubleSpinBoxesGroup;
     QLabel *meetingLabel;
+    QSpinBox *groupSeparatorSpinBox;
+    QDoubleSpinBox *groupSeparatorSpinBox_d;
 };
 //! [0]