diff options
Diffstat (limited to 'tests/manual')
219 files changed, 3445 insertions, 2304 deletions
diff --git a/tests/manual/.prev_CMakeLists.txt b/tests/manual/.prev_CMakeLists.txt new file mode 100644 index 0000000000..8c872a2f39 --- /dev/null +++ b/tests/manual/.prev_CMakeLists.txt @@ -0,0 +1,68 @@ +# Generated from manual.pro. + +add_subdirectory(filetest) +add_subdirectory(embeddedintoforeignwindow) +add_subdirectory(foreignwindows) +add_subdirectory(gestures) +add_subdirectory(highdpi) +add_subdirectory(inputmethodhints) +add_subdirectory(keypadnavigation) +add_subdirectory(lance) +add_subdirectory(qcursor) +add_subdirectory(qdesktopservices) +add_subdirectory(qdesktopwidget) +add_subdirectory(qgraphicsitem) +add_subdirectory(qgraphicsitemgroup) +add_subdirectory(qgraphicslayout/flicker) +add_subdirectory(qhttpnetworkconnection) +add_subdirectory(qimagereader) +add_subdirectory(qlayout) +add_subdirectory(qlocale) +add_subdirectory(qmimedatabase) +add_subdirectory(qnetconmonitor) +add_subdirectory(qnetworkaccessmanager/qget) +add_subdirectory(qnetworkreply) +add_subdirectory(qstorageinfo) +add_subdirectory(qscreen) +add_subdirectory(qsslsocket) +add_subdirectory(qsysinfo) +add_subdirectory(qtabletevent) +add_subdirectory(qtexteditlist) +add_subdirectory(qtexttableborders) +add_subdirectory(qtbug-8933) +add_subdirectory(qtbug-52641) +add_subdirectory(qtouchevent) +add_subdirectory(touch) +add_subdirectory(qwidget_zorder) +add_subdirectory(repaint) +add_subdirectory(socketengine) +add_subdirectory(textrendering) +add_subdirectory(widgets) +add_subdirectory(windowflags) +add_subdirectory(windowgeometry) +add_subdirectory(windowmodality) +add_subdirectory(widgetgrab) +add_subdirectory(xembed-raster) +add_subdirectory(xembed-widgets) +add_subdirectory(shortcuts) +add_subdirectory(dialogs) +add_subdirectory(windowtransparency) +add_subdirectory(unc) +add_subdirectory(qtabbar) +add_subdirectory(rhi) +if(UNIX) + add_subdirectory(network_remote_stresstest) + add_subdirectory(network_stresstest) +endif() +if(QT_FEATURE_openssl) + add_subdirectory(qssloptions) +endif() +if(QT_FEATURE_opengl) + add_subdirectory(qopengltextureblitter) +endif() +if(QT_FEATURE_egl AND QT_FEATURE_opengl) + add_subdirectory(qopenglcontext) +endif() +if(QT_FEATURE_vulkan) + add_subdirectory(qvulkaninstance) +endif() diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt new file mode 100644 index 0000000000..7fd2f93966 --- /dev/null +++ b/tests/manual/CMakeLists.txt @@ -0,0 +1,83 @@ +# Generated from manual.pro. + +# special case begin +# Don't build manual tests when targeting iOS. +if(UIKIT) + return() +endif() +# special case end + +add_subdirectory(filetest) +# special case begin +# diaglib is broken in dev due to missing +# QtOpenGL/QGLFunctions headers +# add_subdirectory(embeddedintoforeignwindow) +# add_subdirectory(foreignwindows) +# special case end +add_subdirectory(gestures) +# add_subdirectory(highdpi) special case broken in dev +add_subdirectory(inputmethodhints) +add_subdirectory(keypadnavigation) +#add_subdirectory(lance) # special case qgl.h missing +add_subdirectory(qcursor) +add_subdirectory(qdesktopservices) +add_subdirectory(qdesktopwidget) +add_subdirectory(qgraphicsitem) +add_subdirectory(qgraphicsitemgroup) +add_subdirectory(qgraphicslayout/flicker) +add_subdirectory(qhttpnetworkconnection) +add_subdirectory(qimagereader) +add_subdirectory(qlayout) +add_subdirectory(qlocale) +add_subdirectory(qmimedatabase) +add_subdirectory(qnetconmonitor) +add_subdirectory(qnetworkaccessmanager/qget) +#special case begin +if (QT_FEATURE_openssl AND UNIX) + add_subdirectory(qnetworkreply) +endif() +#special case end +add_subdirectory(qstorageinfo) +add_subdirectory(qscreen) +add_subdirectory(qsslsocket) +add_subdirectory(qsysinfo) +add_subdirectory(qtabletevent) +add_subdirectory(qtexteditlist) +add_subdirectory(qtexttableborders) +add_subdirectory(qtbug-8933) +add_subdirectory(qtbug-52641) +add_subdirectory(qtouchevent) +add_subdirectory(touch) +add_subdirectory(qwidget_zorder) +add_subdirectory(repaint) +add_subdirectory(socketengine) +add_subdirectory(textrendering) +add_subdirectory(widgets) +add_subdirectory(windowflags) +add_subdirectory(windowgeometry) +add_subdirectory(windowmodality) +add_subdirectory(widgetgrab) +add_subdirectory(xembed-raster) +add_subdirectory(xembed-widgets) +add_subdirectory(shortcuts) +add_subdirectory(dialogs) +add_subdirectory(windowtransparency) +add_subdirectory(unc) +add_subdirectory(qtabbar) +add_subdirectory(rhi) +if(UNIX) + add_subdirectory(network_remote_stresstest) + add_subdirectory(network_stresstest) +endif() +if(QT_FEATURE_openssl) + add_subdirectory(qssloptions) +endif() +if(QT_FEATURE_opengl) + # add_subdirectory(qopengltextureblitter) special case broken in dev +endif() +if(QT_FEATURE_egl AND QT_FEATURE_opengl) + # add_subdirectory(qopenglcontext) # special case broken in dev +endif() +if(QT_FEATURE_vulkan) + add_subdirectory(qvulkaninstance) +endif() diff --git a/tests/manual/bearerex/bearerex.cpp b/tests/manual/bearerex/bearerex.cpp deleted file mode 100644 index d9b916907b..0000000000 --- a/tests/manual/bearerex/bearerex.cpp +++ /dev/null @@ -1,569 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "bearerex.h" -#include "datatransferer.h" - -#include <QtNetwork> -#include <QtWidgets> - -BearerEx::BearerEx(QWidget* parent) - : QMainWindow(parent) -{ - setupUi(this); - - createMenus(); - - connect(&m_NetworkConfigurationManager, SIGNAL(updateCompleted()), this, SLOT(configurationsUpdateCompleted())); - connect(&m_NetworkConfigurationManager, SIGNAL(configurationAdded(QNetworkConfiguration)), - this, SLOT(configurationAdded(QNetworkConfiguration))); - connect(&m_NetworkConfigurationManager, SIGNAL(configurationRemoved(QNetworkConfiguration)), - this, SLOT(configurationRemoved(QNetworkConfiguration))); - connect(&m_NetworkConfigurationManager, SIGNAL(onlineStateChanged(bool)), - this, SLOT(onlineStateChanged(bool))); - connect(&m_NetworkConfigurationManager, SIGNAL(configurationChanged(QNetworkConfiguration)), - this, SLOT(configurationChanged(QNetworkConfiguration))); - showConfigurations(); -} - -void BearerEx::createMenus() -{ - QAction* act1 = new QAction(tr("Show Details"), this); - menuBar()->addAction(act1); - connect(act1, SIGNAL(triggered()), this, SLOT(on_showDetailsButton_clicked())); - - QAction* exitAct = new QAction(tr("Exit"), this); - menuBar()->addAction(exitAct); - connect(exitAct, SIGNAL(triggered()), this, SLOT(close())); -} - -void BearerEx::showConfigurations() -{ - listWidget->clear(); - QListWidgetItem* listItem; - - QNetworkConfiguration defaultConfig = m_NetworkConfigurationManager.defaultConfiguration(); - if (defaultConfig.type() == QNetworkConfiguration::UserChoice) { - listItem = new QListWidgetItem(); - QFont font = listItem->font(); - font.setBold(true); - font.setUnderline(true); - listItem->setFont(font); - listItem->setText(" UserChoice"); - listItem->setData(Qt::UserRole, QVariant::fromValue(defaultConfig)); - listWidget->addItem(listItem); - } - - QList<QNetworkConfiguration> configurations = m_NetworkConfigurationManager.allConfigurations(); - for (int i=0; i<configurations.count(); i++) - { - listItem = new QListWidgetItem(); - QString text; - if (configurations[i].type() == QNetworkConfiguration::InternetAccessPoint) { - text.append("(IAP,"); - } else if (configurations[i].type() == QNetworkConfiguration::ServiceNetwork) { - text.append("(SNAP,"); - } - - if ((configurations[i].state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) { - text.append("Act) "); - } else if ((configurations[i].state() & QNetworkConfiguration::Discovered) == QNetworkConfiguration::Discovered) { - text.append("Disc) "); - } else { - text.append("Def) "); - } - text.append(configurations[i].name()); - - if (defaultConfig.isValid() && defaultConfig == configurations[i]) { - QFont font = listItem->font(); - font.setBold(true); - font.setUnderline(true); - listItem->setFont(font); - } - listItem->setText(text); - listItem->setData(Qt::UserRole, QVariant::fromValue(configurations[i])); - listWidget->addItem(listItem); - } -} - -void BearerEx::on_updateConfigurationsButton_clicked() -{ - m_NetworkConfigurationManager.updateConfigurations(); -} - -void BearerEx::on_updateListButton_clicked() -{ - showConfigurations(); -} - -void BearerEx::on_showDetailsButton_clicked() -{ - QListWidgetItem* item = listWidget->currentItem(); - if (!item) { - return; - } - - QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole)); - DetailedInfoDialog infoDialog(&networkConfiguration,this); - infoDialog.exec(); -} - -void BearerEx::on_createSessionButton_clicked() -{ - QListWidgetItem* item = listWidget->currentItem(); - if (!item) { - return; - } - QNetworkConfiguration networkConfiguration = qvariant_cast<QNetworkConfiguration>(item->data(Qt::UserRole)); - int newTabIndex = mainTabWidget->count(); - SessionTab* newTab = new SessionTab(&networkConfiguration,&m_NetworkConfigurationManager,eventListWidget,newTabIndex-1); - QString label = QLatin1Char('S') + QString::number(newTabIndex-1); - mainTabWidget->insertTab(newTabIndex,newTab,label); - mainTabWidget->setCurrentIndex(newTabIndex); -} - -void BearerEx::on_clearEventListButton_clicked() -{ - eventListWidget->clear(); -} - -void BearerEx::configurationAdded(const QNetworkConfiguration& config) -{ - QListWidgetItem* listItem = new QListWidgetItem(); - listItem->setText(QString("Added: ")+config.name()); - eventListWidget->addItem(listItem); -} - -void BearerEx::configurationRemoved(const QNetworkConfiguration& config) -{ - QListWidgetItem* listItem = new QListWidgetItem(); - listItem->setText(QString("Removed: ")+config.name()); - eventListWidget->addItem(listItem); -} - -void BearerEx::onlineStateChanged(bool isOnline) -{ - QListWidgetItem* listItem = new QListWidgetItem(); - QFont font = listItem->font(); - font.setBold(true); - listItem->setFont(font); - if (isOnline) { - listItem->setText(QString("> Online")); - } else { - listItem->setText(QString("< Offline")); - } - eventListWidget->addItem(listItem); -} - -void BearerEx::configurationChanged(const QNetworkConfiguration & config) -{ - QListWidgetItem* listItem = new QListWidgetItem(); - QString state; - switch (config.state()) - { - case QNetworkConfiguration::Undefined: - state = "Undef : "; - break; - case QNetworkConfiguration::Defined: - state = "Def : "; - break; - case QNetworkConfiguration::Discovered: - state = "Disc : "; - break; - case QNetworkConfiguration::Active: - state = "Act : "; - break; - } - listItem->setText(state+config.name()); - eventListWidget->addItem(listItem); -} - -void BearerEx::configurationsUpdateCompleted() -{ - QMessageBox msgBox; - msgBox.setStandardButtons(QMessageBox::Close); - msgBox.setText("Configurations update completed."); - msgBox.exec(); -} - -DetailedInfoDialog::DetailedInfoDialog(QNetworkConfiguration* apNetworkConfiguration, QWidget * parent) - : QDialog(parent) -{ - setupUi(this); - - tableWidget->setColumnCount(2); - int rowCount = 2; - - if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) { - rowCount = rowCount + apNetworkConfiguration->children().count(); - } - - tableWidget->setRowCount(rowCount); - tableWidget->setColumnWidth(1,250); - tableWidget->setItem(0, 0, new QTableWidgetItem(tr("Name"))); - tableWidget->setItem(0, 1, new QTableWidgetItem(apNetworkConfiguration->name())); - tableWidget->setItem(1, 0, new QTableWidgetItem(tr("Id"))); - tableWidget->setItem(1, 1, new QTableWidgetItem(apNetworkConfiguration->identifier())); - if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) { - for (int i=0; i<apNetworkConfiguration->children().count(); i++) { - tableWidget->setItem(i+2, 0, new QTableWidgetItem(QString("IAP")+QString::number(i+1))); - tableWidget->setItem(i+2, 1, new QTableWidgetItem(apNetworkConfiguration->children()[i].name())); - } - } - - tableWidget->setFocusPolicy(Qt::NoFocus); -} - -SessionTab::SessionTab(QNetworkConfiguration* apNetworkConfiguration, - QNetworkConfigurationManager* configManager, - QListWidget* eventListWidget, - int index, - BearerEx * parent) - : QWidget(parent), m_dataTransferer(0), m_eventListWidget(eventListWidget), - m_index(index), m_alrEnabled (false) -{ - setupUi(this); - - m_ConfigManager = configManager; - m_NetworkSession = new QNetworkSession(*apNetworkConfiguration); - - // Update initial Session state to UI - newState(m_NetworkSession->state()); - - connect(m_NetworkSession, SIGNAL(newConfigurationActivated()), this, SLOT(newConfigurationActivated())); - connect(m_NetworkSession, SIGNAL(stateChanged(QNetworkSession::State)), - this, SLOT(stateChanged(QNetworkSession::State))); - connect(m_NetworkSession, SIGNAL(opened()), this, SLOT(opened())); - connect(m_NetworkSession, SIGNAL(closed()), this, SLOT(closed())); - connect(m_NetworkSession, SIGNAL(error(QNetworkSession::SessionError)), this, SLOT(error(QNetworkSession::SessionError))); - - if (apNetworkConfiguration->type() == QNetworkConfiguration::InternetAccessPoint) { - snapLabel->hide(); - snapLineEdit->hide(); - alrButton->hide(); - iapLineEdit->setText(apNetworkConfiguration->name()+ " (" + apNetworkConfiguration->identifier() - + QLatin1Char(')')); - } else if (apNetworkConfiguration->type() == QNetworkConfiguration::ServiceNetwork) { - snapLineEdit->setText(apNetworkConfiguration->name()+ " (" + apNetworkConfiguration->identifier() - + QLatin1Char(')')); - } - bearerLineEdit->setText(apNetworkConfiguration->bearerTypeName()); - sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+ - QString(" / ")+ - QString::number(m_NetworkSession->bytesReceived())); - snapLineEdit->setFocusPolicy(Qt::NoFocus); - iapLineEdit->setFocusPolicy(Qt::NoFocus); - bearerLineEdit->setFocusPolicy(Qt::NoFocus); - sentRecDataLineEdit->setFocusPolicy(Qt::NoFocus); - stateLineEdit->setFocusPolicy(Qt::NoFocus); -} - -SessionTab::~SessionTab() -{ - delete m_NetworkSession; m_NetworkSession = 0; - delete m_dataTransferer; m_dataTransferer = 0; -} - -void SessionTab::on_createQNetworkAccessManagerButton_clicked() -{ - if (m_dataTransferer) { - disconnect(m_dataTransferer, 0, 0, 0); - delete m_dataTransferer; - m_dataTransferer = 0; - } - // Create new object according to current selection - QString type(comboBox->currentText()); - if (type == "QNAM") { - m_dataTransferer = new DataTransfererQNam(this); - } else if (type == "QTcpSocket") { - m_dataTransferer = new DataTransfererQTcp(this); - } else { - qDebug("BearerEx Warning, unknown data transfer object requested, not creating anything."); - return; - } - createQNetworkAccessManagerButton->setText("Recreate"); - connect(m_dataTransferer, SIGNAL(finished(quint32,qint64,QString)), this, SLOT(finished(quint32,qint64,QString))); -} - -void SessionTab::on_sendRequestButton_clicked() -{ - if (m_dataTransferer) { - if (!m_dataTransferer->transferData()) { - QMessageBox msgBox; - msgBox.setStandardButtons(QMessageBox::Close); - msgBox.setText("Data transfer not started. \nVery likely data transfer ongoing."); - msgBox.exec(); - } - } else { - QMessageBox msgBox; - msgBox.setStandardButtons(QMessageBox::Close); - msgBox.setText("Data object not created.\nCreate data object first."); - msgBox.exec(); - } -} - -void SessionTab::on_openSessionButton_clicked() -{ - m_NetworkSession->open(); - if (m_NetworkSession->isOpen()) { - newState(m_NetworkSession->state()); - } -} - -void SessionTab::on_closeSessionButton_clicked() -{ - m_NetworkSession->close(); - if (!m_NetworkSession->isOpen()) { - newState(m_NetworkSession->state()); - } -} - -void SessionTab::on_stopConnectionButton_clicked() -{ - m_NetworkSession->stop(); -} - -void SessionTab::on_alrButton_clicked() -{ - if (!m_alrEnabled) { - connect(m_NetworkSession, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)), - this, SLOT(preferredConfigurationChanged(QNetworkConfiguration,bool))); - alrButton->setText("Disable ALR"); - m_alrEnabled = true; - } else { - disconnect(m_NetworkSession, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)), 0, 0); - alrButton->setText("Enable ALR"); - m_alrEnabled = false; - } -} - -void SessionTab::on_deleteSessionButton_clicked() -{ - setWindowTitle("Bearer Example"); - delete this; -} - -void SessionTab::newConfigurationActivated() -{ - QMessageBox msgBox; - msgBox.setText("New configuration activated."); - msgBox.setInformativeText("Do you want to accept new configuration?"); - msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); - msgBox.setDefaultButton(QMessageBox::Yes); - if (msgBox.exec() == QMessageBox::Yes) { - m_NetworkSession->accept(); - iapLineEdit->setText(m_config.name() + " (" + m_config.identifier() + QLatin1Char(')')); - } else { - m_NetworkSession->reject(); - } -} - -void SessionTab::preferredConfigurationChanged(const QNetworkConfiguration& config, bool /*isSeamless*/) -{ - m_config = config; - QMessageBox msgBox; - msgBox.setText("Roaming to new configuration."); - msgBox.setInformativeText("Do you want to migrate to " + config.name() + QLatin1Char('?')); - msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No); - msgBox.setDefaultButton(QMessageBox::Yes); - if (msgBox.exec() == QMessageBox::Yes) { - m_NetworkSession->migrate(); - } else { - m_NetworkSession->ignore(); - } -} - -void SessionTab::opened() -{ - QListWidgetItem* listItem = new QListWidgetItem(); - QFont font = listItem->font(); - font.setBold(true); - listItem->setFont(font); - listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - Opened")); - m_eventListWidget->addItem(listItem); - - QVariant identifier = m_NetworkSession->sessionProperty("ActiveConfiguration"); - if (!identifier.isNull()) { - QString configId = identifier.toString(); - QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId); - if (config.isValid()) { - iapLineEdit->setText(config.name() + " (" + config.identifier() + QLatin1Char(')')); - } - } - newState(m_NetworkSession->state()); // Update the "(open)" - - if (m_NetworkSession->configuration().type() == QNetworkConfiguration::UserChoice) { - QVariant identifier = m_NetworkSession->sessionProperty("UserChoiceConfiguration"); - if (!identifier.isNull()) { - QString configId = identifier.toString(); - QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId); - if (config.isValid() && (config.type() == QNetworkConfiguration::ServiceNetwork)) { - snapLineEdit->setText(config.name()); - } - } - } -} - -void SessionTab::closed() -{ - QListWidgetItem* listItem = new QListWidgetItem(); - QFont font = listItem->font(); - font.setBold(true); - listItem->setFont(font); - listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - Closed")); - m_eventListWidget->addItem(listItem); -} - -QString SessionTab::stateString(QNetworkSession::State state) -{ - QString stateString; - switch (state) - { - case QNetworkSession::Invalid: - stateString = "Invalid"; - break; - case QNetworkSession::NotAvailable: - stateString = "NotAvailable"; - break; - case QNetworkSession::Connecting: - stateString = "Connecting"; - break; - case QNetworkSession::Connected: - stateString = "Connected"; - break; - case QNetworkSession::Closing: - stateString = "Closing"; - break; - case QNetworkSession::Disconnected: - stateString = "Disconnected"; - break; - case QNetworkSession::Roaming: - stateString = "Roaming"; - break; - } - return stateString; -} - -void SessionTab::on_dataObjectChanged(const QString &newObjectType) -{ - qDebug() << "BearerEx SessionTab dataObjectChanged to: " << newObjectType; - if (m_dataTransferer) { - disconnect(m_dataTransferer, 0, 0, 0); - delete m_dataTransferer; m_dataTransferer = 0; - qDebug() << "BearerEx SessionTab, previous data object deleted."; - } - createQNetworkAccessManagerButton->setText("Create"); -} - - -void SessionTab::stateChanged(QNetworkSession::State state) -{ - newState(state); - - QListWidgetItem* listItem = new QListWidgetItem(); - listItem->setText(QLatin1Char('S') + QString::number(m_index) + QLatin1String(" - ") + stateString(state)); - m_eventListWidget->addItem(listItem); -} - -void SessionTab::newState(QNetworkSession::State state) -{ - QVariant identifier = m_NetworkSession->sessionProperty("ActiveConfiguration"); - if (state == QNetworkSession::Connected && !identifier.isNull()) { - QString configId = identifier.toString(); - QNetworkConfiguration config = m_ConfigManager->configurationFromIdentifier(configId); - if (config.isValid()) { - iapLineEdit->setText(config.name() + " (" + config.identifier() + QLatin1Char(')')); - bearerLineEdit->setText(config.bearerTypeName()); - } - } else { - bearerLineEdit->setText(m_NetworkSession->configuration().bearerTypeName()); - } - - QString active; - if (m_NetworkSession->isOpen()) { - active = " (open)"; - } - stateLineEdit->setText(stateString(state)+active); -} - -void SessionTab::error(QNetworkSession::SessionError error) -{ - QListWidgetItem* listItem = new QListWidgetItem(); - QMessageBox msgBox; - msgBox.setStandardButtons(QMessageBox::Close); - - QString errorString; - switch (error) - { - case QNetworkSession::UnknownSessionError: - errorString = "UnknownSessionError"; - break; - case QNetworkSession::SessionAbortedError: - errorString = "SessionAbortedError"; - break; - case QNetworkSession::RoamingError: - errorString = "RoamingError"; - break; - case QNetworkSession::OperationNotSupportedError: - errorString = "OperationNotSupportedError"; - break; - case QNetworkSession::InvalidConfigurationError: - errorString = "InvalidConfigurationError"; - break; - } - listItem->setText(QLatin1Char('S') + QString::number(m_index) + QString(" - ") + errorString); - m_eventListWidget->addItem(listItem); - - msgBox.setText(errorString); - msgBox.exec(); -} - -void SessionTab::finished(quint32 errorCode, qint64 dataReceived, QString errorType) -{ - QMessageBox msgBox; - msgBox.setStandardButtons(QMessageBox::Close); - msgBox.setText(QString("Data transfer completed. \nError code: ") + - QString::number(int(errorCode)) + - "\nError type: " + errorType + - "\nBytes received: " + - QString::number(dataReceived)); - msgBox.exec(); - // Check if the networksession still exists - it may have gone after returning from - // the modal dialog (in the case that app has been closed, and deleting QHttp will - // trigger the done() invocation). - if (m_NetworkSession) { - sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+ - QString(" / ")+ - QString::number(m_NetworkSession->bytesReceived())); - } else { - sentRecDataLineEdit->setText("Data amounts not available."); - } -} - -// End of file - diff --git a/tests/manual/bearerex/bearerex.h b/tests/manual/bearerex/bearerex.h deleted file mode 100644 index 7af033e59f..0000000000 --- a/tests/manual/bearerex/bearerex.h +++ /dev/null @@ -1,134 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef ACCESSPOINTMANAGEREX_H -#define ACCESSPOINTMANAGEREX_H - -#include <QtWidgets> - -#include "ui_detailedinfodialog.h" - -#include "ui_bearerex.h" -#include "ui_sessiondialog.h" -#include "qnetworkconfigmanager.h" -#include "qnetworksession.h" -#include "datatransferer.h" -#include "xqlistwidget.h" - -QT_BEGIN_NAMESPACE -class QNetworkAccessManager; -class QNetworkReply; -QT_END_NAMESPACE - -class SessionTab; -class DataTransferer; - -QT_USE_NAMESPACE - -class BearerEx : public QMainWindow, public Ui::BearerExMainWindow -{ - Q_OBJECT - -public: - BearerEx(QWidget* parent = 0); - void createMenus(); - void showConfigurations(); - -private Q_SLOTS: - void on_updateConfigurationsButton_clicked(); - void on_updateListButton_clicked(); - void on_showDetailsButton_clicked(); - void on_createSessionButton_clicked(); - void on_clearEventListButton_clicked(); - - void configurationsUpdateCompleted(); - void configurationAdded(const QNetworkConfiguration& config); - void configurationRemoved(const QNetworkConfiguration& config); - void onlineStateChanged(bool isOnline); - void configurationChanged(const QNetworkConfiguration & config); - -private: - QNetworkConfigurationManager m_NetworkConfigurationManager; - QAction* m_openAction; -}; - -class DetailedInfoDialog : public QDialog, public Ui::DetailedInfoDialog -{ - Q_OBJECT - -public: - DetailedInfoDialog(QNetworkConfiguration* apNetworkConfiguration = 0, QWidget* parent = 0); -}; - - -class SessionTab : public QWidget, public Ui::SessionTab -{ - Q_OBJECT - -public: - SessionTab(QNetworkConfiguration* apNetworkConfiguration = 0, QNetworkConfigurationManager* configManager = 0, - QListWidget* eventListWidget = 0, int index = 0, BearerEx* parent = 0); - ~SessionTab(); - - QString stateString(QNetworkSession::State state); - -private Q_SLOTS: - void on_createQNetworkAccessManagerButton_clicked(); - void on_sendRequestButton_clicked(); - void on_openSessionButton_clicked(); - void on_closeSessionButton_clicked(); - void on_stopConnectionButton_clicked(); - void on_deleteSessionButton_clicked(); - void on_dataObjectChanged(const QString& newObjectType); - void on_alrButton_clicked(); - void finished(quint32 errorCode, qint64 dataReceived, QString errorType); - - void newConfigurationActivated(); - void preferredConfigurationChanged(const QNetworkConfiguration& config, bool isSeamless); - void stateChanged(QNetworkSession::State state); - void newState(QNetworkSession::State state); - void opened(); - void closed(); - void error(QNetworkSession::SessionError error); - -private: //data - // QNetworkAccessManager* m_networkAccessManager; - DataTransferer* m_dataTransferer; - QNetworkSession* m_NetworkSession; - QNetworkConfigurationManager* m_ConfigManager; - QListWidget* m_eventListWidget; - QNetworkConfiguration m_config; - int m_index; - bool m_dataTransferOngoing; - bool m_alrEnabled; -}; - -#endif // ACCESSPOINTMANAGEREX_H - -// End of file - diff --git a/tests/manual/bearerex/bearerex.pro b/tests/manual/bearerex/bearerex.pro deleted file mode 100644 index e643657660..0000000000 --- a/tests/manual/bearerex/bearerex.pro +++ /dev/null @@ -1,21 +0,0 @@ -TEMPLATE = app -TARGET = BearerEx - -QT += core \ - gui \ - widgets \ - network - -FORMS += detailedinfodialog.ui \ - sessiondialog.ui \ - bearerex.ui - -# Example headers and sources -HEADERS += bearerex.h \ - xqlistwidget.h \ - datatransferer.h - -SOURCES += bearerex.cpp \ - main.cpp \ - xqlistwidget.cpp \ - datatransferer.cpp diff --git a/tests/manual/bearerex/bearerex.ui b/tests/manual/bearerex/bearerex.ui deleted file mode 100644 index e5ab62f5b3..0000000000 --- a/tests/manual/bearerex/bearerex.ui +++ /dev/null @@ -1,95 +0,0 @@ -<ui version="4.0" > - <class>BearerExMainWindow</class> - <widget class="QMainWindow" name="BearerExMainWindow" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>360</width> - <height>640</height> - </rect> - </property> - <property name="windowTitle" > - <string>Bearer Example</string> - </property> - <widget class="QWidget" name="centralwidget" > - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QTabWidget" name="mainTabWidget" > - <widget class="QWidget" name="tab" > - <attribute name="title" > - <string>Main</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_2" > - <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>Network Configurations</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="listWidget" /> - </item> - <item> - <layout class="QGridLayout" name="gridLayout" > - <item row="0" column="0" > - <widget class="QPushButton" name="updateConfigurationsButton" > - <property name="text" > - <string>Update Configs</string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QPushButton" name="updateListButton" > - <property name="text" > - <string>Update List</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QPushButton" name="createSessionButton" > - <property name="text" > - <string>Create Session</string> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QPushButton" name="showDetailsButton" > - <property name="text" > - <string>Show Details</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2" > - <attribute name="title" > - <string>Events</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3" > - <item> - <widget class="QListWidget" name="eventListWidget" /> - </item> - <item> - <widget class="QPushButton" name="clearEventListButton" > - <property name="text" > - <string>Clear</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - </widget> - <resources/> - <connections/> -</ui> diff --git a/tests/manual/bearerex/bearerex_maemo.ui b/tests/manual/bearerex/bearerex_maemo.ui deleted file mode 100644 index cb17e3807c..0000000000 --- a/tests/manual/bearerex/bearerex_maemo.ui +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>BearerExMainWindow</class> - <widget class="QMainWindow" name="BearerExMainWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>360</width> - <height>640</height> - </rect> - </property> - <property name="windowTitle"> - <string>Bearer Example</string> - </property> - <widget class="QWidget" name="centralwidget"> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QTabWidget" name="mainTabWidget"> - <widget class="QWidget" name="tab"> - <attribute name="title"> - <string>Main</string> - </attribute> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Network Configurations</string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - <item> - <widget class="QListWidget" name="listWidget"/> - </item> - </layout> - </item> - <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QPushButton" name="updateConfigurationsButton"> - <property name="text"> - <string>Update Configs</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="updateListButton"> - <property name="text"> - <string>Update List</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QPushButton" name="createSessionButton"> - <property name="text"> - <string>Create Session</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QPushButton" name="showDetailsButton"> - <property name="text"> - <string>Show Details</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <widget class="QWidget" name="tab_2"> - <attribute name="title"> - <string>Events</string> - </attribute> - <layout class="QVBoxLayout" name="verticalLayout_3"> - <item> - <widget class="QListWidget" name="eventListWidget"/> - </item> - <item> - <widget class="QPushButton" name="clearEventListButton"> - <property name="text"> - <string>Clear</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - </item> - </layout> - </widget> - </widget> - <resources/> - <connections/> -</ui> diff --git a/tests/manual/bearerex/datatransferer.cpp b/tests/manual/bearerex/datatransferer.cpp deleted file mode 100644 index b4409ce52c..0000000000 --- a/tests/manual/bearerex/datatransferer.cpp +++ /dev/null @@ -1,166 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QDebug> -#include <QUrl> -#include <QByteArray> -#include <QDataStream> -#include "datatransferer.h" - -DataTransferer::DataTransferer(QObject *parent) : - QObject(parent), m_dataTransferOngoing(false) -{ -} - -bool DataTransferer::dataTransferOngoing() -{ - return m_dataTransferOngoing; -} - - - -// -------- Based on QTcp - -DataTransfererQTcp::DataTransfererQTcp(QObject* parent) -: DataTransferer(parent) -{ - qDebug("BearerEx DataTransferer QTcp created."); - - connect(&m_qsocket, SIGNAL(readyRead()), this, SLOT(readyRead())); - connect(&m_qsocket, SIGNAL(connected()), this, SLOT(connected())); - connect(&m_qsocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)), - this, SLOT(error(QAbstractSocket::SocketError))); -} - -DataTransfererQTcp::~DataTransfererQTcp() -{ - qDebug("BearerEx DataTransferer QTcp destroyed."); - m_qsocket.abort(); -} - -bool DataTransfererQTcp::transferData() -{ - if (m_dataTransferOngoing) { - return false; - } - qDebug("BearerEx datatransfer for QTcp requested."); - // Connect to host - QUrl url("http://www.google.com.au"); - m_qsocket.connectToHost(url.host(), url.port(80)); - - // m_qsocket.connectToHost("http://www.google.com", 80); - // Wait for connected() signal. - m_dataTransferOngoing = true; - return true; -} - -void DataTransfererQTcp::connected() -{ - qDebug("BearerEx DataTransfererQtcp connected, requesting data."); - // Establish HTTP request - //QByteArray request("GET / HTTP/1.1 \nHost: www.google.com\n\n"); - QByteArray request("GET / HTTP/1.1\n\n"); - - // QByteArray request("GET /index.html HTTP/1.1 \n Host: www.google.com \n\n"); - qint64 dataWritten = m_qsocket.write(request); - m_qsocket.flush(); - - qDebug() << "BearerEx DataTransferQTcp wrote " << dataWritten << " bytes"; - // Start waiting for readyRead() of error() -} - -void DataTransfererQTcp::readyRead() -{ - qDebug() << "BearerEx DataTransfererQTcp readyRead() with "; - qint64 bytesAvailable = m_qsocket.bytesAvailable(); - qDebug() << bytesAvailable << " bytes available."; - - // QDataStream in(&m_qsocket); - QByteArray array = m_qsocket.readAll(); - QString data = QString::fromLatin1(array); - - // in >> data; - - qDebug() << "BearerEx DataTransferQTcp data received: " << data; - m_dataTransferOngoing = false; - // m_qsocket.error() returns uninitialized value in case no error has occurred, - // so emit '0' - emit finished(0, bytesAvailable, "QAbstractSocket::SocketError"); -} - -void DataTransfererQTcp::error(QAbstractSocket::SocketError socketError) -{ - qDebug("BearerEx DataTransfererQTcp error(), aborting socket."); - m_qsocket.abort(); - m_dataTransferOngoing = false; - emit finished(socketError, 0, "QAbstractSocket::SocketError"); -} - -// -------- Based on QNetworkAccessManager - -DataTransfererQNam::DataTransfererQNam(QObject* parent) -: DataTransferer(parent) -{ - connect(&m_qnam, SIGNAL(finished(QNetworkReply*)), - this, SLOT(replyFinished(QNetworkReply*))); - qDebug("BearerEx DataTransferer QNam created."); -} - -DataTransfererQNam::~DataTransfererQNam() -{ - qDebug("BearerEx DataTransferer QNam destroyed."); -} - -bool DataTransfererQNam::transferData() -{ - qDebug("BearerEx datatransfer for QNam requested."); - if (m_dataTransferOngoing) { - return false; - } - m_qnam.get(QNetworkRequest(QUrl("http://www.google.com"))); - m_dataTransferOngoing = true; - return true; -} - -void DataTransfererQNam::replyFinished(QNetworkReply *reply) -{ - qDebug("BearerEx DatatransfererQNam reply was finished (error code is type QNetworkReply::NetworkError)."); - qint64 dataReceived = 0; - quint32 errorCode = (quint32)reply->error(); - - if (reply->error() == QNetworkReply::NoError) { - QString result(reply->readAll()); - dataReceived = result.length(); - } - m_dataTransferOngoing = false; - emit finished(errorCode, dataReceived, "QNetworkReply::NetworkError"); - reply->deleteLater(); -} - - - diff --git a/tests/manual/bearerex/datatransferer.h b/tests/manual/bearerex/datatransferer.h deleted file mode 100644 index 645ad17c3a..0000000000 --- a/tests/manual/bearerex/datatransferer.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef DATATRANSFERER_H -#define DATATRANSFERER_H - -#include <QObject> -#include <QString> -#include <QNetworkReply> -#include <QNetworkAccessManager> -#include <QTcpSocket> -#include <QDebug> - -// Interface-class for data transferring object - -class DataTransferer : public QObject -{ - Q_OBJECT -public: - explicit DataTransferer(QObject *parent = 0); - virtual ~DataTransferer() { - if (m_dataTransferOngoing) { - qDebug("BearerEx Warning: dataobjects transfer was ongoing when destroyed."); - } - } - virtual bool transferData() = 0; - bool dataTransferOngoing(); - -signals: - void finished(quint32 errorCode, qint64 dataReceived, QString errorType); - -public slots: - -protected: - bool m_dataTransferOngoing; -}; - - -// Specializations/concrete classes - -class DataTransfererQTcp : public DataTransferer -{ - Q_OBJECT -public: - DataTransfererQTcp(QObject* parent = 0); - ~DataTransfererQTcp(); - - virtual bool transferData(); - -public slots: - void readyRead(); - void error(QAbstractSocket::SocketError socketError); - void connected(); - -private: - QTcpSocket m_qsocket; -}; - -class DataTransfererQNam : public DataTransferer -{ - Q_OBJECT -public: - DataTransfererQNam(QObject* parent = 0); - ~DataTransfererQNam(); - - virtual bool transferData(); - -public slots: - void replyFinished(QNetworkReply* reply); - -private: - QNetworkAccessManager m_qnam; -}; - -#endif // DATATRANSFERER_H diff --git a/tests/manual/bearerex/detailedinfodialog.ui b/tests/manual/bearerex/detailedinfodialog.ui deleted file mode 100644 index c4a21faf39..0000000000 --- a/tests/manual/bearerex/detailedinfodialog.ui +++ /dev/null @@ -1,54 +0,0 @@ -<ui version="4.0" > - <class>DetailedInfoDialog</class> - <widget class="QDialog" name="DetailedInfoDialog" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>308</width> - <height>396</height> - </rect> - </property> - <property name="windowTitle" > - <string>Bearer Example</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QLabel" name="label" > - <property name="text" > - <string>Detailed information</string> - </property> - </widget> - </item> - <item> - <widget class="QTableWidget" name="tableWidget" /> - </item> - <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="standardButtons" > - <set>QDialogButtonBox::Ok</set> - </property> - </widget> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>DetailedInfoDialog</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel" > - <x>205</x> - <y>371</y> - </hint> - <hint type="destinationlabel" > - <x>223</x> - <y>8</y> - </hint> - </hints> - </connection> - </connections> -</ui> diff --git a/tests/manual/bearerex/main.cpp b/tests/manual/bearerex/main.cpp deleted file mode 100644 index 47b074ebb4..0000000000 --- a/tests/manual/bearerex/main.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QApplication> - -#include "bearerex.h" - -int main(int argc, char* argv[]) -{ - QApplication app(argc, argv); - BearerEx bearerEx; - bearerEx.show(); - return app.exec(); -} - -// End of file - diff --git a/tests/manual/bearerex/sessiondialog.ui b/tests/manual/bearerex/sessiondialog.ui deleted file mode 100644 index c50af70f16..0000000000 --- a/tests/manual/bearerex/sessiondialog.ui +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>SessionTab</class> - <widget class="QWidget" name="SessionTab"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>192</width> - <height>262</height> - </rect> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QFormLayout" name="formLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="snapLabel"> - <property name="text"> - <string>SNAP</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="snapLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="iapLabel"> - <property name="text"> - <string>IAP</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="iapLineEdit"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="bearerLabel"> - <property name="text"> - <string>Bearer</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="bearerLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="sentRecDataLabel"> - <property name="text"> - <string>Sent/Rec.</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="sentRecDataLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="stateLabel"> - <property name="text"> - <string>State</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLineEdit" name="stateLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QPushButton" name="openSessionButton"> - <property name="text"> - <string>Open Session</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="closeSessionButton"> - <property name="text"> - <string>Close Session</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="stopConnectionButton"> - <property name="text"> - <string>Stop Conn.</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="alrButton"> - <property name="text"> - <string>Enable ALR</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QPushButton" name="sendRequestButton"> - <property name="text"> - <string>Send Test Req.</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="createQNetworkAccessManagerButton"> - <property name="text"> - <string>Create</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QComboBox" name="comboBox"> - <item> - <property name="text"> - <string>QNAM</string> - </property> - </item> - <item> - <property name="text"> - <string>QTcpSocket</string> - </property> - </item> - <item> - <property name="text"> - <string>QHttp</string> - </property> - </item> - </widget> - </item> - <item row="3" column="1"> - <widget class="QPushButton" name="deleteSessionButton"> - <property name="text"> - <string>Delete Session</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections> - <connection> - <sender>comboBox</sender> - <signal>currentIndexChanged(QString)</signal> - <receiver>SessionTab</receiver> - <slot>on_dataObjectChanged(QString)</slot> - <hints> - <hint type="sourcelabel"> - <x>40</x> - <y>211</y> - </hint> - <hint type="destinationlabel"> - <x>10</x> - <y>258</y> - </hint> - </hints> - </connection> - </connections> - <slots> - <slot>on_dataObjectChanged(QString)</slot> - </slots> -</ui> diff --git a/tests/manual/bearerex/sessiondialog_maemo.ui b/tests/manual/bearerex/sessiondialog_maemo.ui deleted file mode 100644 index 5eb98ce3d3..0000000000 --- a/tests/manual/bearerex/sessiondialog_maemo.ui +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>SessionTab</class> - <widget class="QWidget" name="SessionTab"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>423</width> - <height>214</height> - </rect> - </property> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <layout class="QFormLayout" name="formLayout"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::ExpandingFieldsGrow</enum> - </property> - <item row="0" column="0"> - <widget class="QLabel" name="snapLabel"> - <property name="text"> - <string>SNAP</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLineEdit" name="snapLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="iapLabel"> - <property name="text"> - <string>IAP</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QLineEdit" name="iapLineEdit"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="bearerLabel"> - <property name="text"> - <string>Bearer</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLineEdit" name="bearerLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="sentRecDataLabel"> - <property name="text"> - <string>Sent/Rec.</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLineEdit" name="sentRecDataLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="stateLabel"> - <property name="text"> - <string>State</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLineEdit" name="stateLineEdit"> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </item> - <item> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QPushButton" name="openSessionButton"> - <property name="text"> - <string>Open Session</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QPushButton" name="closeSessionButton"> - <property name="text"> - <string>Close Session</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="stopConnectionButton"> - <property name="text"> - <string>Stop Conn.</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="sendRequestButton"> - <property name="text"> - <string>Send Test Req.</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QPushButton" name="createQHttpButton"> - <property name="text"> - <string>Create QHttp</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QPushButton" name="deleteSessionButton"> - <property name="text"> - <string>Delete Session</string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QPushButton" name="alrButton"> - <property name="text"> - <string>Enable ALR</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> - </widget> - <resources/> - <connections/> -</ui> diff --git a/tests/manual/bearerex/xqlistwidget.cpp b/tests/manual/bearerex/xqlistwidget.cpp deleted file mode 100644 index 33206d0102..0000000000 --- a/tests/manual/bearerex/xqlistwidget.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "xqlistwidget.h" - -XQListWidget::XQListWidget(QWidget* parent) : QListWidget(parent) -{ -} - -void XQListWidget::keyPressEvent(QKeyEvent* event) -{ - switch (event->key()) - { - case Qt::Key_Left: - { - focusPreviousChild(); - break; - } - case Qt::Key_Right: - { - focusNextChild(); - break; - } - default: - { - QListWidget::keyPressEvent(event); - } - } -} diff --git a/tests/manual/bearerex/xqlistwidget.h b/tests/manual/bearerex/xqlistwidget.h deleted file mode 100644 index a05c266e1b..0000000000 --- a/tests/manual/bearerex/xqlistwidget.h +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef XQLISTWIDGET_H -#define XQLISTWIDGET_H - -#include <QListWidget> -#include <QKeyEvent> - -class XQListWidget: public QListWidget -{ -public: - XQListWidget(QWidget* parent = 0); - -protected: - void keyPressEvent(QKeyEvent* event); -}; - -#endif // XQLISTWIDGET_H - - diff --git a/tests/manual/cocoa/appicon/CMakeLists.txt b/tests/manual/cocoa/appicon/CMakeLists.txt new file mode 100644 index 0000000000..5cb97d7c6a --- /dev/null +++ b/tests/manual/cocoa/appicon/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from appicon.pro. + +##################################################################### +## appicon Binary: +##################################################################### + +add_qt_manual_test(appicon + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:appicon.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/menurama/CMakeLists.txt b/tests/manual/cocoa/menurama/CMakeLists.txt new file mode 100644 index 0000000000..1c39a59fc3 --- /dev/null +++ b/tests/manual/cocoa/menurama/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from menurama.pro. + +##################################################################### +## Menurama Binary: +##################################################################### + +add_qt_manual_test(Menurama + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + menuramaapplication.cpp menuramaapplication.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:menurama.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/menurama/main.cpp b/tests/manual/cocoa/menurama/main.cpp index e39c01ea4d..4da4511884 100644 --- a/tests/manual/cocoa/menurama/main.cpp +++ b/tests/manual/cocoa/menurama/main.cpp @@ -29,7 +29,7 @@ #include "mainwindow.h" #include "menuramaapplication.h" -#include <QtWidgets/QAction> +#include <QtGui/QAction> #include <QtWidgets/QMenu> int main(int argc, char *argv[]) diff --git a/tests/manual/cocoa/menurama/menurama.pro b/tests/manual/cocoa/menurama/menurama.pro index da6f224e0d..f0928be31d 100644 --- a/tests/manual/cocoa/menurama/menurama.pro +++ b/tests/manual/cocoa/menurama/menurama.pro @@ -4,9 +4,7 @@ # #------------------------------------------------- -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = Menurama TEMPLATE = app diff --git a/tests/manual/cocoa/menus/CMakeLists.txt b/tests/manual/cocoa/menus/CMakeLists.txt new file mode 100644 index 0000000000..a3fa70ba5d --- /dev/null +++ b/tests/manual/cocoa/menus/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from menus.pro. + +##################################################################### +## menus Binary: +##################################################################### + +add_qt_manual_test(menus + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:menus.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/nativewidgets/CMakeLists.txt b/tests/manual/cocoa/nativewidgets/CMakeLists.txt new file mode 100644 index 0000000000..cab2da5421 --- /dev/null +++ b/tests/manual/cocoa/nativewidgets/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from nativewigets.pro. + +##################################################################### +## nativewigets Binary: +##################################################################### + +add_qt_manual_test(nativewigets + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:nativewigets.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/popups/CMakeLists.txt b/tests/manual/cocoa/popups/CMakeLists.txt new file mode 100644 index 0000000000..53468edc7c --- /dev/null +++ b/tests/manual/cocoa/popups/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from popups.pro. + +##################################################################### +## popups Binary: +##################################################################### + +add_qt_manual_test(popups + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt new file mode 100644 index 0000000000..95317c520e --- /dev/null +++ b/tests/manual/cocoa/qmaccocoaviewcontainer/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qmaccocoaviewcontainer.pro. + +##################################################################### +## qmaccocoaviewcontainer Binary: +##################################################################### + +add_qt_manual_test(qmaccocoaviewcontainer + GUI + SOURCES + TestMouseMovedNSView.h TestMouseMovedNSView.m + main.mm + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + ${FWAppKit} + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qmaccocoaviewcontainer.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt new file mode 100644 index 0000000000..73c3157b89 --- /dev/null +++ b/tests/manual/cocoa/qsystemtrayicon/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from qsystemtrayicon.pro. + +##################################################################### +## qsystemtrayicon Binary: +##################################################################### + +add_qt_manual_test(qsystemtrayicon + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +# Resources: +set(icons_resource_files + "macsystray16x16.png" + "macsystray18x18.png" + "macsystray25x15.png" + "macsystray32x32.png" + "macsystray36x36.png" + "macsystray50x30.png" + "macsystray64x64.png" +) + +add_qt_resource(qsystemtrayicon "icons" + PREFIX + "/" + FILES + ${icons_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qsystemtrayicon.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt new file mode 100644 index 0000000000..066eefa313 --- /dev/null +++ b/tests/manual/cocoa/qt_on_cocoa/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qt_on_cocoa.pro. + +##################################################################### +## qt_on_cocoa Binary: +##################################################################### + +add_qt_manual_test(qt_on_cocoa + GUI + SOURCES + main.mm + rasterwindow.cpp rasterwindow.h + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + ${FWAppKit} + Qt::Gui + Qt::Quick + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qt_on_cocoa.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt new file mode 100644 index 0000000000..305036fa78 --- /dev/null +++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from wheelevent.pro. + +##################################################################### +## wheelevent Binary: +##################################################################### + +add_qt_manual_test(wheelevent + GUI + SOURCES + main.cpp + window.cpp window.h + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:wheelevent.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/corelib/tools/qhash/main.cpp b/tests/manual/corelib/tools/qhash/main.cpp index b2c40f2183..298d1777ea 100644 --- a/tests/manual/corelib/tools/qhash/main.cpp +++ b/tests/manual/corelib/tools/qhash/main.cpp @@ -27,7 +27,6 @@ ****************************************************************************/ #include <QDebug> -//#define QT_STRICT_ITERATORS #include <QHash> void testEraseNoError() diff --git a/tests/manual/corelib/tools/qlist/main.cpp b/tests/manual/corelib/tools/qlist/main.cpp index 3f8ade5778..0b54105f5e 100644 --- a/tests/manual/corelib/tools/qlist/main.cpp +++ b/tests/manual/corelib/tools/qlist/main.cpp @@ -26,7 +26,6 @@ ** ****************************************************************************/ #include <QDebug> -//#define QT_STRICT_ITERATORS #include <QVector> void testErase() { @@ -55,4 +54,4 @@ int main() // testErase(); testInsert(); return 0; -}
\ No newline at end of file +} diff --git a/tests/manual/corelib/tools/qset/main.cpp b/tests/manual/corelib/tools/qset/main.cpp index 1066e53e7d..701c8889db 100644 --- a/tests/manual/corelib/tools/qset/main.cpp +++ b/tests/manual/corelib/tools/qset/main.cpp @@ -27,7 +27,6 @@ ****************************************************************************/ #include <QDebug> -//#define QT_STRICT_ITERATORS #include <QSet> void testErase() diff --git a/tests/manual/corelib/tools/qvarlengtharray/main.cpp b/tests/manual/corelib/tools/qvarlengtharray/main.cpp index 8580d97a36..0544bb0c4b 100644 --- a/tests/manual/corelib/tools/qvarlengtharray/main.cpp +++ b/tests/manual/corelib/tools/qvarlengtharray/main.cpp @@ -27,7 +27,6 @@ ****************************************************************************/ #include <QDebug> -//#define QT_STRICT_ITERATORS #include <QVarLengthArray> void testErase() diff --git a/tests/manual/corelib/tools/qvector/main.cpp b/tests/manual/corelib/tools/qvector/main.cpp index e3dc89b149..1b35123f15 100644 --- a/tests/manual/corelib/tools/qvector/main.cpp +++ b/tests/manual/corelib/tools/qvector/main.cpp @@ -27,7 +27,6 @@ ****************************************************************************/ #include <QDebug> -//#define QT_STRICT_ITERATORS #include <QVector> void testErase() diff --git a/tests/manual/diaglib/debugproxystyle.cpp b/tests/manual/diaglib/debugproxystyle.cpp index 73e9e7ce54..dc95241473 100644 --- a/tests/manual/diaglib/debugproxystyle.cpp +++ b/tests/manual/diaglib/debugproxystyle.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -68,8 +68,8 @@ QDebug operator<<(QDebug debug, const QStyleOption *option) } else { debug << "QStyleOption("; } - debug << "rect=" << option->rect.width() << 'x' << option->rect.height() - << Qt::forcesign << option->rect.x() << option->rect.y() << Qt::noforcesign; + debug << "rect=" << option->rect.width() << 'x' << option->rect.height() << Qt::forcesign + << option->rect.x() << option->rect.y() << Qt::noforcesign; if (option->state != QStyle::State_None) debug << ", state=" << option->state; #if QT_VERSION >= 0x050000 diff --git a/tests/manual/diaglib/diaglib.pri b/tests/manual/diaglib/diaglib.pri index b57ee75841..dd5bfa5330 100644 --- a/tests/manual/diaglib/diaglib.pri +++ b/tests/manual/diaglib/diaglib.pri @@ -17,20 +17,8 @@ win32:!winrt: { SOURCES += $$PWD/nativewindowdump.cpp } -greaterThan(QT_MAJOR_VERSION, 4) { - QT += gui-private core-private - contains(QT, widgets) { - HEADERS += \ - $$PWD/qwidgetdump.h \ - $$PWD/debugproxystyle.h \ - $$PWD/logwidget.h - - SOURCES += \ - $$PWD/qwidgetdump.cpp \ - $$PWD/debugproxystyle.cpp \ - $$PWD/logwidget.cpp - } -} else { +QT += gui-private core-private +contains(QT, widgets) { HEADERS += \ $$PWD/qwidgetdump.h \ $$PWD/debugproxystyle.h \ @@ -40,14 +28,17 @@ greaterThan(QT_MAJOR_VERSION, 4) { $$PWD/qwidgetdump.cpp \ $$PWD/debugproxystyle.cpp \ $$PWD/logwidget.cpp + QT += widgets-private } contains(QT, opengl) { -HEADERS += \ - $$PWD/glinfo.h + HEADERS += \ + $$PWD/glinfo.h -SOURCES += \ - $$PWD/glinfo.cpp + SOURCES += \ + $$PWD/glinfo.cpp + + QT += opengl openglwidgets } DEFINES += QT_DIAG_LIB diff --git a/tests/manual/diaglib/glinfo.cpp b/tests/manual/diaglib/glinfo.cpp index a955dd80ac..d8aec5298a 100644 --- a/tests/manual/diaglib/glinfo.cpp +++ b/tests/manual/diaglib/glinfo.cpp @@ -28,12 +28,11 @@ #include "glinfo.h" -#include <QtOpenGL/QGLFunctions> -#include <QtOpenGL/QGLWidget> +#include <QOpenGLFunctions> +#include <QtOpenGLWidgets/QOpenGLWidget> #if QT_VERSION > 0x050000 # if QT_VERSION >= 0x050400 -# include <QtWidgets/QOpenGLWidget> -# include <QtGui/QOpenGLWindow> +# include <QtOpenGL/QOpenGLWindow> # else // 5.4 # include <QtGui/QWindow> # endif // 5.0..5.4 @@ -63,11 +62,6 @@ static QString glInfo(const QOpenGLContext *ctx) + getGlString(ctx, GL_RENDERER); } -static QString glInfo(const QGLContext *ctx) -{ - return glInfo(ctx->contextHandle()); -} - QString glInfo(const QObject *o) { # if QT_VERSION >= 0x050400 @@ -76,11 +70,8 @@ QString glInfo(const QObject *o) return glInfo(oglw->context()); return QString(); } -# endif // 5.4 + if (o->isWidgetType()) { - if (const QGLWidget *g = qobject_cast<const QGLWidget *>(o)) - return glInfo(g->context()); -# if QT_VERSION >= 0x050400 if (const QOpenGLWidget *g = qobject_cast<const QOpenGLWidget *>(o)) return glInfo(g->context()); # endif // 5.4 diff --git a/tests/manual/diaglib/nativewindowdump_win.cpp b/tests/manual/diaglib/nativewindowdump_win.cpp index 256142462f..d99a3a3d38 100644 --- a/tests/manual/diaglib/nativewindowdump_win.cpp +++ b/tests/manual/diaglib/nativewindowdump_win.cpp @@ -41,6 +41,8 @@ # define WS_EX_NOREDIRECTIONBITMAP 0x00200000L #endif +using namespace Qt; + namespace QtDiag { struct DumpContext { diff --git a/tests/manual/diaglib/qwidgetdump.cpp b/tests/manual/diaglib/qwidgetdump.cpp index 9e175cd3cf..371f3e2311 100644 --- a/tests/manual/diaglib/qwidgetdump.cpp +++ b/tests/manual/diaglib/qwidgetdump.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -86,14 +86,16 @@ static void dumpWidgetRecursion(QTextStream &str, const QWidget *w, formatWidgetClass(str, w); str << ' ' << (w->isVisible() ? "[visible] " : "[hidden] "); if (const WId nativeWinId = w->internalWinId()) - str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase << "] "; + str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase + << "] "; if (w->isWindow()) str << "[top] "; str << (w->testAttribute(Qt::WA_Mapped) ? "[mapped] " : "[not mapped] "); if (w->testAttribute(Qt::WA_DontCreateNativeAncestors)) str << "[NoNativeAncestors] "; if (const int states = w->windowState()) - str << "windowState=" << Qt::hex << Qt::showbase << states << Qt::dec << Qt::noshowbase << ' '; + str << "windowState=" << Qt::hex << Qt::showbase << states << Qt::dec << Qt::noshowbase + << ' '; formatRect(str, w->geometry()); if (w->isWindow()) { str << ' ' << w->logicalDpiX() << "DPI"; diff --git a/tests/manual/diaglib/qwindowdump.cpp b/tests/manual/diaglib/qwindowdump.cpp index 83e29fc183..1e46f62b1d 100644 --- a/tests/manual/diaglib/qwindowdump.cpp +++ b/tests/manual/diaglib/qwindowdump.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -61,8 +61,8 @@ void formatObject(QTextStream &str, const QObject *o) void formatRect(QTextStream &str, const QRect &geom) { - str << geom.width() << 'x' << geom.height() - << Qt::forcesign << geom.x() << geom.y() << Qt::noforcesign; + str << geom.width() << 'x' << geom.height() << Qt::forcesign + << geom.x() << geom.y() << Qt::noforcesign; } #define debugType(s, type, typeConstant) \ @@ -123,7 +123,8 @@ void formatWindow(QTextStream &str, const QWindow *w, FormatWindowOptions option formatObject(str, w); str << ' ' << (w->isVisible() ? "[visible] " : "[hidden] "); if (const WId nativeWinId = pw ? pw->winId() : WId(0)) - str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase << "] "; + str << "[native: " << Qt::hex << Qt::showbase << nativeWinId << Qt::dec << Qt::noshowbase + << "] "; if (w->isTopLevel()) str << "[top] "; if (w->isExposed()) diff --git a/tests/manual/diaglib/textdump.cpp b/tests/manual/diaglib/textdump.cpp index 61fb494785..54a251928a 100644 --- a/tests/manual/diaglib/textdump.cpp +++ b/tests/manual/diaglib/textdump.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -408,8 +408,8 @@ struct FormattingContext static void formatCharacter(QTextStream &str, const QChar &qc, FormattingContext &context) { const ushort unicode = qc.unicode(); - str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << Qt::uppercasedigits - << Qt::hex << unicode << Qt::dec << qSetFieldWidth(0) << ' '; + str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << Qt::uppercasedigits << Qt::hex + << unicode << Qt::dec << qSetFieldWidth(0) << ' '; const EnumLookup *specialChar = enumLookup(unicode, specialCharactersEnumLookup, sizeof(specialCharactersEnumLookup) / sizeof(EnumLookup)); if (specialChar) diff --git a/tests/manual/dialogs/CMakeLists.txt b/tests/manual/dialogs/CMakeLists.txt new file mode 100644 index 0000000000..ef000529a5 --- /dev/null +++ b/tests/manual/dialogs/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from dialogs.pro. + +##################################################################### +## dialogs Binary: +##################################################################### + +add_qt_manual_test(dialogs + GUI + SOURCES + colordialogpanel.cpp colordialogpanel.h + filedialogpanel.cpp filedialogpanel.h + fontdialogpanel.cpp fontdialogpanel.h + main.cpp + messageboxpanel.cpp messageboxpanel.h + utils.cpp utils.h + wizardpanel.cpp wizardpanel.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:dialogs.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +extend_target(dialogs CONDITION TARGET Qt::PrintSupport + PUBLIC_LIBRARIES + Qt::PrintSupport +) + +extend_target(dialogs CONDITION NOT (QT_FEATURE_printer EQUAL FALSE) + SOURCES + printdialogpanel.cpp printdialogpanel.h printdialogpanel.ui + ENABLE_AUTOGEN_TOOLS + uic +) diff --git a/tests/manual/dialogs/dialogs.pro b/tests/manual/dialogs/dialogs.pro index d765b8cf05..1beedc251e 100644 --- a/tests/manual/dialogs/dialogs.pro +++ b/tests/manual/dialogs/dialogs.pro @@ -1,9 +1,5 @@ -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets - qtHaveModule(printsupport): QT += printsupport -} +QT += core gui widgets +qtHaveModule(printsupport): QT += printsupport TARGET = dialogs TEMPLATE = app diff --git a/tests/manual/dialogs/messageboxpanel.cpp b/tests/manual/dialogs/messageboxpanel.cpp index 07b387f988..6a305523ea 100644 --- a/tests/manual/dialogs/messageboxpanel.cpp +++ b/tests/manual/dialogs/messageboxpanel.cpp @@ -39,6 +39,8 @@ #include <QLineEdit> #include <QLabel> #include <QCheckBox> +#include <QRegularExpressionValidator> +#include <QRegularExpression> MessageBoxPanel::MessageBoxPanel(QWidget *parent) : QWidget(parent) ,m_iconComboBox(new QComboBox) @@ -80,7 +82,7 @@ MessageBoxPanel::MessageBoxPanel(QWidget *parent) : QWidget(parent) // buttons mask optionsLayout->addWidget(new QLabel(QString::fromLatin1("Message box button mask (in hex)"))); - m_validator = new QRegExpValidator(QRegExp("0[xX]?[0-9a-fA-F]+"), this); + m_validator = new QRegularExpressionValidator(QRegularExpression("0[xX]?[0-9a-fA-F]+"), this); m_buttonsMask->setMaxLength(10); m_buttonsMask->setValidator(m_validator); m_buttonsMask->setText(QString::fromLatin1("0x00300400")); diff --git a/tests/manual/dialogs/printdialogpanel.cpp b/tests/manual/dialogs/printdialogpanel.cpp index b7447e3d64..dcd8b43bf3 100644 --- a/tests/manual/dialogs/printdialogpanel.cpp +++ b/tests/manual/dialogs/printdialogpanel.cpp @@ -190,7 +190,8 @@ QTextStream &operator<<(QTextStream &s, const QSizeF &size) QTextStream &operator<<(QTextStream &s, const QRectF &rect) { - s << rect.width() << 'x' << rect.height() << forcesign << rect.x() << rect.y() << noforcesign; + s << rect.width() << 'x' << rect.height() << Qt::forcesign << rect.x() << rect.y() + << Qt::noforcesign; return s; } diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt new file mode 100644 index 0000000000..c07c8dec5d --- /dev/null +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -0,0 +1,58 @@ +# Generated from embeddedintoforeignwindow.pro. + +##################################################################### +## embeddedintoforeignwindow Binary: +##################################################################### + +add_qt_manual_test(embeddedintoforeignwindow + SOURCES + ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h + ../diaglib/nativewindowdump.h + ../diaglib/qwindowdump.cpp ../diaglib/qwindowdump.h + ../diaglib/textdump.cpp ../diaglib/textdump.h + itemwindow.cpp itemwindow.h + main.cpp + DEFINES + QT_DIAG_LIB + INCLUDE_DIRECTORIES + ../diaglib + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:embeddedintoforeignwindow.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +extend_target(embeddedintoforeignwindow CONDITION WIN32 AND NOT WINRT + SOURCES + ../diaglib/nativewindowdump_win.cpp + PUBLIC_LIBRARIES + user32 +) + +extend_target(embeddedintoforeignwindow CONDITION UNIX OR WINRT + SOURCES + ../diaglib/nativewindowdump.cpp +) + +extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets + SOURCES + ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h + ../diaglib/logwidget.cpp ../diaglib/logwidget.h + ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h + PUBLIC_LIBRARIES + Qt::WidgetsPrivate +) + +extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl + SOURCES + ../diaglib/glinfo.cpp ../diaglib/glinfo.h + PUBLIC_LIBRARIES + Qt::OpenGL + Qt::OpenGLWidgets +) diff --git a/tests/manual/filetest/CMakeLists.txt b/tests/manual/filetest/CMakeLists.txt new file mode 100644 index 0000000000..efefc262ef --- /dev/null +++ b/tests/manual/filetest/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from filetest.pro. + +##################################################################### +## filetest Binary: +##################################################################### + +add_qt_manual_test(filetest + SOURCES + main.cpp +) + +#### Keys ignored in scope 1:.:.:filetest.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt new file mode 100644 index 0000000000..8fa02ca607 --- /dev/null +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -0,0 +1,59 @@ +# Generated from foreignwindows.pro. + +##################################################################### +## foreignwindows Binary: +##################################################################### + +add_qt_manual_test(foreignwindows + SOURCES + ../diaglib/eventfilter.cpp ../diaglib/eventfilter.h + ../diaglib/nativewindowdump.h + ../diaglib/qwindowdump.cpp ../diaglib/qwindowdump.h + ../diaglib/textdump.cpp ../diaglib/textdump.h + main.cpp + DEFINES + QT_DIAG_LIB + INCLUDE_DIRECTORIES + ../diaglib + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::OpenGL + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:foreignwindows.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +extend_target(foreignwindows CONDITION WIN32 AND NOT WINRT + SOURCES + ../diaglib/nativewindowdump_win.cpp + PUBLIC_LIBRARIES + user32 +) + +extend_target(foreignwindows CONDITION UNIX OR WINRT + SOURCES + ../diaglib/nativewindowdump.cpp +) + +extend_target(foreignwindows CONDITION QT_FEATURE_widgets + SOURCES + ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h + ../diaglib/logwidget.cpp ../diaglib/logwidget.h + ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h + PUBLIC_LIBRARIES + Qt::WidgetsPrivate +) + +extend_target(foreignwindows CONDITION QT_FEATURE_opengl + SOURCES + ../diaglib/glinfo.cpp ../diaglib/glinfo.h + PUBLIC_LIBRARIES + Qt::OpenGL + Qt::OpenGLWidgets +) diff --git a/tests/manual/foreignwindows/foreignwindows.pro b/tests/manual/foreignwindows/foreignwindows.pro index 15bf2395f8..b78931bf7a 100644 --- a/tests/manual/foreignwindows/foreignwindows.pro +++ b/tests/manual/foreignwindows/foreignwindows.pro @@ -1,5 +1,5 @@ TEMPLATE = app -QT += widgets +QT += widgets opengl CONFIG += cmdline c++11 SOURCES += main.cpp include(../diaglib/diaglib.pri) diff --git a/tests/manual/foreignwindows/main.cpp b/tests/manual/foreignwindows/main.cpp index 5e882b6d9c..843f4e39ef 100644 --- a/tests/manual/foreignwindows/main.cpp +++ b/tests/manual/foreignwindows/main.cpp @@ -26,7 +26,7 @@ ** ****************************************************************************/ -#include <QtWidgets/QAction> +#include <QtGui/QAction> #include <QtWidgets/QApplication> #include <QtWidgets/QDesktopWidget> #include <QtWidgets/QMainWindow> diff --git a/tests/manual/gestures/CMakeLists.txt b/tests/manual/gestures/CMakeLists.txt new file mode 100644 index 0000000000..7011d3221d --- /dev/null +++ b/tests/manual/gestures/CMakeLists.txt @@ -0,0 +1,4 @@ +# Generated from gestures.pro. + +add_subdirectory(graphicsview) +add_subdirectory(scrollarea) diff --git a/tests/manual/gestures/graphicsview/CMakeLists.txt b/tests/manual/gestures/graphicsview/CMakeLists.txt new file mode 100644 index 0000000000..81dc1931aa --- /dev/null +++ b/tests/manual/gestures/graphicsview/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from graphicsview.pro. + +##################################################################### +## tst_manual_graphicsview Binary: +##################################################################### + +add_qt_manual_test(tst_manual_graphicsview + GUI + SOURCES + gestures.cpp gestures.h + imageitem.cpp imageitem.h + main.cpp + mousepangesturerecognizer.cpp mousepangesturerecognizer.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro index 9ecd0b372f..a20c4b3948 100644 --- a/tests/manual/gestures/graphicsview/graphicsview.pro +++ b/tests/manual/gestures/graphicsview/graphicsview.pro @@ -1,5 +1,7 @@ QT += widgets +TARGET = tst_manual_graphicsview + SOURCES += main.cpp \ imageitem.cpp \ gestures.cpp \ diff --git a/tests/manual/gestures/scrollarea/CMakeLists.txt b/tests/manual/gestures/scrollarea/CMakeLists.txt new file mode 100644 index 0000000000..c521c8e2df --- /dev/null +++ b/tests/manual/gestures/scrollarea/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from scrollarea.pro. + +##################################################################### +## scrollarea Binary: +##################################################################### + +add_qt_manual_test(scrollarea + GUI + SOURCES + main.cpp + mousepangesturerecognizer.cpp mousepangesturerecognizer.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt new file mode 100644 index 0000000000..dee2d1ae43 --- /dev/null +++ b/tests/manual/highdpi/CMakeLists.txt @@ -0,0 +1,40 @@ +# Generated from highdpi.pro. + +##################################################################### +## highdpi Binary: +##################################################################### + +add_qt_manual_test(highdpi + SOURCES + dragwidget.cpp dragwidget.h + main.cpp + DEFINES + HAVE_SCREEN_BASE_DPI + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +# Resources: +set(highdpi_resource_files + "qticon16.png" + "qticon16@2x.png" + "qticon16@3x.png" + "qticon32.png" + "qticon32@2x.png" + "qticon64.png" +) + +add_qt_resource(highdpi "highdpi" + PREFIX + "/" + FILES + ${highdpi_resource_files} +) + + +#### Keys ignored in scope 1:.:.:highdpi.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/highdpi/main.cpp b/tests/manual/highdpi/main.cpp index 0c4b5c88ae..2a9fb6aa0c 100644 --- a/tests/manual/highdpi/main.cpp +++ b/tests/manual/highdpi/main.cpp @@ -75,7 +75,7 @@ static QTextStream &operator<<(QTextStream &str, const QSizeF &s) static QTextStream &operator<<(QTextStream &str, const QRect &r) { - str << r.width() << 'x' << r.height() << forcesign << r.x() << r.y() << noforcesign; + str << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y() << Qt::noforcesign; return str; } diff --git a/tests/manual/inputmethodhints/CMakeLists.txt b/tests/manual/inputmethodhints/CMakeLists.txt new file mode 100644 index 0000000000..1bbf7caef8 --- /dev/null +++ b/tests/manual/inputmethodhints/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from inputmethodhints.pro. + +##################################################################### +## tst_inputmethodhints Binary: +##################################################################### + +add_qt_manual_test(tst_inputmethodhints + GUI + SOURCES + inputmethodhints.cpp inputmethodhints.h inputmethodhints.ui + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:inputmethodhints.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/keypadnavigation/CMakeLists.txt b/tests/manual/keypadnavigation/CMakeLists.txt new file mode 100644 index 0000000000..8f11ad711c --- /dev/null +++ b/tests/manual/keypadnavigation/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from keypadnavigation.pro. + +##################################################################### +## keypadnavigation Binary: +##################################################################### + +add_qt_manual_test(keypadnavigation + GUI + SOURCES + keypadnavigation.ui + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt new file mode 100644 index 0000000000..511f8b150f --- /dev/null +++ b/tests/manual/lance/CMakeLists.txt @@ -0,0 +1,175 @@ +# Generated from lance.pro. + +##################################################################### +## lance Binary: +##################################################################### + +add_qt_manual_test(lance + SOURCES + ../../auto/other/lancelot/paintcommands.cpp ../../auto/other/lancelot/paintcommands.h + interactivewidget.cpp interactivewidget.h + main.cpp + widgets.h + INCLUDE_DIRECTORIES + . + ../../auto/other/lancelot + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::OpenGLWidgets + Qt::PrintSupport + Qt::Widgets +) + +# Resources: +set(icons_resource_files + "enum.png" + "tools.png" +) + +add_qt_resource(lance "icons" + PREFIX + "/icons" + FILES + ${icons_resource_files} +) +set_source_files_properties("../../auto/other/lancelot/images/alpha.png" + PROPERTIES QT_RESOURCE_ALIAS "images/alpha.png" +) +set_source_files_properties("../../auto/other/lancelot/images/alpha2x2.png" + PROPERTIES QT_RESOURCE_ALIAS "images/alpha2x2.png" +) +set_source_files_properties("../../auto/other/lancelot/images/bitmap.png" + PROPERTIES QT_RESOURCE_ALIAS "images/bitmap.png" +) +set_source_files_properties("../../auto/other/lancelot/images/border.png" + PROPERTIES QT_RESOURCE_ALIAS "images/border.png" +) +set_source_files_properties("../../auto/other/lancelot/images/borderimage.png" + PROPERTIES QT_RESOURCE_ALIAS "images/borderimage.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_argb32.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_argb32.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_indexed.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_indexed_mask.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_indexed_mask.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_mono.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_mono_128.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_128.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_mono_palette.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_mono_palette.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dome_rgb32.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dome_rgb32.png" +) +set_source_files_properties("../../auto/other/lancelot/images/dot.png" + PROPERTIES QT_RESOURCE_ALIAS "images/dot.png" +) +set_source_files_properties("../../auto/other/lancelot/images/face.png" + PROPERTIES QT_RESOURCE_ALIAS "images/face.png" +) +set_source_files_properties("../../auto/other/lancelot/images/gam030.png" + PROPERTIES QT_RESOURCE_ALIAS "images/gam030.png" +) +set_source_files_properties("../../auto/other/lancelot/images/gam045.png" + PROPERTIES QT_RESOURCE_ALIAS "images/gam045.png" +) +set_source_files_properties("../../auto/other/lancelot/images/gam056.png" + PROPERTIES QT_RESOURCE_ALIAS "images/gam056.png" +) +set_source_files_properties("../../auto/other/lancelot/images/gam100.png" + PROPERTIES QT_RESOURCE_ALIAS "images/gam100.png" +) +set_source_files_properties("../../auto/other/lancelot/images/gam200.png" + PROPERTIES QT_RESOURCE_ALIAS "images/gam200.png" +) +set_source_files_properties("../../auto/other/lancelot/images/image.png" + PROPERTIES QT_RESOURCE_ALIAS "images/image.png" +) +set_source_files_properties("../../auto/other/lancelot/images/mask.png" + PROPERTIES QT_RESOURCE_ALIAS "images/mask.png" +) +set_source_files_properties("../../auto/other/lancelot/images/mask_100.png" + PROPERTIES QT_RESOURCE_ALIAS "images/mask_100.png" +) +set_source_files_properties("../../auto/other/lancelot/images/masked.png" + PROPERTIES QT_RESOURCE_ALIAS "images/masked.png" +) +set_source_files_properties("../../auto/other/lancelot/images/sign.png" + PROPERTIES QT_RESOURCE_ALIAS "images/sign.png" +) +set_source_files_properties("../../auto/other/lancelot/images/solid.png" + PROPERTIES QT_RESOURCE_ALIAS "images/solid.png" +) +set_source_files_properties("../../auto/other/lancelot/images/solid2x2.png" + PROPERTIES QT_RESOURCE_ALIAS "images/solid2x2.png" +) +set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.jpg" + PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.jpg" +) +set_source_files_properties("../../auto/other/lancelot/images/struct-image-01.png" + PROPERTIES QT_RESOURCE_ALIAS "images/struct-image-01.png" +) +set_source_files_properties("../../auto/other/lancelot/images/zebra.png" + PROPERTIES QT_RESOURCE_ALIAS "images/zebra.png" +) +set(images_resource_files + "images/alpha.png" + "images/alpha2x2.png" + "images/bitmap.png" + "images/border.png" + "images/borderimage.png" + "images/dome_argb32.png" + "images/dome_indexed.png" + "images/dome_indexed_mask.png" + "images/dome_mono.png" + "images/dome_mono_128.png" + "images/dome_mono_palette.png" + "images/dome_rgb32.png" + "images/dot.png" + "images/face.png" + "images/gam030.png" + "images/gam045.png" + "images/gam056.png" + "images/gam100.png" + "images/gam200.png" + "images/image.png" + "images/mask.png" + "images/mask_100.png" + "images/masked.png" + "images/sign.png" + "images/solid.png" + "images/solid2x2.png" + "images/struct-image-01.jpg" + "images/struct-image-01.png" + "images/zebra.png" +) + +add_qt_resource(lance "images" + PREFIX + "/" + BASE + "../../auto/other/lancelot" + FILES + ${images_resource_files} +) + + +#### Keys ignored in scope 1:.:.:lance.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +extend_target(lance CONDITION TARGET Qt::OpenGL + PUBLIC_LIBRARIES + Qt::OpenGL +) diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index 78ca2f56e5..4437cb4539 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -2,7 +2,7 @@ LANCELOT_DIR = $$PWD/../../auto/other/lancelot CONFIG += cmdline moc TEMPLATE = app INCLUDEPATH += . $$LANCELOT_DIR -QT += core-private gui-private widgets printsupport +QT += core-private gui-private widgets printsupport openglwidgets HEADERS += widgets.h \ interactivewidget.h \ diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp index c8e79f42f0..662fc35ad6 100644 --- a/tests/manual/lance/main.cpp +++ b/tests/manual/lance/main.cpp @@ -42,8 +42,9 @@ #endif #ifndef QT_NO_OPENGL -#include <qgl.h> -#include <QGLPixelBuffer> +#include <QtOpenGL/QOpenGLFramebufferObjectFormat> +#include <QtOpenGL/QOpenGLPaintDevice> +#include <QtOpenGLWidgets/QOpenGLWidget> #endif // #define DO_QWS_DEBUGGING @@ -89,7 +90,7 @@ static void printHelp() " -imagemono Paints the files to a monochrome image\n" " -imagewidget same as image, but with interacion...\n" #ifndef QT_NO_OPENGL - " -opengl Paints the files to a QGLWidget (Qt4 style) on screen\n" + " -opengl Paints the files to a QOpenGLWidget on screen\n" " -glbuffer Paints the files to a QOpenGLFrameBufferObject (Qt5 style) \n" " -coreglbuffer Paints the files to a Core Profile context QOpenGLFrameBufferObject\n" #endif @@ -233,12 +234,11 @@ int main(int argc, char **argv) bool verboseMode = false; #ifndef QT_NO_OPENGL - QGLFormat f = QGLFormat::defaultFormat(); - f.setSampleBuffers(true); - f.setStencil(true); - f.setAlpha(true); + QSurfaceFormat f = QSurfaceFormat::defaultFormat(); + f.setSamples(1); + f.setStencilBufferSize(8); f.setAlphaBufferSize(8); - QGLFormat::setDefaultFormat(f); + QSurfaceFormat::setDefaultFormat(f); #endif char *arg; @@ -447,14 +447,14 @@ int main(int argc, char **argv) } case OpenGLType: { - OnScreenWidget<QGLWidget> *qGLWidget = new OnScreenWidget<QGLWidget>(files.at(j)); - qGLWidget->setVerboseMode(verboseMode); - qGLWidget->setType(type); - qGLWidget->setCheckersBackground(checkers_background); - qGLWidget->m_commands = content; - qGLWidget->resize(width, height); - qGLWidget->show(); - activeWidget = qGLWidget; + OnScreenWidget<QOpenGLWidget> *qOpenGLWidget = new OnScreenWidget<QOpenGLWidget>(files.at(j)); + qOpenGLWidget->setVerboseMode(verboseMode); + qOpenGLWidget->setType(type); + qOpenGLWidget->setCheckersBackground(checkers_background); + qOpenGLWidget->m_commands = content; + qOpenGLWidget->resize(width, height); + qOpenGLWidget->show(); + activeWidget = qOpenGLWidget; break; } #else diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 42f9878e44..a5a82e30cc 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -1,7 +1,7 @@ TEMPLATE=subdirs QT_FOR_CONFIG += network-private gui-private -SUBDIRS = bearerex \ +SUBDIRS = \ filetest \ embeddedintoforeignwindow \ foreignwindows \ @@ -25,8 +25,6 @@ qlocale \ qmimedatabase \ qnetconmonitor \ qnetworkaccessmanager/qget \ -qnetworkconfigurationmanager \ -qnetworkconfiguration \ qnetworkreply \ qstorageinfo \ qscreen \ @@ -67,8 +65,4 @@ qtConfig(opengl) { win32: SUBDIRS -= network_remote_stresstest network_stresstest -lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \ -qpainfo qscreen socketengine xembed-raster xembed-widgets windowtransparency \ -embeddedintoforeignwindow foreignwindows - qtConfig(vulkan): SUBDIRS += qvulkaninstance diff --git a/tests/manual/markdown/CMakeLists.txt b/tests/manual/markdown/CMakeLists.txt new file mode 100644 index 0000000000..f6e5284eea --- /dev/null +++ b/tests/manual/markdown/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from html2md.pro. + +##################################################################### +## html2md Binary: +##################################################################### + +add_qt_manual_test(html2md + GUI + SOURCES + html2md.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:html2md.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt new file mode 100644 index 0000000000..46db952b46 --- /dev/null +++ b/tests/manual/network_remote_stresstest/CMakeLists.txt @@ -0,0 +1,28 @@ +# Generated from network_remote_stresstest.pro. + +##################################################################### +## tst_network_remote_stresstest Binary: +##################################################################### + +add_qt_manual_test(tst_network_remote_stresstest + SOURCES + tst_network_remote_stresstest.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network + Qt::NetworkPrivate + Qt::Test +) + +# Resources: +set(url-list_resource_files + "url-list.txt" +) + +add_qt_resource(tst_network_remote_stresstest "url-list" + PREFIX + "/" + FILES + ${url-list_resource_files} +) + diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt new file mode 100644 index 0000000000..310c62dae8 --- /dev/null +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from network_stresstest.pro. + +##################################################################### +## tst_network_stresstest Binary: +##################################################################### + +add_qt_manual_test(tst_network_stresstest + SOURCES + minihttpserver.cpp minihttpserver.h + tst_network_stresstest.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + Qt::Test +) + +# Resources: +set(wwwfiles_resource_files + "qtest" +) + +add_qt_resource(tst_network_stresstest "wwwfiles" + PREFIX + "/" + FILES + ${wwwfiles_resource_files} +) + + +#### Keys ignored in scope 1:.:.:network_stresstest.pro:<TRUE>: +# QMAKE_RESOURCE_FLAGS = "-no-compress" diff --git a/tests/manual/qcursor/CMakeLists.txt b/tests/manual/qcursor/CMakeLists.txt new file mode 100644 index 0000000000..1824c0c1a4 --- /dev/null +++ b/tests/manual/qcursor/CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from qcursor.pro. + +add_subdirectory(allcursors) +add_subdirectory(childwidget) +add_subdirectory(childwindow) +add_subdirectory(childwindowcontainer) +add_subdirectory(grab_override) +add_subdirectory(qcursorhighdpi) diff --git a/tests/manual/qcursor/allcursors/CMakeLists.txt b/tests/manual/qcursor/allcursors/CMakeLists.txt new file mode 100644 index 0000000000..0452653b86 --- /dev/null +++ b/tests/manual/qcursor/allcursors/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from allcursors.pro. + +##################################################################### +## tst_allcursors Binary: +##################################################################### + +add_qt_manual_test(tst_allcursors + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:allcursors.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qcursor/childwidget/CMakeLists.txt b/tests/manual/qcursor/childwidget/CMakeLists.txt new file mode 100644 index 0000000000..5992cdaf73 --- /dev/null +++ b/tests/manual/qcursor/childwidget/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from childwidget.pro. + +##################################################################### +## tst_manual_childwidget Binary: +##################################################################### + +add_qt_manual_test(tst_manual_childwidget + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:childwidget.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qcursor/childwidget/childwidget.pro b/tests/manual/qcursor/childwidget/childwidget.pro index 9ca41c5b4f..9492ec2280 100644 --- a/tests/manual/qcursor/childwidget/childwidget.pro +++ b/tests/manual/qcursor/childwidget/childwidget.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = childwidget +TARGET = tst_manual_childwidget INCLUDEPATH += . QT += widgets diff --git a/tests/manual/qcursor/childwindow/CMakeLists.txt b/tests/manual/qcursor/childwindow/CMakeLists.txt new file mode 100644 index 0000000000..de2a8dae6d --- /dev/null +++ b/tests/manual/qcursor/childwindow/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from childwindow.pro. + +##################################################################### +## childwindow Binary: +##################################################################### + +add_qt_manual_test(childwindow + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:childwindow.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt new file mode 100644 index 0000000000..70c2bb7431 --- /dev/null +++ b/tests/manual/qcursor/childwindowcontainer/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from childwindowcontainer.pro. + +##################################################################### +## childwindowcontainer Binary: +##################################################################### + +add_qt_manual_test(childwindowcontainer + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:childwindowcontainer.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qcursor/grab_override/CMakeLists.txt b/tests/manual/qcursor/grab_override/CMakeLists.txt new file mode 100644 index 0000000000..d3ea88de65 --- /dev/null +++ b/tests/manual/qcursor/grab_override/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from grab_override.pro. + +##################################################################### +## t_cursors Binary: +##################################################################### + +add_qt_manual_test(t_cursors + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +# Resources: +set(images_resource_files + "data/monkey_on_64x64.png" +) + +add_qt_resource(t_cursors "images" + PREFIX + "/" + FILES + ${images_resource_files} +) + + +#### Keys ignored in scope 1:.:.:grab_override.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt new file mode 100644 index 0000000000..9489d0675e --- /dev/null +++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from qcursorhighdpi.pro. + +##################################################################### +## qcursorhighdpi Binary: +##################################################################### + +add_qt_manual_test(qcursorhighdpi + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qcursorhighdpi.pro:<TRUE>: +# TEMPLATE = "app" + +## Scopes: +##################################################################### + +extend_target(qcursorhighdpi CONDITION WIN32 + PUBLIC_LIBRARIES + User32 +) diff --git a/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro b/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro index 3a8fc25b33..b0a5a75a67 100644 --- a/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro +++ b/tests/manual/qcursor/qcursorhighdpi/qcursorhighdpi.pro @@ -1,6 +1,5 @@ TEMPLATE = app -QT = core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += gui-private core-private widgets +QT = core gui gui-private core-private widgets CONFIG -= app_bundle SOURCES += main.cpp win32: LIBS += -lUser32 diff --git a/tests/manual/qdesktopservices/CMakeLists.txt b/tests/manual/qdesktopservices/CMakeLists.txt new file mode 100644 index 0000000000..5d880fcf65 --- /dev/null +++ b/tests/manual/qdesktopservices/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qdesktopservices.pro. + +##################################################################### +## tst_manual_qdesktopservices Binary: +##################################################################### + +add_qt_manual_test(tst_manual_qdesktopservices + SOURCES + tst_qdesktopservices.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::Gui + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qdesktopservices.pro:<TRUE>: +# OTHER_FILES = "test.txt" +# TEMPLATE = "app" diff --git a/tests/manual/qdesktopservices/qdesktopservices.pro b/tests/manual/qdesktopservices/qdesktopservices.pro index baa3c325ff..d2c5703870 100644 --- a/tests/manual/qdesktopservices/qdesktopservices.pro +++ b/tests/manual/qdesktopservices/qdesktopservices.pro @@ -1,6 +1,6 @@ QT += testlib -TARGET = tst_qdesktopservices +TARGET = tst_manual_qdesktopservices CONFIG += cmdline TEMPLATE = app diff --git a/tests/manual/qdesktopwidget/CMakeLists.txt b/tests/manual/qdesktopwidget/CMakeLists.txt new file mode 100644 index 0000000000..2034e3c368 --- /dev/null +++ b/tests/manual/qdesktopwidget/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qdesktopwidget.pro. + +##################################################################### +## qdesktopwidget Binary: +##################################################################### + +add_qt_manual_test(qdesktopwidget + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qdesktopwidget.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qgraphicsitem/CMakeLists.txt b/tests/manual/qgraphicsitem/CMakeLists.txt new file mode 100644 index 0000000000..a75b436e74 --- /dev/null +++ b/tests/manual/qgraphicsitem/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qgraphicsitem.pro. + +##################################################################### +## qgraphicsitem Binary: +##################################################################### + +add_qt_manual_test(qgraphicsitem + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/qgraphicsitemgroup/CMakeLists.txt b/tests/manual/qgraphicsitemgroup/CMakeLists.txt new file mode 100644 index 0000000000..8658c933b3 --- /dev/null +++ b/tests/manual/qgraphicsitemgroup/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qgraphicsitemgroup.pro. + +##################################################################### +## qgraphicsitemgroup Binary: +##################################################################### + +add_qt_manual_test(qgraphicsitemgroup + GUI + SOURCES + customitem.cpp customitem.h + main.cpp + widget.cpp widget.h widget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:qgraphicsitemgroup.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qgraphicslayout/flicker/CMakeLists.txt b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt new file mode 100644 index 0000000000..0d7fcce687 --- /dev/null +++ b/tests/manual/qgraphicslayout/flicker/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from flicker.pro. + +##################################################################### +## flicker Binary: +##################################################################### + +add_qt_manual_test(flicker + GUI + SOURCES + main.cpp + window.cpp window.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/qhttpnetworkconnection/CMakeLists.txt b/tests/manual/qhttpnetworkconnection/CMakeLists.txt new file mode 100644 index 0000000000..7331bf4611 --- /dev/null +++ b/tests/manual/qhttpnetworkconnection/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qhttpnetworkconnection.pro. + +##################################################################### +## tst_manual_qhttpnetworkconnection Binary: +##################################################################### + +add_qt_manual_test(tst_manual_qhttpnetworkconnection + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Network + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qhttpnetworkconnection/main.cpp b/tests/manual/qhttpnetworkconnection/main.cpp index 5b670a51e2..d67d76699c 100644 --- a/tests/manual/qhttpnetworkconnection/main.cpp +++ b/tests/manual/qhttpnetworkconnection/main.cpp @@ -58,7 +58,7 @@ void tst_qhttpnetworkconnection::bigRemoteFile() QVERIFY(!QTestEventLoop::instance().timeout()); size = reply->size(); delete reply; - qDebug() << "Finished!" << endl; + qDebug() << "Finished!" << Qt::endl; qDebug() << "Time:" << t.elapsed() << "msec"; qDebug() << "Bytes:" << size; qDebug() << "Speed:" << (size / qreal(1024)) / (t.elapsed() / qreal(1000)) << "KB/sec"; diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro index 62838785d6..f6763e434d 100644 --- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = tst_qhttpnetworkconnection +TARGET = tst_manual_qhttpnetworkconnection QT -= gui QT += network testlib diff --git a/tests/manual/qimagereader/CMakeLists.txt b/tests/manual/qimagereader/CMakeLists.txt new file mode 100644 index 0000000000..9e5869063b --- /dev/null +++ b/tests/manual/qimagereader/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qimagereader.pro. + +##################################################################### +## qimagereader Binary: +##################################################################### + +add_qt_manual_test(qimagereader + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/qlayout/CMakeLists.txt b/tests/manual/qlayout/CMakeLists.txt new file mode 100644 index 0000000000..541dc18857 --- /dev/null +++ b/tests/manual/qlayout/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qlayout.pro. + +##################################################################### +## qlayout Binary: +##################################################################### + +add_qt_manual_test(qlayout + GUI + SOURCES + gridwidget.cpp gridwidget.h + hbwidget.cpp hbwidget.h + main.cpp + mainwindow.cpp mainwindow.h + vbwidget.cpp vbwidget.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qlayout.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qlocale/CMakeLists.txt b/tests/manual/qlocale/CMakeLists.txt new file mode 100644 index 0000000000..60519da9a1 --- /dev/null +++ b/tests/manual/qlocale/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qlocale.pro. + +##################################################################### +## qlocale Binary: +##################################################################### + +add_qt_manual_test(qlocale + GUI + SOURCES + calendar.cpp calendar.h + currency.cpp currency.h + dateformats.cpp dateformats.h + info.cpp info.h + languages.cpp languages.h + main.cpp + miscellaneous.cpp miscellaneous.h + numberformats.cpp numberformats.h + window.cpp window.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/qmetatype/CMakeLists.txt b/tests/manual/qmetatype/CMakeLists.txt new file mode 100644 index 0000000000..bb5f75092a --- /dev/null +++ b/tests/manual/qmetatype/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qmetatype.pro. + +##################################################################### +## tst_qmetatype_expect_fail Test: +##################################################################### + +add_qt_test(tst_qmetatype_expect_fail + GUI + SOURCES + declare_metatype_noninline.cpp declare_metatype_noninline.h + tst_qmetatype.cpp +) diff --git a/tests/manual/qmimedatabase/CMakeLists.txt b/tests/manual/qmimedatabase/CMakeLists.txt new file mode 100644 index 0000000000..038f784ac2 --- /dev/null +++ b/tests/manual/qmimedatabase/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qmimedatabase.pro. + +##################################################################### +## qmimedatabase Binary: +##################################################################### + +add_qt_manual_test(qmimedatabase + SOURCES + main.cpp +) + +#### Keys ignored in scope 1:.:.:qmimedatabase.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ed552bc435 --- /dev/null +++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qnetconmonitor.pro. + +##################################################################### +## qnetconmonitor Binary: +##################################################################### + +add_qt_manual_test(qnetconmonitor + SOURCES + tst_qnetconmonitor.cpp + PUBLIC_LIBRARIES + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt new file mode 100644 index 0000000000..8eda85b783 --- /dev/null +++ b/tests/manual/qnetconmonitor/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qnetconmonitor.pro. + +##################################################################### +## qnetconmonitor Binary: +##################################################################### + +# special case begin +if (NOT QT_FEATURE_private_tests) + return() +endif() +# special case end + +add_qt_manual_test(qnetconmonitor + SOURCES + tst_qnetconmonitor.cpp + PUBLIC_LIBRARIES + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt new file mode 100644 index 0000000000..1d4ffa4b36 --- /dev/null +++ b/tests/manual/qnetworkaccessmanager/qget/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qget.pro. + +##################################################################### +## qget Binary: +##################################################################### + +add_qt_manual_test(qget + SOURCES + downloadmanager.cpp + qget.cpp qget.h + transferitem.cpp + PUBLIC_LIBRARIES + Qt::Network +) + +#### Keys ignored in scope 1:.:.:qget.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.cpp b/tests/manual/qnetworkaccessmanager/qget/qget.cpp index 639506af63..14415ee890 100644 --- a/tests/manual/qnetworkaccessmanager/qget/qget.cpp +++ b/tests/manual/qnetworkaccessmanager/qget/qget.cpp @@ -33,39 +33,44 @@ #include <QCoreApplication> #include <QList> #include <QStringList> -#include <QNetworkConfiguration> -#include <QNetworkConfigurationManager> -#include <QNetworkSession> void printShortUsage() { - qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << endl - << "Get one or more urls using QNetworkAccessManager" << endl - << "--help to display detailed usage" << endl; + qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << Qt::endl + << "Get one or more urls using QNetworkAccessManager" << Qt::endl + << "--help to display detailed usage" << Qt::endl; } void printUsage() { - qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << endl - << "Get one or more urls using QNetworkAccessManager" << endl + qDebug() << QCoreApplication::applicationName() << " [options] [list of urls]" << Qt::endl + << "Get one or more urls using QNetworkAccessManager" << Qt::endl << "Options:" - << "--help This message" << endl - << "--user=<username> Set username to use for authentication" << endl - << "--password=<password> Set password to use for authentication" << endl - << "--proxy-user=<username> Set username to use for proxy authentication" << endl - << "--proxy-password=<password> Set password to use for proxy authentication" << endl - << "--proxy=on Use system proxy (default)" << endl - << "--proxy=off Don't use system proxy" << endl - << "--proxy=<host:port>[,type] Use specified proxy" << endl - << " ,http HTTP proxy (default)" << endl - << " ,socks SOCKS5 proxy" << endl - << " ,ftp FTP proxy" << endl - << " ,httpcaching HTTP caching proxy (no CONNECT method)" << endl - << "--headers=filename Set request headers from file contents" << endl - << "--post=filename upload the file to the next url using HTTP POST" << endl - << "--put=filename upload the file to the next url using HTTP PUT" << endl - << "--content-type=<MIME> set content-type header for upload" << endl - << "--serial don't run requests in parallel" << endl; + << "--help This message" << Qt::endl + << "--user=<username> Set username to use for authentication" + << Qt::endl + << "--password=<password> Set password to use for authentication" + << Qt::endl + << "--proxy-user=<username> Set username to use for proxy authentication" + << Qt::endl + << "--proxy-password=<password> Set password to use for proxy authentication" + << Qt::endl + << "--proxy=on Use system proxy (default)" << Qt::endl + << "--proxy=off Don't use system proxy" << Qt::endl + << "--proxy=<host:port>[,type] Use specified proxy" << Qt::endl + << " ,http HTTP proxy (default)" << Qt::endl + << " ,socks SOCKS5 proxy" << Qt::endl + << " ,ftp FTP proxy" << Qt::endl + << " ,httpcaching HTTP caching proxy (no CONNECT method)" + << Qt::endl + << "--headers=filename Set request headers from file contents" + << Qt::endl + << "--post=filename upload the file to the next url using HTTP POST" + << Qt::endl + << "--put=filename upload the file to the next url using HTTP PUT" + << Qt::endl + << "--content-type=<MIME> set content-type header for upload" << Qt::endl + << "--serial don't run requests in parallel" << Qt::endl; } int main(int argc, char *argv[]) diff --git a/tests/manual/qnetworkconfiguration/main.cpp b/tests/manual/qnetworkconfiguration/main.cpp deleted file mode 100644 index ad1810b016..0000000000 --- a/tests/manual/qnetworkconfiguration/main.cpp +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Research in Motion. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QDebug> -#include <qtest.h> -#include <QtTest/QtTest> -#include <QtNetwork/qnetworkconfiguration.h> -#include <QtNetwork/qnetworkconfigmanager.h> - -class tst_qnetworkconfiguration : public QObject -{ - Q_OBJECT - -private slots: - void bearerType(); - void bearerTypeFamily(); -}; - -void tst_qnetworkconfiguration::bearerType() -{ - QNetworkConfigurationManager m; - QList<QNetworkConfiguration> allConfs = m.allConfigurations(); - QElapsedTimer timer; - for (int a = 0; a < allConfs.count(); a++) { - timer.start(); - QNetworkConfiguration::BearerType type = allConfs.at(a).bearerType(); - qint64 elapsed = timer.elapsed(); - QString typeString; - switch (type) { - case QNetworkConfiguration::BearerUnknown: - typeString = QLatin1String("Unknown"); - break; - case QNetworkConfiguration::BearerEthernet: - typeString = QLatin1String("Ethernet"); - break; - case QNetworkConfiguration::BearerWLAN: - typeString = QLatin1String("WLAN"); - break; - case QNetworkConfiguration::Bearer2G: - typeString = QLatin1String("2G"); - break; - case QNetworkConfiguration::BearerCDMA2000: - typeString = QLatin1String("CDMA2000"); - break; - case QNetworkConfiguration::BearerWCDMA: - typeString = QLatin1String("WCDMA"); - break; - case QNetworkConfiguration::BearerHSPA: - typeString = QLatin1String("HSPA"); - break; - case QNetworkConfiguration::BearerBluetooth: - typeString = QLatin1String("Bluetooth"); - break; - case QNetworkConfiguration::BearerWiMAX: - typeString = QLatin1String("WiMAX"); - break; - case QNetworkConfiguration::BearerEVDO: - typeString = QLatin1String("EVDO"); - break; - case QNetworkConfiguration::BearerLTE: - typeString = QLatin1String("LTE"); - break; - default: - typeString = "unknown bearer (?)"; - } - - const char *isDefault = (allConfs.at(a) == m.defaultConfiguration()) - ? "*DEFAULT*" : ""; - qDebug() << isDefault << "identifier:" << allConfs.at(a).identifier() - << "bearer type name:" << allConfs.at(a).bearerTypeName() - << "bearer type:" << type << "(" << typeString << ")" - << "elapsed:" << elapsed; - QCOMPARE(allConfs.at(a).bearerTypeName(), typeString); - } -} - -void tst_qnetworkconfiguration::bearerTypeFamily() -{ - QNetworkConfigurationManager m; - foreach (const QNetworkConfiguration &config, - m.allConfigurations(QNetworkConfiguration::Active)) { - QString family; - switch (config.bearerTypeFamily()) { - case QNetworkConfiguration::Bearer3G: - family = QLatin1String("Bearer3G"); - break; - case QNetworkConfiguration::Bearer4G: - family = QLatin1String("Bearer4G"); - break; - default: - family = config.bearerTypeName(); - } - qDebug() << config.name() << "has bearer type" - << config.bearerTypeName() << "of bearer type family" - << family; - } -} - -QTEST_MAIN(tst_qnetworkconfiguration) - -#include "main.moc" diff --git a/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro deleted file mode 100644 index 25ef41b92a..0000000000 --- a/tests/manual/qnetworkconfiguration/qnetworkconfiguration.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app -TARGET = tst_qnetworkconfiguration - -QT -= gui -QT += network testlib - -SOURCES += main.cpp diff --git a/tests/manual/qnetworkconfigurationmanager/main.cpp b/tests/manual/qnetworkconfigurationmanager/main.cpp deleted file mode 100644 index e2edb20092..0000000000 --- a/tests/manual/qnetworkconfigurationmanager/main.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QDebug> -#include <qtest.h> -#include <QtTest/QtTest> -#include <QtNetwork/qnetworkconfigmanager.h> - -class tst_qnetworkconfigurationmanager : public QObject -{ - Q_OBJECT - -private slots: - void isOnline(); -}; - -class SignalHandler : public QObject -{ - Q_OBJECT - -public slots: - void onOnlineStateChanged(bool isOnline) - { - qDebug() << "Online state changed to:" << isOnline; - } -}; - -void tst_qnetworkconfigurationmanager::isOnline() -{ - QNetworkConfigurationManager manager; - qDebug() << "Testing QNetworkConfigurationManager online status reporting functionality."; - qDebug() << "This should tell the current online state:" << manager.isOnline(); - qDebug() << "Now please plug / unplug the network cable, and check the state update signal."; - qDebug() << "Note that there might be some delays before you see the change, depending on the backend."; - - SignalHandler signalHandler; - connect(&manager, SIGNAL(onlineStateChanged(bool)), &signalHandler, SLOT(onOnlineStateChanged(bool))); - - // event loop - QTestEventLoop::instance().enterLoop(30); - QVERIFY(QTestEventLoop::instance().timeout()); -} - -QTEST_MAIN(tst_qnetworkconfigurationmanager) - -#include "main.moc" diff --git a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro deleted file mode 100644 index 8f9314cc96..0000000000 --- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = app -TARGET = tst_qnetworkconfigurationmanager - -QT -= gui -QT += network testlib - -SOURCES += main.cpp diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt new file mode 100644 index 0000000000..24854aa64f --- /dev/null +++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qnetworkreply.pro. + +##################################################################### +## tst_manual_qnetworkreply Binary: +##################################################################### + +add_qt_manual_test(tst_manual_qnetworkreply + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt new file mode 100644 index 0000000000..5ac12ced95 --- /dev/null +++ b/tests/manual/qnetworkreply/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from qnetworkreply.pro. + +##################################################################### +## tst_manual_qnetworkreply Binary: +##################################################################### + +# special case begin +if (NOT QT_FEATURE_private_tests) + return() +endif() +# special case end + +add_qt_manual_test(tst_manual_qnetworkreply + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp index 762bfe7b83..1086498553 100644 --- a/tests/manual/qnetworkreply/main.cpp +++ b/tests/manual/qnetworkreply/main.cpp @@ -58,9 +58,6 @@ private slots: void setSslConfiguration_data(); void setSslConfiguration(); void uploadToFacebook(); - void spdy_data(); - void spdy(); - void spdyMultipleRequestsPerHost(); void proxyAuthentication_data(); void proxyAuthentication(); void authentication(); @@ -291,126 +288,6 @@ void tst_qnetworkreply::uploadToFacebook() } } -void tst_qnetworkreply::spdy_data() -{ - QTest::addColumn<QString>("host"); - QTest::addColumn<bool>("setAttribute"); - QTest::addColumn<bool>("enabled"); - QTest::addColumn<QByteArray>("expectedProtocol"); - - QList<QString> hosts = QList<QString>() - << QStringLiteral("www.google.com") // sends SPDY and 30x redirect - << QStringLiteral("www.google.de") // sends SPDY and 200 OK - << QStringLiteral("mail.google.com") // sends SPDY and 200 OK - << QStringLiteral("www.youtube.com") // sends SPDY and 200 OK - << QStringLiteral("www.dropbox.com") // no SPDY, but NPN which selects HTTP - << QStringLiteral("www.facebook.com") // sends SPDY and 200 OK - << QStringLiteral("graph.facebook.com") // sends SPDY and 200 OK - << QStringLiteral("www.twitter.com") // sends SPDY and 30x redirect - << QStringLiteral("twitter.com") // sends SPDY and 200 OK - << QStringLiteral("api.twitter.com"); // sends SPDY and 200 OK - - foreach (const QString &host, hosts) { - QByteArray tag = host.toLocal8Bit(); - tag.append("-not-used"); - QTest::newRow(tag) - << QStringLiteral("https://") + host - << false - << false - << QByteArray(); - - tag = host.toLocal8Bit(); - tag.append("-disabled"); - QTest::newRow(tag) - << QStringLiteral("https://") + host - << true - << false - << QByteArray(); - - if (host != QStringLiteral("api.twitter.com")) { // they don't offer an API over HTTP - tag = host.toLocal8Bit(); - tag.append("-no-https-url"); - QTest::newRow(tag) - << QStringLiteral("http://") + host - << true - << true - << QByteArray(); - } - -#ifndef QT_NO_OPENSSL - tag = host.toLocal8Bit(); - tag.append("-enabled"); - QTest::newRow(tag) - << QStringLiteral("https://") + host - << true - << true - << (host == QStringLiteral("www.dropbox.com") - ? QByteArray(QSslConfiguration::NextProtocolHttp1_1) - : QByteArray(QSslConfiguration::NextProtocolSpdy3_0)); -#endif // QT_NO_OPENSSL - } -} - -void tst_qnetworkreply::spdy() -{ -#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) - - m_manager.clearAccessCache(); - - QFETCH(QString, host); - QUrl url(host); - QNetworkRequest request(url); - - QFETCH(bool, setAttribute); - QFETCH(bool, enabled); - if (setAttribute) { - request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, QVariant(enabled)); - } - - QNetworkReply *reply = m_manager.get(request); - QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); - - QSignalSpy metaDataChangedSpy(reply, SIGNAL(metaDataChanged())); - QSignalSpy readyReadSpy(reply, SIGNAL(readyRead())); - QSignalSpy finishedSpy(reply, SIGNAL(finished())); - QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*))); - - QTestEventLoop::instance().enterLoop(15); - QVERIFY(!QTestEventLoop::instance().timeout()); - - QFETCH(QByteArray, expectedProtocol); - - bool expectedSpdyUsed = (expectedProtocol == QSslConfiguration::NextProtocolSpdy3_0); - QCOMPARE(reply->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), expectedSpdyUsed); - - QCOMPARE(metaDataChangedSpy.count(), 1); - QCOMPARE(finishedSpy.count(), 1); - QCOMPARE(finishedManagerSpy.count(), 1); - - QUrl redirectUrl = reply->header(QNetworkRequest::LocationHeader).toUrl(); - QByteArray content = reply->readAll(); - - int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - QVERIFY(statusCode >= 200 && statusCode < 500); - if (statusCode == 200 || statusCode >= 400) { - QVERIFY(readyReadSpy.count() > 0); - QVERIFY(!content.isEmpty()); - } else if (statusCode >= 300 && statusCode < 400) { - QVERIFY(!redirectUrl.isEmpty()); - } - - QSslConfiguration::NextProtocolNegotiationStatus expectedStatus = - expectedProtocol.isNull() ? QSslConfiguration::NextProtocolNegotiationNone - : QSslConfiguration::NextProtocolNegotiationNegotiated; - QCOMPARE(reply->sslConfiguration().nextProtocolNegotiationStatus(), - expectedStatus); - - QCOMPARE(reply->sslConfiguration().nextNegotiatedProtocol(), expectedProtocol); -#else - QSKIP("Qt built withouth OpenSSL, or the OpenSSL version is too old"); -#endif // defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ... -} - void tst_qnetworkreply::spdyReplyFinished() { static int finishedCount = 0; @@ -420,85 +297,6 @@ void tst_qnetworkreply::spdyReplyFinished() QTestEventLoop::instance().exitLoop(); } -void tst_qnetworkreply::spdyMultipleRequestsPerHost() -{ -#if defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) && OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) - - QList<QNetworkRequest> requests; - requests - << QNetworkRequest(QUrl("https://www.facebook.com")) - << QNetworkRequest(QUrl("https://www.facebook.com/images/fb_icon_325x325.png")) - - << QNetworkRequest(QUrl("https://www.google.de")) - << QNetworkRequest(QUrl("https://www.google.de/preferences?hl=de")) - << QNetworkRequest(QUrl("https://www.google.de/intl/de/policies/?fg=1")) - << QNetworkRequest(QUrl("https://www.google.de/intl/de/about.html?fg=1")) - << QNetworkRequest(QUrl("https://www.google.de/services/?fg=1")) - << QNetworkRequest(QUrl("https://www.google.de/intl/de/ads/?fg=1")) - - << QNetworkRequest(QUrl("https://i1.ytimg.com/li/tnHdj3df7iM/default.jpg")) - << QNetworkRequest(QUrl("https://i1.ytimg.com/li/7Dr1BKwqctY/default.jpg")) - << QNetworkRequest(QUrl("https://i1.ytimg.com/li/hfZhJdhTqX8/default.jpg")) - << QNetworkRequest(QUrl("https://i1.ytimg.com/vi/14Nprh8163I/hqdefault.jpg")) - ; - QList<QNetworkReply *> replies; - QList<QSignalSpy *> metaDataChangedSpies; - QList<QSignalSpy *> readyReadSpies; - QList<QSignalSpy *> finishedSpies; - - QSignalSpy finishedManagerSpy(&m_manager, SIGNAL(finished(QNetworkReply*))); - - foreach (QNetworkRequest request, requests) { - request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, true); - QNetworkReply *reply = m_manager.get(request); - QObject::connect(reply, SIGNAL(finished()), this, SLOT(spdyReplyFinished())); - replies << reply; - QSignalSpy *metaDataChangedSpy = new QSignalSpy(reply, SIGNAL(metaDataChanged())); - metaDataChangedSpies << metaDataChangedSpy; - QSignalSpy *readyReadSpy = new QSignalSpy(reply, SIGNAL(readyRead())); - readyReadSpies << readyReadSpy; - QSignalSpy *finishedSpy = new QSignalSpy(reply, SIGNAL(finished())); - finishedSpies << finishedSpy; - } - - QCOMPARE(requests.count(), replies.count()); - - QTestEventLoop::instance().enterLoop(15); - QVERIFY(!QTestEventLoop::instance().timeout()); - - QCOMPARE(finishedManagerSpy.count(), requests.count()); - - for (int a = 0; a < replies.count(); ++a) { - - QCOMPARE(replies.at(a)->sslConfiguration().nextProtocolNegotiationStatus(), - QSslConfiguration::NextProtocolNegotiationNegotiated); - QCOMPARE(replies.at(a)->sslConfiguration().nextNegotiatedProtocol(), - QByteArray(QSslConfiguration::NextProtocolSpdy3_0)); - - QCOMPARE(replies.at(a)->error(), QNetworkReply::NoError); - QCOMPARE(replies.at(a)->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool(), true); - QCOMPARE(replies.at(a)->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool(), true); - QCOMPARE(replies.at(a)->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200); - - QByteArray content = replies.at(a)->readAll(); - QVERIFY(content.count() > 0); - - QCOMPARE(metaDataChangedSpies.at(a)->count(), 1); - metaDataChangedSpies.at(a)->deleteLater(); - - QCOMPARE(finishedSpies.at(a)->count(), 1); - finishedSpies.at(a)->deleteLater(); - - QVERIFY(readyReadSpies.at(a)->count() > 0); - readyReadSpies.at(a)->deleteLater(); - - replies.at(a)->deleteLater(); - } -#else - QSKIP("Qt built withouth OpenSSL, or the OpenSSL version is too old"); -#endif // defined(QT_BUILD_INTERNAL) && !defined(QT_NO_SSL) ... -} - void tst_qnetworkreply::proxyAuthentication_data() { QTest::addColumn<QUrl>("url"); @@ -587,7 +385,7 @@ void tst_qnetworkreply::npnWithEmptyList() // QTBUG-40714 QUrl url(QStringLiteral("https://www.ossifrage.net/")); QNetworkRequest request(url); - request.setAttribute(QNetworkRequest::SpdyAllowedAttribute, QVariant(true)); + request.setAttribute(QNetworkRequest::Http2AllowedAttribute, QVariant(true)); QNetworkReply *reply = m_manager.get(request); QObject::connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop())); diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro index eddcbdff1d..2457acd749 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = tst_qnetworkreply +TARGET = tst_manual_qnetworkreply QT -= gui QT += core-private network network-private testlib diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt new file mode 100644 index 0000000000..9cec06ff1e --- /dev/null +++ b/tests/manual/qopenglcontext/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qopenglcontext.pro. + +##################################################################### +## qopenglcontext Binary: +##################################################################### + +add_qt_manual_test(qopenglcontext + GUI + SOURCES + main.cpp + qopenglcontextwindow.cpp qopenglcontextwindow.h + PUBLIC_LIBRARIES + Qt::EglSupportPrivate + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:qopenglcontext.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f56583c1e0 --- /dev/null +++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qopengltextureblitter.pro. + +##################################################################### +## qopengltextureblitter Binary: +##################################################################### + +add_qt_manual_test(qopengltextureblitter + GUI + SOURCES + main.cpp + qopengltextureblitwindow.cpp qopengltextureblitwindow.h + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt new file mode 100644 index 0000000000..1fe33049fc --- /dev/null +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qopengltextureblitter.pro. + +##################################################################### +## qopengltextureblitter Binary: +##################################################################### + +add_qt_manual_test(qopengltextureblitter + GUI + SOURCES + main.cpp + qopengltextureblitwindow.cpp qopengltextureblitwindow.h + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::OpenGL # special case +) + +#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index f4e093a967..f8e033c927 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -29,7 +29,7 @@ #include "qopengltextureblitwindow.h" #include <QtGui/QPainter> -#include <QtGui/QOpenGLTexture> +#include <QtOpenGL/QOpenGLTexture> #include <QtGui/QOpenGLFunctions> #include <QtGui/QMatrix4x4> diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt new file mode 100644 index 0000000000..ffdb888040 --- /dev/null +++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from openglwidget.pro. + +##################################################################### +## openglwidget Binary: +##################################################################### + +add_qt_manual_test(openglwidget + GUI + SOURCES + main.cpp + openglwidget.cpp openglwidget.h + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) + +#### Keys ignored in scope 1:.:.:openglwidget.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt new file mode 100644 index 0000000000..82acac6aff --- /dev/null +++ b/tests/manual/qopenglwindow/multiwindow/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from multiwindow.pro. + +##################################################################### +## multiwindow Binary: +##################################################################### + +add_qt_manual_test(multiwindow + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:multiwindow.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt new file mode 100644 index 0000000000..f619024286 --- /dev/null +++ b/tests/manual/qprintdevice_dump/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qprintdevice_dump.pro. + +##################################################################### +## qprintdevice_dump Binary: +##################################################################### + +add_qt_manual_test(qprintdevice_dump + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::PrintSupportPrivate +) + +#### Keys ignored in scope 1:.:.:qprintdevice_dump.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qscreen/CMakeLists.txt b/tests/manual/qscreen/CMakeLists.txt new file mode 100644 index 0000000000..53b431c548 --- /dev/null +++ b/tests/manual/qscreen/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qscreen.pro. + +##################################################################### +## qscreen Binary: +##################################################################### + +add_qt_manual_test(qscreen + SOURCES + main.cpp + propertyfield.cpp propertyfield.h + propertywatcher.cpp propertywatcher.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qscreen.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index 0728d66bf9..ab92216d22 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -192,15 +192,15 @@ static inline QString msgScreenChange(const QWidget *w, const QScreen *oldScreen if (!newScreen) { result = QLatin1String("Screen changed --> null"); } else if (!oldScreen) { - QTextStream(&result) << "Screen changed null --> \"" - << newScreen->name() << "\" at " << pos.x() << ',' << pos.y() << " geometry: " - << geometry.width() << 'x' << geometry.height() << forcesign << geometry.x() - << geometry.y() << '.'; + QTextStream(&result) << "Screen changed null --> \"" << newScreen->name() << "\" at " + << pos.x() << ',' << pos.y() << " geometry: " << geometry.width() + << 'x' << geometry.height() << Qt::forcesign << geometry.x() + << geometry.y() << '.'; } else { QTextStream(&result) << "Screen changed \"" << oldScreen->name() << "\" --> \"" - << newScreen->name() << "\" at " << pos.x() << ',' << pos.y() << " geometry: " - << geometry.width() << 'x' << geometry.height() << forcesign << geometry.x() - << geometry.y() << '.'; + << newScreen->name() << "\" at " << pos.x() << ',' << pos.y() + << " geometry: " << geometry.width() << 'x' << geometry.height() + << Qt::forcesign << geometry.x() << geometry.y() << '.'; } return result; } diff --git a/tests/manual/qssloptions/CMakeLists.txt b/tests/manual/qssloptions/CMakeLists.txt new file mode 100644 index 0000000000..1fe53b9e50 --- /dev/null +++ b/tests/manual/qssloptions/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qssloptions.pro. + +##################################################################### +## tst_qssloptions Binary: +##################################################################### + +add_qt_manual_test(tst_qssloptions + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Network + Qt::Test +) diff --git a/tests/manual/qssloptions/main.cpp b/tests/manual/qssloptions/main.cpp index 0f06071b41..cc65c57f33 100644 --- a/tests/manual/qssloptions/main.cpp +++ b/tests/manual/qssloptions/main.cpp @@ -37,13 +37,13 @@ int main(int argc, char **argv) if (argc < 3) { QTextStream out(stdout); - out << "Usage: " << argv[0] << " host port [options]" << endl; - out << "The options can be one or more of the following:" << endl; - out << "enable_empty_fragments" << endl; - out << "disable_session_tickets" << endl; - out << "disable_compression" << endl; - out << "disable_sni" << endl; - out << "enable_unsafe_reneg" << endl; + out << "Usage: " << argv[0] << " host port [options]" << Qt::endl; + out << "The options can be one or more of the following:" << Qt::endl; + out << "enable_empty_fragments" << Qt::endl; + out << "disable_session_tickets" << Qt::endl; + out << "disable_compression" << Qt::endl; + out << "disable_sni" << Qt::endl; + out << "enable_unsafe_reneg" << Qt::endl; return 1; } diff --git a/tests/manual/qsslsocket/CMakeLists.txt b/tests/manual/qsslsocket/CMakeLists.txt new file mode 100644 index 0000000000..bd7c9fc569 --- /dev/null +++ b/tests/manual/qsslsocket/CMakeLists.txt @@ -0,0 +1,12 @@ +# Generated from qsslsocket.pro. + +##################################################################### +## tst_manual_qsslsocket Test: +##################################################################### + +add_qt_test(tst_manual_qsslsocket + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Network +) diff --git a/tests/manual/qsslsocket/qsslsocket.pro b/tests/manual/qsslsocket/qsslsocket.pro index c297d887ba..511d31898f 100644 --- a/tests/manual/qsslsocket/qsslsocket.pro +++ b/tests/manual/qsslsocket/qsslsocket.pro @@ -3,4 +3,4 @@ CONFIG += testcase SOURCES += main.cpp QT = core network testlib -TARGET = tst_qsslsocket +TARGET = tst_manual_qsslsocket diff --git a/tests/manual/qstorageinfo/CMakeLists.txt b/tests/manual/qstorageinfo/CMakeLists.txt new file mode 100644 index 0000000000..fab2da606b --- /dev/null +++ b/tests/manual/qstorageinfo/CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from qstorageinfo.pro. + +##################################################################### +## qstorageinfo Binary: +##################################################################### + +add_qt_manual_test(qstorageinfo + SOURCES + main.cpp +) diff --git a/tests/manual/qsysinfo/CMakeLists.txt b/tests/manual/qsysinfo/CMakeLists.txt new file mode 100644 index 0000000000..cd668a5bf2 --- /dev/null +++ b/tests/manual/qsysinfo/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from qsysinfo.pro. + +##################################################################### +## qsysinfo Binary: +##################################################################### + +add_qt_manual_test(qsysinfo + SOURCES + main.cpp +) + +#### Keys ignored in scope 1:.:.:qsysinfo.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt new file mode 100644 index 0000000000..0e19e6a4e3 --- /dev/null +++ b/tests/manual/qt_poll/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from qt_poll.pro. + +##################################################################### +## tst_qt_poll Test: +##################################################################### + +add_qt_test(tst_qt_poll + SOURCES + ../../../src/corelib/kernel/qpoll.cpp + tst_qt_poll.cpp + INCLUDE_DIRECTORIES + ../../../src/corelib/kernel + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Network +) diff --git a/tests/manual/qtabbar/CMakeLists.txt b/tests/manual/qtabbar/CMakeLists.txt new file mode 100644 index 0000000000..a44b6a331a --- /dev/null +++ b/tests/manual/qtabbar/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qtabbar.pro. + +##################################################################### +## qtabbar Binary: +##################################################################### + +add_qt_manual_test(qtabbar + GUI + SOURCES + main.cpp + tabbarform.cpp tabbarform.h tabbarform.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:qtabbar.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtabletevent/CMakeLists.txt b/tests/manual/qtabletevent/CMakeLists.txt new file mode 100644 index 0000000000..422664e2a4 --- /dev/null +++ b/tests/manual/qtabletevent/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from qtabletevent.pro. + +#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject' +add_subdirectory(event_compression) +add_subdirectory(regular_widgets) diff --git a/tests/manual/qtabletevent/device_information/CMakeLists.txt b/tests/manual/qtabletevent/device_information/CMakeLists.txt new file mode 100644 index 0000000000..d0e12fac0a --- /dev/null +++ b/tests/manual/qtabletevent/device_information/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from device_information.pro. + +##################################################################### +## device_information Binary: +##################################################################### + +add_qt_manual_test(device_information + GUI + SOURCES + main.cpp + tabletwidget.cpp tabletwidget.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/qtabletevent/event_compression/CMakeLists.txt b/tests/manual/qtabletevent/event_compression/CMakeLists.txt new file mode 100644 index 0000000000..b6cc8032e5 --- /dev/null +++ b/tests/manual/qtabletevent/event_compression/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from event_compression.pro. + +##################################################################### +## event_compression Binary: +##################################################################### + +add_qt_manual_test(event_compression + SOURCES + main.cpp + mousestatwidget.cpp mousestatwidget.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Test + Qt::Widgets +) diff --git a/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt new file mode 100644 index 0000000000..7937aa5d90 --- /dev/null +++ b/tests/manual/qtabletevent/regular_widgets/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from regular_widgets.pro. + +##################################################################### +## regular_widgets Binary: +##################################################################### + +add_qt_manual_test(regular_widgets + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:regular_widgets.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtbug-52641/CMakeLists.txt b/tests/manual/qtbug-52641/CMakeLists.txt new file mode 100644 index 0000000000..7f96b66eaa --- /dev/null +++ b/tests/manual/qtbug-52641/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qtbug-52641.pro. + +##################################################################### +## qtbug-52641 Binary: +##################################################################### + +add_qt_manual_test(qtbug-52641 + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qtbug-52641.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtbug-8933/CMakeLists.txt b/tests/manual/qtbug-8933/CMakeLists.txt new file mode 100644 index 0000000000..a5de7687cb --- /dev/null +++ b/tests/manual/qtbug-8933/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qtbug-8933.pro. + +##################################################################### +## qtbug-8933 Binary: +##################################################################### + +add_qt_manual_test(qtbug-8933 + GUI + SOURCES + main.cpp + widget.cpp widget.h widget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:qtbug-8933.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtexteditlist/CMakeLists.txt b/tests/manual/qtexteditlist/CMakeLists.txt new file mode 100644 index 0000000000..963ffa5441 --- /dev/null +++ b/tests/manual/qtexteditlist/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qtexteditlist.pro. + +##################################################################### +## qtexteditlist Binary: +##################################################################### + +add_qt_manual_test(qtexteditlist + GUI + SOURCES + main.cpp + widget.cpp widget.h widget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:qtexteditlist.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtexteditlist/qtexteditlist.pro b/tests/manual/qtexteditlist/qtexteditlist.pro index 953333f3ee..972e054445 100644 --- a/tests/manual/qtexteditlist/qtexteditlist.pro +++ b/tests/manual/qtexteditlist/qtexteditlist.pro @@ -1,6 +1,6 @@ #This project can be used to verify QTBUG-5111 case. QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += widgets TARGET = qtexteditlist TEMPLATE = app SOURCES += main.cpp widget.cpp diff --git a/tests/manual/qtexttableborders/CMakeLists.txt b/tests/manual/qtexttableborders/CMakeLists.txt new file mode 100644 index 0000000000..c273b3aeb2 --- /dev/null +++ b/tests/manual/qtexttableborders/CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from qtexttableborders.pro. + +##################################################################### +## qtexttableborders Binary: +##################################################################### + +add_qt_manual_test(qtexttableborders + GUI + SOURCES + main.cpp + widget.cpp widget.h widget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::PrintSupport + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +# Resources: +set(resources_resource_files + "table-border-test-header.html" + "table-border-test.html" +) + +add_qt_resource(qtexttableborders "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qtexttableborders.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qtexttableborders/qtexttableborders.pro b/tests/manual/qtexttableborders/qtexttableborders.pro index 7e454f978d..3805ac6ed0 100644 --- a/tests/manual/qtexttableborders/qtexttableborders.pro +++ b/tests/manual/qtexttableborders/qtexttableborders.pro @@ -1,7 +1,6 @@ #This project can be used to verify QTBUG-36152 case. -QT += core gui printsupport +QT += core gui printsupport widgets CONFIG += c++11 -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TARGET = qtexttableborders TEMPLATE = app SOURCES += main.cpp widget.cpp diff --git a/tests/manual/qtouchevent/CMakeLists.txt b/tests/manual/qtouchevent/CMakeLists.txt new file mode 100644 index 0000000000..8cee742ca1 --- /dev/null +++ b/tests/manual/qtouchevent/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qtouchevent.pro. + +##################################################################### +## qtouchevent Binary: +##################################################################### + +add_qt_manual_test(qtouchevent + SOURCES + form.ui + main.cpp + touchwidget.cpp touchwidget.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Test + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) diff --git a/tests/manual/qtouchevent/qtouchevent.pro b/tests/manual/qtouchevent/qtouchevent.pro index 81384eaf24..4ba921d301 100644 --- a/tests/manual/qtouchevent/qtouchevent.pro +++ b/tests/manual/qtouchevent/qtouchevent.pro @@ -1,5 +1,4 @@ -QT += testlib -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += testlib widgets SOURCES = main.cpp \ touchwidget.cpp FORMS += form.ui diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt new file mode 100644 index 0000000000..2071010da1 --- /dev/null +++ b/tests/manual/qvulkaninstance/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qvulkaninstance.pro. + +##################################################################### +## qvulkaninstance Binary: +##################################################################### + +add_qt_manual_test(qvulkaninstance + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:qvulkaninstance.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/qwidget_zorder/CMakeLists.txt b/tests/manual/qwidget_zorder/CMakeLists.txt new file mode 100644 index 0000000000..2ae52decac --- /dev/null +++ b/tests/manual/qwidget_zorder/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qwidget_zorder.pro. + +##################################################################### +## qwidget_zorder Binary: +##################################################################### + +add_qt_manual_test(qwidget_zorder + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/CMakeLists.txt b/tests/manual/repaint/CMakeLists.txt new file mode 100644 index 0000000000..fd579a76a2 --- /dev/null +++ b/tests/manual/repaint/CMakeLists.txt @@ -0,0 +1,9 @@ +# Generated from repaint.pro. + +add_subdirectory(mainwindow) +add_subdirectory(scrollarea) +add_subdirectory(splitter) +add_subdirectory(tableview) +add_subdirectory(task141091) +add_subdirectory(toplevel) +add_subdirectory(widget) diff --git a/tests/manual/repaint/mainwindow/CMakeLists.txt b/tests/manual/repaint/mainwindow/CMakeLists.txt new file mode 100644 index 0000000000..f71b5ddf6c --- /dev/null +++ b/tests/manual/repaint/mainwindow/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from mainwindow.pro. + +##################################################################### +## tst_manual_mainwindow Binary: +##################################################################### + +add_qt_manual_test(tst_manual_mainwindow + GUI + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/mainwindow/mainwindow.pro b/tests/manual/repaint/mainwindow/mainwindow.pro index f20e5fe402..419436032c 100644 --- a/tests/manual/repaint/mainwindow/mainwindow.pro +++ b/tests/manual/repaint/mainwindow/mainwindow.pro @@ -1,3 +1,4 @@ +TARGET = tst_manual_mainwindow QT += widgets HEADERS += ../shared/shared.h SOURCES += main.cpp diff --git a/tests/manual/repaint/scrollarea/CMakeLists.txt b/tests/manual/repaint/scrollarea/CMakeLists.txt new file mode 100644 index 0000000000..9d2d52fd65 --- /dev/null +++ b/tests/manual/repaint/scrollarea/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from scrollarea.pro. + +##################################################################### +## tst_manual_scrollarea Binary: +##################################################################### + +add_qt_manual_test(tst_manual_scrollarea + GUI + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/scrollarea/scrollarea.pro b/tests/manual/repaint/scrollarea/scrollarea.pro index f20e5fe402..deff158cce 100644 --- a/tests/manual/repaint/scrollarea/scrollarea.pro +++ b/tests/manual/repaint/scrollarea/scrollarea.pro @@ -1,3 +1,4 @@ QT += widgets +TARGET = tst_manual_scrollarea HEADERS += ../shared/shared.h SOURCES += main.cpp diff --git a/tests/manual/repaint/splitter/CMakeLists.txt b/tests/manual/repaint/splitter/CMakeLists.txt new file mode 100644 index 0000000000..cb1d7aab0b --- /dev/null +++ b/tests/manual/repaint/splitter/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from splitter.pro. + +##################################################################### +## splitter Binary: +##################################################################### + +add_qt_manual_test(splitter + GUI + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/tableview/CMakeLists.txt b/tests/manual/repaint/tableview/CMakeLists.txt new file mode 100644 index 0000000000..5c9634db88 --- /dev/null +++ b/tests/manual/repaint/tableview/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from tableview.pro. + +##################################################################### +## tableview Binary: +##################################################################### + +add_qt_manual_test(tableview + GUI + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/task141091/CMakeLists.txt b/tests/manual/repaint/task141091/CMakeLists.txt new file mode 100644 index 0000000000..3a74ef58de --- /dev/null +++ b/tests/manual/repaint/task141091/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from task141091.pro. + +##################################################################### +## task141091 Binary: +##################################################################### + +add_qt_manual_test(task141091 + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/toplevel/CMakeLists.txt b/tests/manual/repaint/toplevel/CMakeLists.txt new file mode 100644 index 0000000000..6b5a3c83a9 --- /dev/null +++ b/tests/manual/repaint/toplevel/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from toplevel.pro. + +##################################################################### +## tst_manual_toplevel Binary: +##################################################################### + +add_qt_manual_test(tst_manual_toplevel + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/repaint/toplevel/toplevel.pro b/tests/manual/repaint/toplevel/toplevel.pro index a881c24f56..d142fd19bb 100644 --- a/tests/manual/repaint/toplevel/toplevel.pro +++ b/tests/manual/repaint/toplevel/toplevel.pro @@ -1,5 +1,6 @@ CONFIG += console QT += widgets +TARGET = tst_manual_toplevel HEADERS += ../shared/shared.h SOURCES += main.cpp diff --git a/tests/manual/repaint/widget/CMakeLists.txt b/tests/manual/repaint/widget/CMakeLists.txt new file mode 100644 index 0000000000..f58c49c9fb --- /dev/null +++ b/tests/manual/repaint/widget/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from widget.pro. + +##################################################################### +## widget Binary: +##################################################################### + +add_qt_manual_test(widget + GUI + SOURCES + ../shared/shared.h + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/rhi/CMakeLists.txt b/tests/manual/rhi/CMakeLists.txt new file mode 100644 index 0000000000..621a307304 --- /dev/null +++ b/tests/manual/rhi/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from rhi.pro. + +add_subdirectory(hellominimalcrossgfxtriangle) +add_subdirectory(compressedtexture_bc1) +add_subdirectory(compressedtexture_bc1_subupload) +add_subdirectory(texuploads) +add_subdirectory(msaatexture) +add_subdirectory(msaarenderbuffer) +add_subdirectory(cubemap) +add_subdirectory(cubemap_scissor) +add_subdirectory(multiwindow) +add_subdirectory(multiwindow_threaded) +add_subdirectory(triquadcube) +add_subdirectory(offscreen) +add_subdirectory(floattexture) +add_subdirectory(mrt) +add_subdirectory(shadowmap) +add_subdirectory(computebuffer) +add_subdirectory(computeimage) +add_subdirectory(instancing) +if(QT_FEATURE_widgets) + add_subdirectory(qrhiprof) +endif() diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt new file mode 100644 index 0000000000..5da0ad2932 --- /dev/null +++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from compressedtexture_bc1.pro. + +##################################################################### +## compressedtexture_bc1 Binary: +##################################################################### + +add_qt_manual_test(compressedtexture_bc1 + GUI + SOURCES + compressedtexture_bc1.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/qt256_bc1_9mips.dds" + PROPERTIES QT_RESOURCE_ALIAS "qt256_bc1_9mips.dds" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(compressedtexture_bc1_resource_files + "../shared/qt256_bc1_9mips.dds" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(compressedtexture_bc1 "compressedtexture_bc1" + PREFIX + "/" + FILES + ${compressedtexture_bc1_resource_files} +) + + +#### Keys ignored in scope 1:.:.:compressedtexture_bc1.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt new file mode 100644 index 0000000000..bd82a5cb0d --- /dev/null +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from compressedtexture_bc1_subupload.pro. + +##################################################################### +## compressedtexture_bc1_subupload Binary: +##################################################################### + +add_qt_manual_test(compressedtexture_bc1_subupload + GUI + SOURCES + compressedtexture_bc1_subupload.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/bwqt224_64_nomips.dds" + PROPERTIES QT_RESOURCE_ALIAS "bwqt224_64_nomips.dds" +) +set_source_files_properties("../shared/qt256_bc1_9mips.dds" + PROPERTIES QT_RESOURCE_ALIAS "qt256_bc1_9mips.dds" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(compressedtexture_bc1_subupload_resource_files + "../shared/bwqt224_64_nomips.dds" + "../shared/qt256_bc1_9mips.dds" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(compressedtexture_bc1_subupload "compressedtexture_bc1_subupload" + PREFIX + "/" + FILES + ${compressedtexture_bc1_subupload_resource_files} +) + + +#### Keys ignored in scope 1:.:.:compressedtexture_bc1_subupload.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt new file mode 100644 index 0000000000..e2a959c1e4 --- /dev/null +++ b/tests/manual/rhi/computebuffer/CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from computebuffer.pro. + +##################################################################### +## computebuffer Binary: +##################################################################### + +add_qt_manual_test(computebuffer + GUI + SOURCES + computebuffer.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set(computebuffer_resource_files + "buffer.comp.qsb" + "main.frag.qsb" + "main.vert.qsb" +) + +add_qt_resource(computebuffer "computebuffer" + PREFIX + "/" + FILES + ${computebuffer_resource_files} +) + + +#### Keys ignored in scope 1:.:.:computebuffer.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt new file mode 100644 index 0000000000..a634f1cf98 --- /dev/null +++ b/tests/manual/rhi/computeimage/CMakeLists.txt @@ -0,0 +1,42 @@ +# Generated from computeimage.pro. + +##################################################################### +## computeimage Binary: +##################################################################### + +add_qt_manual_test(computeimage + GUI + SOURCES + computeimage.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/qt256.png" + PROPERTIES QT_RESOURCE_ALIAS "qt256.png" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(computeimage_resource_files + "../shared/qt256.png" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" + "image.comp.qsb" +) + +add_qt_resource(computeimage "computeimage" + PREFIX + "/" + FILES + ${computeimage_resource_files} +) + + +#### Keys ignored in scope 1:.:.:computeimage.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt new file mode 100644 index 0000000000..323ad78170 --- /dev/null +++ b/tests/manual/rhi/cubemap/CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from cubemap.pro. + +##################################################################### +## cubemap Binary: +##################################################################### + +add_qt_manual_test(cubemap + GUI + SOURCES + cubemap.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set(cubemap_resource_files + "c.png" + "cubemap.frag.qsb" + "cubemap.vert.qsb" +) + +add_qt_resource(cubemap "cubemap" + PREFIX + "/" + FILES + ${cubemap_resource_files} +) + + +#### Keys ignored in scope 1:.:.:cubemap.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt new file mode 100644 index 0000000000..519d9dc6ec --- /dev/null +++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from cubemap_scissor.pro. + +##################################################################### +## cubemap_scissor Binary: +##################################################################### + +add_qt_manual_test(cubemap_scissor + GUI + SOURCES + cubemap_scissor.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../cubemap/c.png" + PROPERTIES QT_RESOURCE_ALIAS "c.png" +) +set_source_files_properties("../cubemap/cubemap.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "cubemap.frag.qsb" +) +set_source_files_properties("../cubemap/cubemap.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "cubemap.vert.qsb" +) +set(cubemap_scissor_resource_files + "../cubemap/c.png" + "../cubemap/cubemap.frag.qsb" + "../cubemap/cubemap.vert.qsb" +) + +add_qt_resource(cubemap_scissor "cubemap_scissor" + PREFIX + "/" + FILES + ${cubemap_scissor_resource_files} +) + + +#### Keys ignored in scope 1:.:.:cubemap_scissor.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt new file mode 100644 index 0000000000..3368812524 --- /dev/null +++ b/tests/manual/rhi/floattexture/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from floattexture.pro. + +##################################################################### +## floattexture Binary: +##################################################################### + +add_qt_manual_test(floattexture + GUI + SOURCES + floattexture.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/OpenfootageNET_fieldairport-512.hdr" + PROPERTIES QT_RESOURCE_ALIAS "OpenfootageNET_fieldairport-512.hdr" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(floattexture_resource_files + "../shared/OpenfootageNET_fieldairport-512.hdr" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(floattexture "floattexture" + PREFIX + "/" + FILES + ${floattexture_resource_files} +) + + +#### Keys ignored in scope 1:.:.:floattexture.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt new file mode 100644 index 0000000000..8b9d3389f8 --- /dev/null +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from hellominimalcrossgfxtriangle.pro. + +##################################################################### +## hellominimalcrossgfxtriangle Binary: +##################################################################### + +add_qt_manual_test(hellominimalcrossgfxtriangle + SOURCES + hellowindow.cpp hellowindow.h + main.cpp + window.cpp window.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set(hellominimalcrossgfxtriangle_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" +) + +add_qt_resource(hellominimalcrossgfxtriangle "hellominimalcrossgfxtriangle" + PREFIX + "/" + FILES + ${hellominimalcrossgfxtriangle_resource_files} +) + + +#### Keys ignored in scope 1:.:.:hellominimalcrossgfxtriangle.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt new file mode 100644 index 0000000000..8c8d0c2a9a --- /dev/null +++ b/tests/manual/rhi/instancing/CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from instancing.pro. + +##################################################################### +## instancing Binary: +##################################################################### + +add_qt_manual_test(instancing + GUI + SOURCES + instancing.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set(instancing_resource_files + "inst.frag.qsb" + "inst.vert.qsb" +) + +add_qt_resource(instancing "instancing" + PREFIX + "/" + FILES + ${instancing_resource_files} +) + + +#### Keys ignored in scope 1:.:.:instancing.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt new file mode 100644 index 0000000000..db63ebe07d --- /dev/null +++ b/tests/manual/rhi/mrt/CMakeLists.txt @@ -0,0 +1,39 @@ +# Generated from mrt.pro. + +##################################################################### +## mrt Binary: +##################################################################### + +add_qt_manual_test(mrt + GUI + SOURCES + mrt.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(mrt_resource_files + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" + "mrt.frag.qsb" + "mrt.vert.qsb" +) + +add_qt_resource(mrt "mrt" + PREFIX + "/" + FILES + ${mrt_resource_files} +) + + +#### Keys ignored in scope 1:.:.:mrt.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt new file mode 100644 index 0000000000..26aa8798de --- /dev/null +++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from msaarenderbuffer.pro. + +##################################################################### +## msaarenderbuffer Binary: +##################################################################### + +add_qt_manual_test(msaarenderbuffer + GUI + SOURCES + msaarenderbuffer.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(msaarenderbuffer_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(msaarenderbuffer "msaarenderbuffer" + PREFIX + "/" + FILES + ${msaarenderbuffer_resource_files} +) + + +#### Keys ignored in scope 1:.:.:msaarenderbuffer.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt new file mode 100644 index 0000000000..5a3c447db4 --- /dev/null +++ b/tests/manual/rhi/msaatexture/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from msaatexture.pro. + +##################################################################### +## msaatexture Binary: +##################################################################### + +add_qt_manual_test(msaatexture + GUI + SOURCES + msaatexture.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set_source_files_properties("../shared/texture_ms4.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture_ms4.frag.qsb" +) +set(msaatexture_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" + "../shared/texture_ms4.frag.qsb" +) + +add_qt_resource(msaatexture "msaatexture" + PREFIX + "/" + FILES + ${msaatexture_resource_files} +) + + +#### Keys ignored in scope 1:.:.:msaatexture.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt new file mode 100644 index 0000000000..a3e63b9d06 --- /dev/null +++ b/tests/manual/rhi/multiwindow/CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from multiwindow.pro. + +##################################################################### +## multiwindow Binary: +##################################################################### + +add_qt_manual_test(multiwindow + GUI + SOURCES + multiwindow.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set(multiwindow_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" +) + +add_qt_resource(multiwindow "multiwindow" + PREFIX + "/" + FILES + ${multiwindow_resource_files} +) + + +#### Keys ignored in scope 1:.:.:multiwindow.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt new file mode 100644 index 0000000000..f3f220dba6 --- /dev/null +++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt @@ -0,0 +1,43 @@ +# Generated from multiwindow_threaded.pro. + +##################################################################### +## multiwindow_threaded Binary: +##################################################################### + +add_qt_manual_test(multiwindow_threaded + GUI + SOURCES + multiwindow_threaded.cpp + window.cpp window.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +# Resources: +set_source_files_properties("../shared/qt256.png" + PROPERTIES QT_RESOURCE_ALIAS "qt256.png" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(multiwindow_threaded_resource_files + "../shared/qt256.png" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(multiwindow_threaded "multiwindow_threaded" + PREFIX + "/" + FILES + ${multiwindow_threaded_resource_files} +) + + +#### Keys ignored in scope 1:.:.:multiwindow_threaded.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt new file mode 100644 index 0000000000..56a9f2661d --- /dev/null +++ b/tests/manual/rhi/offscreen/CMakeLists.txt @@ -0,0 +1,36 @@ +# Generated from offscreen.pro. + +##################################################################### +## offscreen Binary: +##################################################################### + +add_qt_manual_test(offscreen + SOURCES + offscreen.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set(offscreen_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" +) + +add_qt_resource(offscreen "offscreen" + PREFIX + "/" + FILES + ${offscreen_resource_files} +) + + +#### Keys ignored in scope 1:.:.:offscreen.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt new file mode 100644 index 0000000000..8f4fb3797b --- /dev/null +++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qrhiprof.pro. + +##################################################################### +## qrhiprof Binary: +##################################################################### + +add_qt_manual_test(qrhiprof + GUI + SOURCES + qrhiprof.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Network + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qrhiprof.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt new file mode 100644 index 0000000000..d2de92d094 --- /dev/null +++ b/tests/manual/rhi/shadowmap/CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from shadowmap.pro. + +##################################################################### +## shadowmap Binary: +##################################################################### + +add_qt_manual_test(shadowmap + GUI + SOURCES + shadowmap.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set(shadowmap_resource_files + "main.frag.qsb" + "main.vert.qsb" + "shadowmap.frag.qsb" + "shadowmap.vert.qsb" +) + +add_qt_resource(shadowmap "shadowmap" + PREFIX + "/" + FILES + ${shadowmap_resource_files} +) + + +#### Keys ignored in scope 1:.:.:shadowmap.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt new file mode 100644 index 0000000000..2e97336a9d --- /dev/null +++ b/tests/manual/rhi/texuploads/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from texuploads.pro. + +##################################################################### +## texuploads Binary: +##################################################################### + +add_qt_manual_test(texuploads + GUI + SOURCES + texuploads.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/qt256.png" + PROPERTIES QT_RESOURCE_ALIAS "qt256.png" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(texuploads_resource_files + "../shared/qt256.png" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(texuploads "texuploads" + PREFIX + "/" + FILES + ${texuploads_resource_files} +) + + +#### Keys ignored in scope 1:.:.:texuploads.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt new file mode 100644 index 0000000000..42ebf1f55f --- /dev/null +++ b/tests/manual/rhi/triquadcube/CMakeLists.txt @@ -0,0 +1,53 @@ +# Generated from triquadcube.pro. + +##################################################################### +## triquadcube Binary: +##################################################################### + +add_qt_manual_test(triquadcube + GUI + SOURCES + quadrenderer.cpp quadrenderer.h + texturedcuberenderer.cpp texturedcuberenderer.h + triangleoncuberenderer.cpp triangleoncuberenderer.h + trianglerenderer.cpp trianglerenderer.h + triquadcube.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set_source_files_properties("../shared/qt256.png" + PROPERTIES QT_RESOURCE_ALIAS "qt256.png" +) +set_source_files_properties("../shared/texture.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.frag.qsb" +) +set_source_files_properties("../shared/texture.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "texture.vert.qsb" +) +set(triquadcube_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" + "../shared/qt256.png" + "../shared/texture.frag.qsb" + "../shared/texture.vert.qsb" +) + +add_qt_resource(triquadcube "triquadcube" + PREFIX + "/" + FILES + ${triquadcube_resource_files} +) + + +#### Keys ignored in scope 1:.:.:triquadcube.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/shortcuts/CMakeLists.txt b/tests/manual/shortcuts/CMakeLists.txt new file mode 100644 index 0000000000..c4ac6b040b --- /dev/null +++ b/tests/manual/shortcuts/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from shortcuts.pro. + +##################################################################### +## shortcuts Binary: +##################################################################### + +add_qt_manual_test(shortcuts + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:shortcuts.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..61635f7e77 --- /dev/null +++ b/tests/manual/socketengine/.prev_CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from socketengine.pro. + +##################################################################### +## tst_socketengine Binary: +##################################################################### + +add_qt_manual_test(tst_socketengine + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt new file mode 100644 index 0000000000..927955c3db --- /dev/null +++ b/tests/manual/socketengine/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from socketengine.pro. + +##################################################################### +## tst_socketengine Binary: +##################################################################### + +# special case begin +if (NOT QT_FEATURE_private_tests) + return() +endif() +# special case end + +add_qt_manual_test(tst_socketengine + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + Qt::Test +) + +#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/socketengine/main.cpp b/tests/manual/socketengine/main.cpp index 3e3e7e53e5..46d62b9a9c 100644 --- a/tests/manual/socketengine/main.cpp +++ b/tests/manual/socketengine/main.cpp @@ -36,9 +36,6 @@ #include <QDebug> #include <private/qabstractsocketengine_p.h> #include <cstdio> -#include <QNetworkConfigurationManager> -#include <QNetworkConfiguration> -#include <QNetworkSession> #include <QCoreApplication> const int bufsize = 16*1024; diff --git a/tests/manual/textrendering/CMakeLists.txt b/tests/manual/textrendering/CMakeLists.txt new file mode 100644 index 0000000000..788f9fc34f --- /dev/null +++ b/tests/manual/textrendering/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from textrendering.pro. + +add_subdirectory(glyphshaping) +add_subdirectory(textperformance) +add_subdirectory(nativetext) diff --git a/tests/manual/textrendering/glyphshaping/CMakeLists.txt b/tests/manual/textrendering/glyphshaping/CMakeLists.txt new file mode 100644 index 0000000000..891503dea1 --- /dev/null +++ b/tests/manual/textrendering/glyphshaping/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from glyphshaping.pro. + +##################################################################### +## glyphshaping Binary: +##################################################################### + +add_qt_manual_test(glyphshaping + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:glyphshaping.pro:<TRUE>: +# DEPLOYMENT = "glyphshaping_data" +# glyphshaping_data.files = "$$PWD/glyphshaping_data.xml" +# glyphshaping_data.path = "." diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt new file mode 100644 index 0000000000..c03a8ed288 --- /dev/null +++ b/tests/manual/textrendering/nativetext/CMakeLists.txt @@ -0,0 +1,28 @@ +# Generated from nativetext.pro. + +##################################################################### +## nativetext Binary: +##################################################################### + +add_qt_manual_test(nativetext + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +## Scopes: +##################################################################### + +extend_target(nativetext CONDITION APPLE + PUBLIC_LIBRARIES + ${FWAppKit} + ${FWCoreGraphics} + ${FWFoundation} + COMPILE_OPTIONS + -x + objective-c++ +) diff --git a/tests/manual/textrendering/textperformance/CMakeLists.txt b/tests/manual/textrendering/textperformance/CMakeLists.txt new file mode 100644 index 0000000000..cf21b4ecac --- /dev/null +++ b/tests/manual/textrendering/textperformance/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from textperformance.pro. + +##################################################################### +## textperformance Binary: +##################################################################### + +add_qt_manual_test(textperformance + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt new file mode 100644 index 0000000000..5f7e9ec286 --- /dev/null +++ b/tests/manual/touch/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from touch.pro. + +##################################################################### +## touch Binary: +##################################################################### + +add_qt_manual_test(touch + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:touch.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index a244230a22..8572e18955 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.cpp @@ -526,7 +526,7 @@ void MainWindow::updateScreenLabel() const QRect geometry = screen->geometry(); const qreal dpr = screen->devicePixelRatio(); str << '"' << screen->name() << "\" " << geometry.width() << 'x' << geometry.height() - << forcesign << geometry.x() << geometry.y() << noforcesign; + << Qt::forcesign << geometry.x() << geometry.y() << Qt::noforcesign; if (!qFuzzyCompare(dpr, qreal(1))) str << ", dpr=" << dpr; m_screenLabel->setText(text); diff --git a/tests/manual/touch/touch.pro b/tests/manual/touch/touch.pro index fcb3c47f43..08e3fdcd71 100644 --- a/tests/manual/touch/touch.pro +++ b/tests/manual/touch/touch.pro @@ -1,5 +1,4 @@ TEMPLATE = app -QT = core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT = core gui widgets CONFIG -= app_bundle SOURCES += main.cpp diff --git a/tests/manual/touchGraphicsItem/CMakeLists.txt b/tests/manual/touchGraphicsItem/CMakeLists.txt new file mode 100644 index 0000000000..cc02dcdab2 --- /dev/null +++ b/tests/manual/touchGraphicsItem/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from touchGraphicsItem.pro. + +##################################################################### +## touchGraphicsItem Binary: +##################################################################### + +add_qt_manual_test(touchGraphicsItem + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:touchGraphicsItem.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/transientwindow/CMakeLists.txt b/tests/manual/transientwindow/CMakeLists.txt new file mode 100644 index 0000000000..0356bdcd02 --- /dev/null +++ b/tests/manual/transientwindow/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from transientwindow.pro. + +##################################################################### +## transientwindow Binary: +##################################################################### + +add_qt_manual_test(transientwindow + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:transientwindow.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt new file mode 100644 index 0000000000..f3ebfb28a9 --- /dev/null +++ b/tests/manual/triangulator/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from triangulator.pro. + +##################################################################### +## triangulator Binary: +##################################################################### + +add_qt_manual_test(triangulator + GUI + SOURCES + main.cpp + triviswidget.cpp triviswidget.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:triangulator.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/unc/CMakeLists.txt b/tests/manual/unc/CMakeLists.txt new file mode 100644 index 0000000000..f63ffe34ad --- /dev/null +++ b/tests/manual/unc/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from unc.pro. + +##################################################################### +## unc Binary: +##################################################################### + +add_qt_manual_test(unc + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:unc.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/unc/unc.pro b/tests/manual/unc/unc.pro index 977bd0c177..a1536a03db 100644 --- a/tests/manual/unc/unc.pro +++ b/tests/manual/unc/unc.pro @@ -1,5 +1,4 @@ -QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TEMPLATE = app diff --git a/tests/manual/widgetgrab/CMakeLists.txt b/tests/manual/widgetgrab/CMakeLists.txt new file mode 100644 index 0000000000..a556388207 --- /dev/null +++ b/tests/manual/widgetgrab/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from widgetgrab.pro. + +##################################################################### +## widgetgrab Binary: +##################################################################### + +add_qt_manual_test(widgetgrab + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:widgetgrab.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgetgrab/widgetgrab.pro b/tests/manual/widgetgrab/widgetgrab.pro index d206fb1df1..c354711197 100644 --- a/tests/manual/widgetgrab/widgetgrab.pro +++ b/tests/manual/widgetgrab/widgetgrab.pro @@ -1,9 +1,5 @@ -QT += core gui +QT += core gui widgets TARGET = widgetgrab TEMPLATE = app SOURCES += main.cpp - -greaterThan(QT_MAJOR_VERSION, 4) { - QT += widgets -} diff --git a/tests/manual/widgets/CMakeLists.txt b/tests/manual/widgets/CMakeLists.txt new file mode 100644 index 0000000000..ac50f6c1ae --- /dev/null +++ b/tests/manual/widgets/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from widgets.pro. + +add_subdirectory(itemviews) +add_subdirectory(qgraphicsview) +add_subdirectory(kernel) +add_subdirectory(widgets) +add_subdirectory(styles) diff --git a/tests/manual/widgets/itemviews/CMakeLists.txt b/tests/manual/widgets/itemviews/CMakeLists.txt new file mode 100644 index 0000000000..2e6a7e563b --- /dev/null +++ b/tests/manual/widgets/itemviews/CMakeLists.txt @@ -0,0 +1,8 @@ +# Generated from itemviews.pro. + +add_subdirectory(delegate) +add_subdirectory(qconcatenatetablesproxymodel) +add_subdirectory(qheaderview) +add_subdirectory(qtreeview) +add_subdirectory(qtreewidget) +add_subdirectory(tableview-span-navigation) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt new file mode 100644 index 0000000000..8d5730267d --- /dev/null +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablehorz/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from testtable1.pro. + +##################################################################### +## testtable1 Binary: +##################################################################### + +add_qt_manual_test(testtable1 + GUI + SOURCES + testtable1.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt new file mode 100644 index 0000000000..ed9f5c98eb --- /dev/null +++ b/tests/manual/widgets/itemviews/autoResizePrecision/tablevert/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from testtable2.pro. + +##################################################################### +## testtable2 Binary: +##################################################################### + +add_qt_manual_test(testtable2 + GUI + SOURCES + testtable2.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt new file mode 100644 index 0000000000..33073d3a42 --- /dev/null +++ b/tests/manual/widgets/itemviews/autoResizePrecision/treeview/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from testtree.pro. + +##################################################################### +## testtree Binary: +##################################################################### + +add_qt_manual_test(testtree + GUI + SOURCES + testtree.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/widgets/itemviews/delegate/CMakeLists.txt b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt new file mode 100644 index 0000000000..533cf4913e --- /dev/null +++ b/tests/manual/widgets/itemviews/delegate/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from delegate.pro. + +##################################################################### +## delegate Binary: +##################################################################### + +add_qt_manual_test(delegate + GUI + SOURCES + example.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:delegate.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt new file mode 100644 index 0000000000..21c7ed431e --- /dev/null +++ b/tests/manual/widgets/itemviews/qconcatenatetablesproxymodel/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qconcatenatetablesproxymodel.pro. + +##################################################################### +## qconcatenatetablesproxymodel Binary: +##################################################################### + +add_qt_manual_test(qconcatenatetablesproxymodel + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qconcatenatetablesproxymodel.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt new file mode 100644 index 0000000000..eeb9913126 --- /dev/null +++ b/tests/manual/widgets/itemviews/qheaderview/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qheaderview.pro. + +##################################################################### +## qheaderview Binary: +##################################################################### + +add_qt_manual_test(qheaderview + GUI + SOURCES + qheaderviewtest1.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qheaderview.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt new file mode 100644 index 0000000000..ff69f09cf0 --- /dev/null +++ b/tests/manual/widgets/itemviews/qtreeview/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from qtreeview.pro. + +##################################################################### +## qtreeview Binary: +##################################################################### + +add_qt_manual_test(qtreeview + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qtreeview.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt new file mode 100644 index 0000000000..f6b1a2f7eb --- /dev/null +++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qtreewidget.pro. + +##################################################################### +## qtreewidget Binary: +##################################################################### + +add_qt_manual_test(qtreewidget + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:qtreewidget.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt new file mode 100644 index 0000000000..f9efb5373d --- /dev/null +++ b/tests/manual/widgets/itemviews/tableview-span-navigation/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from tableview-span-navigation.pro. + +##################################################################### +## tableview-span-navigation Binary: +##################################################################### + +add_qt_manual_test(tableview-span-navigation + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:tableview-span-navigation.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/kernel/CMakeLists.txt b/tests/manual/widgets/kernel/CMakeLists.txt new file mode 100644 index 0000000000..9be003391d --- /dev/null +++ b/tests/manual/widgets/kernel/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from kernel.pro. + +# add_subdirectory(qtooltip) # special case broken in dev +add_subdirectory(sizeonhide) +add_subdirectory(layoutreplace) diff --git a/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt new file mode 100644 index 0000000000..04b36ee4e3 --- /dev/null +++ b/tests/manual/widgets/kernel/layoutreplace/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from layoutreplace.pro. + +##################################################################### +## layoutreplace Binary: +##################################################################### + +add_qt_manual_test(layoutreplace + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt new file mode 100644 index 0000000000..2b30e5eeec --- /dev/null +++ b/tests/manual/widgets/kernel/qtooltip/CMakeLists.txt @@ -0,0 +1,14 @@ +# Generated from qtooltip.pro. + +##################################################################### +## qtooltip Binary: +##################################################################### + +add_qt_manual_test(qtooltip + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Test + Qt::Widgets +) diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt new file mode 100644 index 0000000000..b1f8353a4f --- /dev/null +++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from sizeonhide.pro. + +##################################################################### +## sizeonhide Binary: +##################################################################### + +add_qt_manual_test(sizeonhide + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:sizeonhide.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/qgraphicsview/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/CMakeLists.txt new file mode 100644 index 0000000000..5fd7e47ccd --- /dev/null +++ b/tests/manual/widgets/qgraphicsview/CMakeLists.txt @@ -0,0 +1,3 @@ +# Generated from qgraphicsview.pro. + +add_subdirectory(rubberband) diff --git a/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt new file mode 100644 index 0000000000..726404679e --- /dev/null +++ b/tests/manual/widgets/qgraphicsview/rubberband/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from rubberband.pro. + +##################################################################### +## rubberband Binary: +##################################################################### + +add_qt_manual_test(rubberband + GUI + SOURCES + rubberbandtest.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:rubberband.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/styles/CMakeLists.txt b/tests/manual/widgets/styles/CMakeLists.txt new file mode 100644 index 0000000000..26fa8317cc --- /dev/null +++ b/tests/manual/widgets/styles/CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from styles.pro. + +##################################################################### +## tst_manual_styles Binary: +##################################################################### + +add_qt_manual_test(tst_manual_styles + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:styles.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/styles/styles.pro b/tests/manual/widgets/styles/styles.pro index d302ae0691..1830e21705 100644 --- a/tests/manual/widgets/styles/styles.pro +++ b/tests/manual/widgets/styles/styles.pro @@ -1,5 +1,6 @@ TEMPLATE = app QT = widgets +TARGET = tst_manual_styles CONFIG += cmdline CONFIG += c++11 diff --git a/tests/manual/widgets/widgets.pro b/tests/manual/widgets/widgets.pro index e3942a49e9..03aaa880b8 100644 --- a/tests/manual/widgets/widgets.pro +++ b/tests/manual/widgets/widgets.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -SUBDIRS = itemviews qgraphicsview kernel widgets -greaterThan(QT_MAJOR_VERSION, 4): SUBDIRS += styles +SUBDIRS = itemviews qgraphicsview kernel widgets styles diff --git a/tests/manual/widgets/widgets/CMakeLists.txt b/tests/manual/widgets/widgets/CMakeLists.txt new file mode 100644 index 0000000000..d760abdd59 --- /dev/null +++ b/tests/manual/widgets/widgets/CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from widgets.pro. + +add_subdirectory(bigmenucreator) +add_subdirectory(defaultUpMenuBar) +add_subdirectory(multiscreen-menus) +add_subdirectory(qtoolbutton/menuOnMultiScreens) diff --git a/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt new file mode 100644 index 0000000000..f0161997c0 --- /dev/null +++ b/tests/manual/widgets/widgets/bigmenucreator/CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from bigmenucreator.pro. + +##################################################################### +## BigMenuCreator Binary: +##################################################################### + +add_qt_manual_test(BigMenuCreator + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + DEFINES + QT_DEPRECATED_WARNINGS + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:bigmenucreator.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro index 69fbea3834..408dab6482 100644 --- a/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro +++ b/tests/manual/widgets/widgets/bigmenucreator/bigmenucreator.pro @@ -4,9 +4,7 @@ # #------------------------------------------------- -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = BigMenuCreator TEMPLATE = app diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt new file mode 100644 index 0000000000..8d86672327 --- /dev/null +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from defaultUpMenuBar.pro. + +##################################################################### +## defaultUpMenuBar Binary: +##################################################################### + +add_qt_manual_test(defaultUpMenuBar + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:defaultUpMenuBar.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt new file mode 100644 index 0000000000..b750431d58 --- /dev/null +++ b/tests/manual/widgets/widgets/multiscreen-menus/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from multiscreen-menus.pro. + +##################################################################### +## multiscreen-menus Binary: +##################################################################### + +add_qt_manual_test(multiscreen-menus + GUI + SOURCES + main.cpp + mainwindow.cpp mainwindow.h mainwindow.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) + +#### Keys ignored in scope 1:.:.:multiscreen-menus.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt new file mode 100644 index 0000000000..461b595a68 --- /dev/null +++ b/tests/manual/widgets/widgets/qmainwindow/saveStateSize/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from saveStateSize.pro. + +##################################################################### +## saveStateSize Binary: +##################################################################### + +add_qt_manual_test(saveStateSize + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:saveStateSize.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt new file mode 100644 index 0000000000..f49d630de7 --- /dev/null +++ b/tests/manual/widgets/widgets/qtoolbutton/menuOnMultiScreens/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from menuOnMultiScreens.pro. + +##################################################################### +## menuOnMultiScreens Binary: +##################################################################### + +add_qt_manual_test(menuOnMultiScreens + GUI + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:menuOnMultiScreens.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/windowchildgeometry/CMakeLists.txt b/tests/manual/windowchildgeometry/CMakeLists.txt new file mode 100644 index 0000000000..e6f7c232a3 --- /dev/null +++ b/tests/manual/windowchildgeometry/CMakeLists.txt @@ -0,0 +1,23 @@ +# Generated from windowchildgeometry.pro. + +##################################################################### +## windowchildgeometry Binary: +##################################################################### + +add_qt_manual_test(windowchildgeometry + GUI + SOURCES + ../windowflags/controls.cpp ../windowflags/controls.h + controllerwidget.cpp controllerwidget.h + main.cpp + DEFINES + QT_DISABLE_DEPRECATED_BEFORE=0 + INCLUDE_DIRECTORIES + ../windowflags + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:windowchildgeometry.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/windowchildgeometry/windowchildgeometry.pro b/tests/manual/windowchildgeometry/windowchildgeometry.pro index 921acd8a4e..7722547ce7 100644 --- a/tests/manual/windowchildgeometry/windowchildgeometry.pro +++ b/tests/manual/windowchildgeometry/windowchildgeometry.pro @@ -1,5 +1,4 @@ -QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = windowchildgeometry TEMPLATE = app diff --git a/tests/manual/windowflags/CMakeLists.txt b/tests/manual/windowflags/CMakeLists.txt new file mode 100644 index 0000000000..1aba06d9a1 --- /dev/null +++ b/tests/manual/windowflags/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from windowflags.pro. + +##################################################################### +## tst_manual_windowflags Binary: +##################################################################### + +add_qt_manual_test(tst_manual_windowflags + GUI + SOURCES + controllerwindow.cpp controllerwindow.h + controls.cpp controls.h + main.cpp + previewwindow.cpp previewwindow.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/windowflags/previewwindow.cpp b/tests/manual/windowflags/previewwindow.cpp index ef3966830b..893dbc9a41 100644 --- a/tests/manual/windowflags/previewwindow.cpp +++ b/tests/manual/windowflags/previewwindow.cpp @@ -48,7 +48,8 @@ void PreviewWindow::paintEvent(QPaintEvent *event) static void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags) { - str << "Window flags: " << hex << showbase << unsigned(flags) << noshowbase << dec << ' '; + str << "Window flags: " << Qt::hex << Qt::showbase << unsigned(flags) << Qt::noshowbase + << Qt::dec << ' '; switch (flags & Qt::WindowType_Mask) { case Qt::Window: str << "Qt::Window"; @@ -125,7 +126,8 @@ static void formatWindowFlags(QTextStream &str, Qt::WindowFlags flags) static void formatWindowStates(QTextStream &str, Qt::WindowStates states) { - str << "Window states: " << hex << showbase << unsigned(states) << noshowbase << dec << ' '; + str << "Window states: " << Qt::hex << Qt::showbase << unsigned(states) << Qt::noshowbase + << Qt::dec << ' '; if (states & Qt::WindowActive) { str << "Qt::WindowActive "; states &= ~Qt::WindowActive; @@ -150,7 +152,7 @@ static void formatWindowStates(QTextStream &str, Qt::WindowStates states) QTextStream &operator<<(QTextStream &str, const QRect &r) { - str << r.width() << 'x' << r.height() << forcesign << r.x() << r.y() << noforcesign; + str << r.width() << 'x' << r.height() << Qt::forcesign << r.x() << r.y() << Qt::noforcesign; return str; } diff --git a/tests/manual/windowflags/windowflags.pro b/tests/manual/windowflags/windowflags.pro index ba0f75b65c..4cd60ae6cf 100644 --- a/tests/manual/windowflags/windowflags.pro +++ b/tests/manual/windowflags/windowflags.pro @@ -1,3 +1,5 @@ +TARGET = tst_manual_windowflags + HEADERS = controllerwindow.h \ previewwindow.h \ controls.h @@ -7,4 +9,4 @@ SOURCES = controllerwindow.cpp \ main.cpp \ controls.cpp -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += widgets diff --git a/tests/manual/windowgeometry/CMakeLists.txt b/tests/manual/windowgeometry/CMakeLists.txt new file mode 100644 index 0000000000..adeae599fc --- /dev/null +++ b/tests/manual/windowgeometry/CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from windowgeometry.pro. + +##################################################################### +## windowgeometry Binary: +##################################################################### + +add_qt_manual_test(windowgeometry + GUI + SOURCES + ../windowflags/controls.cpp ../windowflags/controls.h + controllerwidget.cpp controllerwidget.h + main.cpp + INCLUDE_DIRECTORIES + ../windowflags + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:windowgeometry.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/windowgeometry/windowgeometry.pro b/tests/manual/windowgeometry/windowgeometry.pro index e717799649..ee99f1950c 100644 --- a/tests/manual/windowgeometry/windowgeometry.pro +++ b/tests/manual/windowgeometry/windowgeometry.pro @@ -1,5 +1,4 @@ -QT += core gui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets TARGET = windowgeometry TEMPLATE = app diff --git a/tests/manual/windowmodality/CMakeLists.txt b/tests/manual/windowmodality/CMakeLists.txt new file mode 100644 index 0000000000..67e6071add --- /dev/null +++ b/tests/manual/windowmodality/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from windowmodality.pro. + +##################################################################### +## windowmodality Binary: +##################################################################### + +add_qt_manual_test(windowmodality + GUI + SOURCES + dialog.ui + main.cpp + widget.ui + PUBLIC_LIBRARIES + Qt::Gui + Qt::PrintSupport + Qt::Widgets + ENABLE_AUTOGEN_TOOLS + uic +) diff --git a/tests/manual/windowmodality/windowmodality.pro b/tests/manual/windowmodality/windowmodality.pro index b29e939d27..973579c508 100644 --- a/tests/manual/windowmodality/windowmodality.pro +++ b/tests/manual/windowmodality/windowmodality.pro @@ -1,3 +1,3 @@ SOURCES = main.cpp FORMS = widget.ui dialog.ui -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport +QT += widgets printsupport diff --git a/tests/manual/windowtransparency/CMakeLists.txt b/tests/manual/windowtransparency/CMakeLists.txt new file mode 100644 index 0000000000..42de6d67c6 --- /dev/null +++ b/tests/manual/windowtransparency/CMakeLists.txt @@ -0,0 +1,13 @@ +# Generated from windowtransparency.pro. + +##################################################################### +## windowtransparency Binary: +##################################################################### + +add_qt_manual_test(windowtransparency + SOURCES + windowtransparency.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt new file mode 100644 index 0000000000..e92e47fb8a --- /dev/null +++ b/tests/manual/xcb_gl_integration/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from xcb_gl_integration.pro. + +##################################################################### +## xcb_gl_integration Binary: +##################################################################### + +add_qt_manual_test(xcb_gl_integration + GUI + SOURCES + main.cpp + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:xcb_gl_integration.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/xembed-raster/CMakeLists.txt b/tests/manual/xembed-raster/CMakeLists.txt new file mode 100644 index 0000000000..6c8996e9c1 --- /dev/null +++ b/tests/manual/xembed-raster/CMakeLists.txt @@ -0,0 +1,17 @@ +# Generated from xembed-raster.pro. + +##################################################################### +## tst_manual_rasterwindow Binary: +##################################################################### + +add_qt_manual_test(tst_manual_rasterwindow + GUI + SOURCES + main.cpp + rasterwindow.cpp rasterwindow.h + PUBLIC_LIBRARIES + Qt::Gui +) + +#### Keys ignored in scope 1:.:.:xembed-raster.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/xembed-raster/xembed-raster.pro b/tests/manual/xembed-raster/xembed-raster.pro index adaf9c4d25..4c9fee07b8 100644 --- a/tests/manual/xembed-raster/xembed-raster.pro +++ b/tests/manual/xembed-raster/xembed-raster.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET= rasterwindow +TARGET= tst_manual_rasterwindow QT += gui SOURCES += \ diff --git a/tests/manual/xembed-widgets/CMakeLists.txt b/tests/manual/xembed-widgets/CMakeLists.txt new file mode 100644 index 0000000000..ed8c5355a9 --- /dev/null +++ b/tests/manual/xembed-widgets/CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from xembed-widgets.pro. + +##################################################################### +## tst_manual_lineedits Binary: +##################################################################### + +add_qt_manual_test(tst_manual_lineedits + GUI + SOURCES + main.cpp + window.cpp window.h + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets +) + +#### Keys ignored in scope 1:.:.:xembed-widgets.pro:<TRUE>: +# TEMPLATE = "app" diff --git a/tests/manual/xembed-widgets/xembed-widgets.pro b/tests/manual/xembed-widgets/xembed-widgets.pro index e406ee47fd..28d13d5b61 100644 --- a/tests/manual/xembed-widgets/xembed-widgets.pro +++ b/tests/manual/xembed-widgets/xembed-widgets.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET= lineedits +TARGET= tst_manual_lineedits QT += widgets SOURCES += \ |