From a4937b110c2c19699a179e4ae17b5d3864168561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 12 Apr 2015 10:11:01 +0200 Subject: RPM Packaging: update QT3 --- opensuse/core/qt3/shut-up.diff | 45 ------------------------------------------ 1 file changed, 45 deletions(-) delete mode 100644 opensuse/core/qt3/shut-up.diff (limited to 'opensuse/core/qt3/shut-up.diff') diff --git a/opensuse/core/qt3/shut-up.diff b/opensuse/core/qt3/shut-up.diff deleted file mode 100644 index 498b25b62..000000000 --- a/opensuse/core/qt3/shut-up.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- src/kernel/qpixmap_x11.cpp -+++ src/kernel/qpixmap_x11.cpp -@@ -394,8 +394,9 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == QApplication::Tty ) { -- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -- "is being used" ); -+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -+// "is being used" ); -+ ; - } - #endif - ---- src/tools/qcomlibrary.cpp -+++ src/tools/qcomlibrary.cpp -@@ -105,25 +105,11 @@ - (const char*) QFile::encodeName(library) ); - } else if ( ( version > QT_VERSION ) || - ( ( QT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) { -- if ( warn ) -- qWarning( "Conflict in %s:\n" -- " Plugin uses incompatible Qt library (%d.%d.%d)!", -- (const char*) QFile::encodeName(library), -- (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff ); -+ return FALSE; - } else if ( (flags & 2) != (our_flags & 2) ) { -- if ( warn ) -- qWarning( "Conflict in %s:\n" -- " Plugin uses %s Qt library!", -- (const char*) QFile::encodeName(library), -- (flags & 2) ? "multi threaded" : "single threaded" ); -+ return FALSE; - } else if ( key != QT_BUILD_KEY ) { -- if ( warn ) -- qWarning( "Conflict in %s:\n" -- " Plugin uses incompatible Qt library!\n" -- " expected build key \"%s\", got \"%s\".", -- (const char*) QFile::encodeName(library), -- QT_BUILD_KEY, -- key.isEmpty() ? "" : (const char *) key ); -+ return FALSE; - } else { - return TRUE; - } -- cgit v1.2.1