Ticket #33596: patch-qt.diff

File patch-qt.diff, 686 bytes (added by mojca (Mojca Miklavec), 13 years ago)

A patch that enables compilation of Qt (one could create a cleaner patch and submit it upstream, but this should do the job)

  • configure

    old new  
    1301013010  CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS"
    1301113011
    1301213012    if test "$is_apple" = yes; then
    13013     CXXFLAGS="$CXXFLAGS -ObjC"
     13013    LIBS="$LIBS -framework Carbon"
    1301413014  fi
    1301513015
    1301613016  QT4LOC=`$PKG_CONFIG --variable=exec_prefix QtCore`

  • src/qtterminal/qt_term.cpp 

    diff -u -r gp1/src/qtterminal/qt_term.cpp gp2/src/qtterminal/qt_term.cpp
    old new  
    4646#include <QtNetwork>
    4747
    4848#ifdef Q_WS_MAC
    49         #include <Cocoa/Cocoa.h>
     49        #include <Carbon/Carbon.h>
    5050#endif
    5151
    5252extern "C" {