diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
| commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
| tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /examples/network/downloadmanager/main.cpp | |
| parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
| parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'examples/network/downloadmanager/main.cpp')
| -rw-r--r-- | examples/network/downloadmanager/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/network/downloadmanager/main.cpp b/examples/network/downloadmanager/main.cpp index 158f04c9e6..e3ba490992 100644 --- a/examples/network/downloadmanager/main.cpp +++ b/examples/network/downloadmanager/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -50,11 +50,15 @@ #include <QCoreApplication> #include <QStringList> + #include "downloadmanager.h" -#include <stdio.h> + +#include <cstdio> int main(int argc, char **argv) { + using namespace std; + QCoreApplication app(argc, argv); QStringList arguments = app.arguments(); arguments.takeFirst(); // remove the first argument, which is the program's name |