source: trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff @ 96486

Last change on this file since 96486 was 96486, checked in by michaelld@…, 12 years ago

qt4-mac :
+ Corrects detection of corewlan +universal builds.
+ Removes warnings when building on 10.8.
+ also addresses tickets:

  • #35523 : correctly select the "pg_config" for psql variant selected (if any), to allow building as universal;
  • #34934 : correctly use mach timer info to compute time;
  • #34902 : patch Qt QMake build system to allow full compilation on 32-bit systems;
  • #34864 : correct +framework header links; and
  • #34856 : disable ccache for now; try to fix later; it's involved.
File size: 1.0 KB

  • src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro

    old new  
    233233                       $$SOURCE_DIR/../WebKitLibraries/
    234234
    235235        DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    236         contains(CONFIG, "x86") {
     236        contains(CONFIG, "x86")|contains(CONFIG, "ppc") {
    237237            DEFINES+=NS_BUILD_32_LIKE_64
    238238        }
    239239
    … …  
    295295
    296296!symbian-abld:!symbian-sbsv2 {
    297297    modfile.files = $$moduleFile
    298     modfile.path = $$[QMAKE_MKSPECS]/modules
     298    modfile.path = $$[QT_INSTALL_DATA]/mkspecs/modules
    299299
    300300    INSTALLS += modfile
    301301} else {
    … …  
    303303
    304304    inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
    305305    inst_modfile.input = moduleFile
    306     inst_modfile.output = $$[QMAKE_MKSPECS]/modules
     306    inst_modfile.output = $$[QT_INSTALL_DATA]/mkspecs/modules
    307307    inst_modfile.CONFIG = no_clean
    308308
    309309    QMAKE_EXTRA_COMPILERS += inst_modfile
Note: See TracBrowser for help on using the repository browser.