From 2ceacd537279e735025a2c74a7a1b73ea8c4fc06 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 23 May 2016 17:42:49 -0700 Subject: Fix httpwindow example. DownloadLocation is not writable on some platforms (iOS) in Qt 5.6, and qt-project.org HTTPS does not work anymore. Change-Id: I78bfbee1472cd39cd05ec7f846d1195d4fbb1b2c Reviewed-by: Timur Pocheptsov --- examples/network/http/httpwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index 301431fd5e..41563dc235 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -46,9 +46,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"; @@ -96,7 +96,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)); -- cgit v1.2.3 From 965b5b7ae07f8abec580729001abd61e8db729e5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 26 May 2016 16:31:02 +0200 Subject: OpenGL legacy example: Fix compilation in namespaced builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6b2f3e8c240e105c73008fa61f9ed50cc9d982ac Reviewed-by: Alexandru Croitor Reviewed-by: Laszlo Agocs Reviewed-by: Topi Reiniö --- examples/opengl/legacy/shared/qtlogo.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/opengl/legacy/shared/qtlogo.h b/examples/opengl/legacy/shared/qtlogo.h index 9bd15a1431..c5d8db9f9f 100644 --- a/examples/opengl/legacy/shared/qtlogo.h +++ b/examples/opengl/legacy/shared/qtlogo.h @@ -44,7 +44,8 @@ #include #include -class QOpenGLFunctions_1_1; +QT_FORWARD_DECLARE_CLASS(QOpenGLFunctions_1_1) + class Patch; struct Geometry; -- cgit v1.2.3 From 58408ffa1b9c0b42a1719d3c8a4d4c62dec4fce6 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 31 May 2016 14:46:17 +0200 Subject: Add install target to mac widget examples Change-Id: I524ba3fcc82a6ef015241d90f212059ae7772443 Reviewed-by: Jake Petroules Reviewed-by: Timur Pocheptsov Reviewed-by: Oswald Buddenhagen --- .../widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro | 3 +++ examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'examples') diff --git a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro index c8c2195cb8..183e307877 100644 --- a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro +++ b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro @@ -5,3 +5,6 @@ LIBS += -framework Cocoa 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 cafff9f035..b39792e6dd 100644 --- a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro +++ b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro @@ -5,3 +5,7 @@ LIBS += -framework Cocoa QT += widgets #QT += widgets-private gui-private core-private + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mac/qmacnativewidget +INSTALLS += target -- cgit v1.2.3 From cd21da392216f7af6680695dd1b02e6397b72cb3 Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Mon, 6 Jun 2016 14:59:14 -0700 Subject: examples/corelib/mimetypebrowser: Fix no-widgets build Change-Id: Iea8cbc791bc2bb990c4d550c890ccd5f5ca17bd6 Reviewed-by: Friedemann Kleint --- examples/corelib/mimetypes/mimetypes.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') 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 -- cgit v1.2.3