Fix crash in QNetworkAccessManager.

Recreating QCoreApplication could cause a crash in QNetworkAccessManager
constructor. That was caused by an invalid shutdown detection introduced
in f273d6fbc0.

Task-number: QTBUG-36897
Change-Id: Ib5bba773a2a4fcde690a3a93680aef551aae3a5b
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>

src/network/bearer/qnetworkconfigmanager.cpp

@@ -57,6 +57,13 @@ QT_BEGIN_NAMESPACE
 static QBasicAtomicPointer<QNetworkConfigurationManagerPrivate> connManager_ptr;
 static QBasicAtomicInt appShutdown;
 
+static void connManager_prepare()
+{
+    int shutdown = appShutdown.fetchAndStoreAcquire(0);
+    Q_ASSERT(shutdown == 0 || shutdown == 1);
+    Q_UNUSED(shutdown);
+}
+
 static void connManager_cleanup()
 {
     // this is not atomic or thread-safe!
@@ -68,8 +75,9 @@ static void connManager_cleanup()
         cmp->cleanup();
 }
 
-void QNetworkConfigurationManagerPrivate::addPostRoutine()
+void QNetworkConfigurationManagerPrivate::addPreAndPostRoutine()
 {
+    qAddPreRoutine(connManager_prepare);
     qAddPostRoutine(connManager_cleanup);
 }
 
@@ -85,12 +93,12 @@ QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
 
             if (QCoreApplicationPrivate::mainThread() == QThread::currentThread()) {
                 // right thread or no main thread yet
-                ptr->addPostRoutine();
+                ptr->addPreAndPostRoutine();
                 ptr->initialize();
             } else {
                 // wrong thread, we need to make the main thread do this
                 QObject *obj = new QObject;
-                QObject::connect(obj, SIGNAL(destroyed()), ptr, SLOT(addPostRoutine()), Qt::DirectConnection);
+                QObject::connect(obj, SIGNAL(destroyed()), ptr, SLOT(addPreAndPostRoutine()), Qt::DirectConnection);
                 ptr->initialize(); // this moves us to the right thread
                 obj->moveToThread(QCoreApplicationPrivate::mainThread());
                 obj->deleteLater();

src/network/bearer/qnetworkconfigmanager_p.h

@@ -94,7 +94,7 @@ public:
 public Q_SLOTS:
     void updateConfigurations();
 
-    static void addPostRoutine();
+    static void addPreAndPostRoutine();
 
 Q_SIGNALS:
     void configurationAdded(const QNetworkConfiguration &config);

tests/auto/network/bearer/bearer.pro

@@ -2,5 +2,6 @@ TEMPLATE=subdirs
 SUBDIRS=\
    qnetworkconfiguration \
    qnetworkconfigurationmanager \
+   qnetworkconfigurationmanagerqappless \
    qnetworksession \
 

tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/qnetworkconfigurationmanagerqappless.pro

@@ -0,0 +1,6 @@
+CONFIG += testcase
+TARGET = tst_qnetworkconfigurationmanagerqappless
+SOURCES  += tst_qnetworkconfigurationmanagerqappless.cpp
+HEADERS  += ../qbearertestcommon.h
+
+QT = core network testlib

tests/auto/network/bearer/qnetworkconfigurationmanagerqappless/tst_qnetworkconfigurationmanagerqappless.cpp

@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtNetwork/qnetworkaccessmanager.h>
+
+QT_USE_NAMESPACE
+
+class tst_QNetworkConfigurationManager : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void staticsInitialization();
+};
+
+void tst_QNetworkConfigurationManager::staticsInitialization()
+{
+    // This code should not crash. The test was introduced as
+    // a fix for https://bugreports.qt-project.org/browse/QTBUG-36897
+    for (int i = 0; i < 2; i++)
+    {
+        int argc = 1;
+        const char *testName = "tst_qnetworkconfigurationmanagerqappless";
+        char **argv = const_cast<char **>(&testName);
+        QCoreApplication app(argc, argv);
+        QNetworkAccessManager qnam;
+        Q_UNUSED(app);
+        Q_UNUSED(qnam);
+    }
+    QVERIFY(true);
+}
+
+QTEST_APPLESS_MAIN(tst_QNetworkConfigurationManager)
+#include "tst_qnetworkconfigurationmanagerqappless.moc"