diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-13 09:01:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-13 12:46:46 +0200 |
commit | 511790fd1af1e2886a0e2e8dd4308099705cd815 (patch) | |
tree | b42aee537a6103cd064f9f41ae2889b09b79fd23 /examples | |
parent | 1542d8881fc5ccbc5918cd4acbe4091ebbd24508 (diff) | |
parent | cbe332405aa22257d432f1797b325f5e57007c20 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
mkspecs/features/uikit/sdk.prf
src/corelib/global/qhooks.cpp
src/corelib/io/qfilesystemwatcher.cpp
src/corelib/io/qlockfile_unix.cpp
src/corelib/tools/qalgorithms.h
src/gui/kernel/qwindowsysteminterface.h
src/gui/text/qtextdocument_p.cpp
src/network/access/access.pri
src/network/access/qnetworkaccessmanager.cpp
src/network/access/qnetworkreplynsurlconnectionimpl.mm
src/src.pro
src/testlib/qtestcase.cpp
src/widgets/kernel/qwidgetbackingstore_p.h
src/widgets/styles/qwindowscestyle.cpp
src/widgets/styles/qwindowsmobilestyle.cpp
tests/auto/corelib/io/qdiriterator/qdiriterator.pro
tests/auto/corelib/io/qfileinfo/qfileinfo.pro
tests/auto/gui/kernel/qwindow/BLACKLIST
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
tools/configure/configureapp.cpp
Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
Diffstat (limited to 'examples')
5 files changed, 14 insertions, 5 deletions
diff --git a/examples/corelib/mimetypes/mimetypes.pro b/examples/corelib/mimetypes/mimetypes.pro index 5eaa816871..6c7e0eab13 100644 --- a/examples/corelib/mimetypes/mimetypes.pro +++ b/examples/corelib/mimetypes/mimetypes.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = mimetypebrowser +qtHaveModule(widgets): SUBDIRS += \ + mimetypebrowser diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index c85ad97248..fddd2c809a 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -56,9 +56,9 @@ #include "ui_authenticationdialog.h" #ifndef QT_NO_SSL -static const char defaultUrl[] = "https://qt-project.org/"; +static const char defaultUrl[] = "https://www.qt.io/"; #else -static const char defaultUrl[] = "http://qt-project.org/"; +static const char defaultUrl[] = "http://www.qt.io/"; #endif static const char defaultFileName[] = "index.html"; @@ -106,7 +106,7 @@ HttpWindow::HttpWindow(QWidget *parent) connect(urlLineEdit, &QLineEdit::textChanged, this, &HttpWindow::enableDownloadButton); formLayout->addRow(tr("&URL:"), urlLineEdit); - QString downloadDirectory = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); + QString downloadDirectory = QStandardPaths::writableLocation(QStandardPaths::TempLocation); if (downloadDirectory.isEmpty() || !QFileInfo(downloadDirectory).isDir()) downloadDirectory = QDir::currentPath(); downloadDirectoryLineEdit->setText(QDir::toNativeSeparators(downloadDirectory)); diff --git a/examples/opengl/legacy/shared/qtlogo.h b/examples/opengl/legacy/shared/qtlogo.h index 92ada8eba5..ed2d7d750d 100644 --- a/examples/opengl/legacy/shared/qtlogo.h +++ b/examples/opengl/legacy/shared/qtlogo.h @@ -54,7 +54,8 @@ #include <QObject> #include <QColor> -class QOpenGLFunctions_1_1; +QT_FORWARD_DECLARE_CLASS(QOpenGLFunctions_1_1) + class Patch; struct Geometry; diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro index 9dea65bf9f..9db3452488 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro +++ b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro @@ -5,3 +5,6 @@ LIBS += -framework AppKit QT += widgets +# install +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmaccocoaviewcontainer +INSTALLS += target diff --git a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro index 9da91c7be0..5a19d41dc8 100644 --- a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro +++ b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro @@ -5,3 +5,7 @@ LIBS += -framework AppKit QT += widgets #QT += widgets-private gui-private core-private + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmacnativewidget +INSTALLS += target |