#284 QT patch fails to apply on master head.

[panmingquan]

QT patch fails to apply on master head.

Applying qt-accept4.patch using patch:
patching file src/network/socket/qnet_unix_p.h

Applying qt-bfin.patch using patch:
patching file mkspecs/qws/linux-bfin-g++/qmake.conf
patching file mkspecs/qws/linux-bfin-g++/qplatformdefs.h
patching file src/corelib/io/qfilesystemwatcher_inotify.cpp
Hunk #1 succeeded at 133 (offset 8 lines).
patching file src/corelib/arch/bfin/arch.pri
patching file src/corelib/arch/bfin/qatomic_bfin_unix.cpp
patching file src/gui/painting/qblendfunctions.cpp
patching file src/corelib/global/qglobal.h
Hunk #1 succeeded at 1180 (offset 21 lines).

Applying qt-nommu.patch using patch:
patching file src/gui/painting/qpdf.cpp
Hunk #1 succeeded at 1699 (offset 1 line).
patching file src/corelib/io/qprocess_unix.cpp
Hunk #1 succeeded at 683 (offset 36 lines).
Hunk #2 succeeded at 1384 with fuzz 2 (offset 40 lines).
Hunk #3 succeeded at 1400 (offset 40 lines).

Applying qt-pthread_getattr_np.patch using patch:
patching file src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp
Reversed (or previously applied) patch detected! Skipping patch.
4 out of 4 hunks ignored -- saving rejects to file src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp.rej
Patch failed! Please fix qt-pthread_getattr_np.patch!
make: *** [/home/test/workspace/src/kernel/label/BF548-EZKIT-STD/output/build/qt-4.8.6/.stamp_patched] Error 1

[Sonic Zhang]

remove obsolete pthread patch

[panmingquan]

Yes. close.