equal
deleted
inserted
replaced
979 # undef QT3_SUPPORT |
979 # undef QT3_SUPPORT |
980 # undef QT_DEPRECATED |
980 # undef QT_DEPRECATED |
981 # undef QT_DEPRECATED_VARIABLE |
981 # undef QT_DEPRECATED_VARIABLE |
982 # undef QT_DEPRECATED_CONSTRUCTOR |
982 # undef QT_DEPRECATED_CONSTRUCTOR |
983 #elif defined(QT_DEPRECATED_WARNINGS) |
983 #elif defined(QT_DEPRECATED_WARNINGS) |
|
984 # ifdef QT3_SUPPORT |
984 /* enable Qt3 support warnings as well */ |
985 /* enable Qt3 support warnings as well */ |
985 # undef QT3_SUPPORT_WARNINGS |
986 # undef QT3_SUPPORT_WARNINGS |
986 # define QT3_SUPPORT_WARNINGS |
987 # define QT3_SUPPORT_WARNINGS |
|
988 # endif |
987 # undef QT_DEPRECATED |
989 # undef QT_DEPRECATED |
988 # define QT_DEPRECATED Q_DECL_DEPRECATED |
990 # define QT_DEPRECATED Q_DECL_DEPRECATED |
989 # undef QT_DEPRECATED_VARIABLE |
991 # undef QT_DEPRECATED_VARIABLE |
990 # define QT_DEPRECATED_VARIABLE Q_DECL_VARIABLE_DEPRECATED |
992 # define QT_DEPRECATED_VARIABLE Q_DECL_VARIABLE_DEPRECATED |
991 # undef QT_DEPRECATED_CONSTRUCTOR |
993 # undef QT_DEPRECATED_CONSTRUCTOR |