Ticket #46536: patch-to-build-xcb.diff

File patch-to-build-xcb.diff, 2.4 KB (added by RJVB (René Bertin), 10 years ago)

  • qtbase/mkspecs/common/

    old new  
    55QMAKE_PLATFORM         += osx macx
    66QMAKE_MAC_SDK           = macosx
    77
     8# X11 is not inexistant on OS X; provide the library requirements but leave it to the
     9# user to make them accessible during the Qt build.
     10QMAKE_LIBS_X11          = -lXext -lX11
     11QMAKE_LIBS_OPENVG       = -lOpenVG
     12
    813include(mac.conf)

  • qtbase/src/plugins/platforms/xcb/

    old new  
    5555        SOURCES += qxcbconnection_xi2.cpp
    5656        LIBS += -lXi
    5757    }
     58    mac {
     59        LIBS += -lGL
     60    }
    5861}
    5962
    6063# to support custom cursors with depth > 1

  • qtbase/src/platformsupport/fontdatabases/

    old new  
    1 !win32|contains(QT_CONFIG, freetype):!mac {
     1!win32|contains(QT_CONFIG, freetype) {
    22    include($$PWD/basic/basic.pri)
    33}
    44
    5 unix:!mac {
     5unix {
    66    CONFIG += qpa/genericunixfontdatabase
    77    include($$PWD/genericunix/genericunix.pri)
    88    contains(QT_CONFIG,fontconfig) {

  • qtbase/src/platformsupport/services/

    old new  
    1 unix:!mac {
     1unix {
    22    include($$PWD/genericunix/genericunix.pri)
    33}

  • qtbase/src/platformsupport/themes/

    old new  
    1 unix:!mac {
     1unix {
    22    include($$PWD/genericunix/genericunix.pri)
    33}

  • qtbase/src/plugins/platforms/offscreen/

    old new  
    1818
    1919OTHER_FILES += offscreen.json
    2020
    21 contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2) {
     21contains(QT_CONFIG, xlib):contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!mac {
    2222    SOURCES += qoffscreenintegration_x11.cpp
    2323    HEADERS += qoffscreenintegration_x11.h
    2424    system(echo "Using X11 offscreen integration with GLX")