diff options
| -rw-r--r-- | mkspecs/features/data/headersclean/tst_headersclean.cpp.in | 47 | ||||
| -rw-r--r-- | mkspecs/features/qt_headersclean.prf | 47 | ||||
| -rw-r--r-- | tests/auto/other/headersclean/headersclean.pro | 3 | ||||
| -rw-r--r-- | tests/auto/other/other.pro | 5 |
4 files changed, 0 insertions, 102 deletions
diff --git a/mkspecs/features/data/headersclean/tst_headersclean.cpp.in b/mkspecs/features/data/headersclean/tst_headersclean.cpp.in deleted file mode 100644 index 14655a2f98..0000000000 --- a/mkspecs/features/data/headersclean/tst_headersclean.cpp.in +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#define signals int -#define slots int -#define emit public:; -#define foreach public:; -#define forever public:; - -$${includes} -#include <QtCore/qglobal.h> - -int main(int, char **) -{ - qWarning(\"This is a compile test only\"); - return 0; -} diff --git a/mkspecs/features/qt_headersclean.prf b/mkspecs/features/qt_headersclean.prf deleted file mode 100644 index 06a20ad2c0..0000000000 --- a/mkspecs/features/qt_headersclean.prf +++ /dev/null @@ -1,47 +0,0 @@ -# The headersclean test attempts to ensure all public Qt headers -# abide by various rules. -# -# To use this test, create a project which contains nothing else than a -# QT= line with the modules you want to test (no presence conditionals needed), -# followed by load(qt_headersclean). - -*-g++*: QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror - -# The flags here come from http://wiki.qt.io/Coding_Conventions#Conventions_for_public_header_files -# -Wold-style-cast cannot be used, /usr/include/bits/byteswap.h defines the macro bswap_16 using C style casts :( -# -Wfloat-equal cannot be used, qrect.h and qvector2d.h do exact comparisons in isNull and operator==. Would need #pragmas. -*-g++*: QMAKE_CXXFLAGS += -Woverloaded-virtual -Wshadow -Wundef - -# Other nice flags -*-g++*: QMAKE_CXXFLAGS += -Wnon-virtual-dtor -ansi -Wchar-subscripts -Wpointer-arith -Wformat-security - -# Enable pedantic mode, but accept variadic macros and 'long long' usage. -*-g++*: QMAKE_CXXFLAGS += -Wno-long-long -Wno-variadic-macros -pedantic-errors - -QMAKE_CXXFLAGS += -DQT_NO_CAST_TO_ASCII \ - -DQT_NO_CAST_FROM_ASCII \ - -DQT_STRICT_ITERATORS \ - -DQT_NO_URL_CAST_FROM_STRING \ - -DQT_NO_CAST_FROM_BYTEARRAY \ - -DQT_NO_KEYWORDS \ - -DQT_USE_FAST_CONCATENATION \ - -DQT_USE_FAST_OPERATOR_PLUS - -TARGET = tst_headersclean - -includes = -for(q, QT) { - sq = $$replace(q, -private\$, ) - qn = $$eval(QT.$${sq}.name) - isEmpty(qn): \ - QT -= $$q - else: \ - includes += "$${LITERAL_HASH}include <$$qn/$$qn>" -} -includes = $$join(includes, $$escape_expand(\\n)) - -testfile.input = $$PWD/data/headersclean/tst_headersclean.cpp.in -testfile.output = $$OUT_PWD/tst_headersclean.cpp -QMAKE_SUBSTITUTES += testfile - -SOURCES += $$testfile.output diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro deleted file mode 100644 index 73e0c5dd56..0000000000 --- a/tests/auto/other/headersclean/headersclean.pro +++ /dev/null @@ -1,3 +0,0 @@ -QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport-private -load(qt_headersclean) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 6e8f1e3c9c..a5ed4c5f31 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -4,7 +4,6 @@ SUBDIRS=\ baselineexample \ compiler \ gestures \ - headersclean \ lancelot \ languagechange \ macgui \ @@ -29,7 +28,6 @@ SUBDIRS=\ !qtHaveModule(widgets): SUBDIRS -= \ baselineexample \ gestures \ - headersclean \ lancelot \ languagechange \ modeltest \ @@ -44,14 +42,11 @@ SUBDIRS=\ !qtHaveModule(network): SUBDIRS -= \ baselineexample \ - headersclean \ lancelot \ networkselftest \ qnetworkaccessmanager_and_qprogressdialog \ qobjectperformance -testcocoon: SUBDIRS -= headersclean - cross_compile: SUBDIRS -= \ atwrapper \ compiler |