qpa api: replace QPA headers with something more benign
The current 'we mean it' headers are considered too aggressive for QPA. Replaced using the following script. for file in `find -type f -name "qplatform*.h" -and -not -name "*_p.h"`; do LINE_NO_1=`grep -n -m 1 "W A R N I N G" $file | awk -F ':' '{print $1}'` LINE_NO_2=`grep -n -m 1 "We mean it." $file | awk -F ':' '{print $1}'` if [ -z "$LINE_NO_1" ]; then LINE_NO_1=`grep -n -m 1 "#define " $file | awk -F ':' '{print $1}'` LINE_NO_2=$((1+$LINE_NO_1)) else LINE_NO_1=$(($LINE_NO_1-2)) LINE_NO_2=$(($LINE_NO_2+2)) fi head -n $LINE_NO_1 $file > $file.new cat >> $file.new <<EOF // // W A R N I N G // ------------- // // This file is part of the QPA API and is not meant to be used // in applications. Usage of this API may make your code // source and binary incompatible with future versions of Qt. // EOF tail -n +$LINE_NO_2 $file >> $file.new mv $file.new $file done Change-Id: I8a974c9bf8942647b7ad950afb372c1f738aa725 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
parent
ec2245158f
commit
6af65edcb6
@ -45,11 +45,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtGui/qpixmap.h>
|
#include <QtGui/qpixmap.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <qplatformdefs.h>
|
#include <qplatformdefs.h>
|
||||||
|
@ -45,11 +45,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/QList>
|
#include <QtCore/QList>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qglobal.h>
|
#include <QtCore/qglobal.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtGui/qinputpanel.h>
|
#include <QtGui/qinputpanel.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtGui/qwindowdefs.h>
|
#include <QtGui/qwindowdefs.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qplugin.h>
|
#include <QtCore/qplugin.h>
|
||||||
|
8
src/gui/kernel/qplatformmenu.h
Executable file → Normal file
8
src/gui/kernel/qplatformmenu.h
Executable file → Normal file
@ -42,6 +42,14 @@
|
|||||||
|
|
||||||
#ifndef QPLATFORMMENU_H
|
#ifndef QPLATFORMMENU_H
|
||||||
#define QPLATFORMMENU_H
|
#define QPLATFORMMENU_H
|
||||||
|
//
|
||||||
|
// W A R N I N G
|
||||||
|
// -------------
|
||||||
|
//
|
||||||
|
// This file is part of the QPA API and is not meant to be used
|
||||||
|
// in applications. Usage of this API may make your code
|
||||||
|
// source and binary incompatible with future versions of Qt.
|
||||||
|
//
|
||||||
|
|
||||||
#include <QtCore/qglobal.h>
|
#include <QtCore/qglobal.h>
|
||||||
#include <QtCore/qpointer.h>
|
#include <QtCore/qpointer.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtGui/qwindowdefs.h>
|
#include <QtGui/qwindowdefs.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifndef QT_NO_OPENGL
|
#ifndef QT_NO_OPENGL
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qmetatype.h>
|
#include <QtCore/qmetatype.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/QObject>
|
#include <QtCore/QObject>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qobject.h>
|
#include <QtCore/qobject.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qnamespace.h>
|
#include <QtCore/qnamespace.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qplugin.h>
|
#include <QtCore/qplugin.h>
|
||||||
|
@ -45,11 +45,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qscopedpointer.h>
|
#include <QtCore/qscopedpointer.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qrect.h>
|
#include <QtCore/qrect.h>
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qconfig.h>
|
#include <QtCore/qconfig.h>
|
||||||
|
@ -41,6 +41,14 @@
|
|||||||
|
|
||||||
#ifndef QPLATFORMFUNCTIONS_WCE_H
|
#ifndef QPLATFORMFUNCTIONS_WCE_H
|
||||||
#define QPLATFORMFUNCTIONS_WCE_H
|
#define QPLATFORMFUNCTIONS_WCE_H
|
||||||
|
//
|
||||||
|
// W A R N I N G
|
||||||
|
// -------------
|
||||||
|
//
|
||||||
|
// This file is part of the QPA API and is not meant to be used
|
||||||
|
// in applications. Usage of this API may make your code
|
||||||
|
// source and binary incompatible with future versions of Qt.
|
||||||
|
//
|
||||||
|
|
||||||
#ifdef Q_OS_WINCE
|
#ifdef Q_OS_WINCE
|
||||||
#include <QtCore/qfunctions_wince.h>
|
#include <QtCore/qfunctions_wince.h>
|
||||||
|
@ -41,6 +41,14 @@
|
|||||||
|
|
||||||
#ifndef QPLATFORMPRINTINGSUPPORT_H
|
#ifndef QPLATFORMPRINTINGSUPPORT_H
|
||||||
#define QPLATFORMPRINTINGSUPPORT_H
|
#define QPLATFORMPRINTINGSUPPORT_H
|
||||||
|
//
|
||||||
|
// W A R N I N G
|
||||||
|
// -------------
|
||||||
|
//
|
||||||
|
// This file is part of the QPA API and is not meant to be used
|
||||||
|
// in applications. Usage of this API may make your code
|
||||||
|
// source and binary incompatible with future versions of Qt.
|
||||||
|
//
|
||||||
|
|
||||||
#include <QtPrintSupport/qprinter.h>
|
#include <QtPrintSupport/qprinter.h>
|
||||||
|
|
||||||
|
@ -46,11 +46,9 @@
|
|||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the Qt API. It exists purely as an
|
// This file is part of the QPA API and is not meant to be used
|
||||||
// implementation detail. This header file may change from version to
|
// in applications. Usage of this API may make your code
|
||||||
// version without notice, or even be removed.
|
// source and binary incompatible with future versions of Qt.
|
||||||
//
|
|
||||||
// We mean it.
|
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <QtCore/qplugin.h>
|
#include <QtCore/qplugin.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user