diff options
author | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
commit | 44279fd56aa28d4943b49e516ac791900c561488 (patch) | |
tree | 11289e75f32c5324c5f7469141881720af4f57fe /opensuse/core/tqt3/shut-up.diff | |
parent | 48e7f603b222a82ae22d94ecbd6cbba914144f86 (diff) | |
download | tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.tar.gz tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.zip |
initial package (failing) of tqt3 for SuSE12.1
Diffstat (limited to 'opensuse/core/tqt3/shut-up.diff')
-rw-r--r-- | opensuse/core/tqt3/shut-up.diff | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/opensuse/core/tqt3/shut-up.diff b/opensuse/core/tqt3/shut-up.diff new file mode 100644 index 000000000..e6a82e16a --- /dev/null +++ b/opensuse/core/tqt3/shut-up.diff @@ -0,0 +1,52 @@ +Index: src/kernel/qpixmap_x11.cpp +=================================================================== +--- src/kernel/qpixmap_x11.cpp.orig ++++ src/kernel/qpixmap_x11.cpp +@@ -394,8 +394,9 @@ void TQPixmap::init( int w, int h, int d + { + #if defined(QT_CHECK_STATE) + if ( tqApp->type() == TQApplication::Tty ) { +- tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " +- "is being used" ); ++// tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " ++// "is being used" ); ++ ; + } + #endif + +Index: src/tools/qcomlibrary.cpp +=================================================================== +--- src/tools/qcomlibrary.cpp.orig ++++ src/tools/qcomlibrary.cpp +@@ -105,27 +105,13 @@ static bool qt_verify( const TQString& l + (const char*) TQFile::encodeName(library) ); + } else if ( ( version > TQT_VERSION ) || + ( ( TQT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) { +- if ( warn ) +- tqWarning( "Conflict in %s:\n" +- " Plugin uses incompatible TQt library (%d.%d.%d)!", +- (const char*) TQFile::encodeName(library), +- (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff ); ++ return FALSE; + } else if ( (flags & 2) != (our_flags & 2) ) { +- if ( warn ) +- tqWarning( "Conflict in %s:\n" +- " Plugin uses %s TQt library!", +- (const char*) TQFile::encodeName(library), +- (flags & 2) ? "multi threaded" : "single threaded" ); ++ return FALSE; + } else if ( key != TQT_BUILD_KEY ) { +- if ( warn ) +- tqWarning( "Conflict in %s:\n" +- " Plugin uses incompatible TQt library!\n" +- " expected build key \"%s\", got \"%s\".", +- (const char*) TQFile::encodeName(library), +- TQT_BUILD_KEY, +- key.isEmpty() ? "<null>" : (const char *) key ); ++ return FALSE; + } else { +- return TRUE; ++ return TRUE; + } + return FALSE; + } |