summaryrefslogtreecommitdiffstats
path: root/opensuse/core/qt3/shut-up.diff
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-12 10:11:01 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-12 10:11:01 +0200
commita4937b110c2c19699a179e4ae17b5d3864168561 (patch)
tree5c54e70b81bb074f994a678e667231cddc88892f /opensuse/core/qt3/shut-up.diff
parentbb94b933beb07ad9ebe9af255ee2fa8d91df7896 (diff)
downloadtde-packaging-a4937b110c2c19699a179e4ae17b5d3864168561.tar.gz
tde-packaging-a4937b110c2c19699a179e4ae17b5d3864168561.zip
RPM Packaging: update QT3
Diffstat (limited to 'opensuse/core/qt3/shut-up.diff')
-rw-r--r--opensuse/core/qt3/shut-up.diff45
1 files changed, 0 insertions, 45 deletions
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() ? "<null>" : (const char *) key );
-+ return FALSE;
- } else {
- return TRUE;
- }