Changeset 97950


Ignore:
Timestamp:
Sep 20, 2012, 7:39:52 PM (7 years ago)
Author:
michaelld@…
Message:

qt4-mac :

  • bump to 4.8.3_0;
  • disable +framework variant; always install as framework, and use symlinks to populate libraries and headers into ${prefix}/lib and ${prefix}/include;
  • correct patches to work with new version;
  • remove old 10.8 patchfile, and replace with the single remaining patch needed for linking corelib;
  • install private headers for some Qt modules to allow other ports to work fully (e.g., qt4-creator-mac).
Location:
trunk/dports/aqua/qt4-mac
Files:
1 added
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt4-mac/Portfile

    r97300 r97950  
    1212name                qt4-mac
    1313conflicts           qt3 qt3-mac qt4-mac-devel
    14 version             4.8.2
    15 revision            3
     14version             4.8.3
    1615categories          aqua
    1716platforms           macosx
     
    2827distname            qt-everywhere-opensource-src-${version}
    2928
    30 checksums           sha1    e1e2edef1d63ed677d6534d32800c2e1f7ad0e73 \
    31                     rmd160  6a15077aee1e84076380787127b80c7bb97ebe86
     29checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
     30                    rmd160  fe56e5da874503a79d6f84a1e15460eba5a6feae
    3231
    3332minimum_xcodeversions   {8 2.5}
     
    206205    patch-src_3rdparty_webkit_Source_WebCore_WebCore.pro.diff
    207206
    208 # Temporary patch to get ML working; some of this is already upstream
    209 # https://codereview.qt-project.org/#change,31759
    210 # See also https://trac.macports.org/ticket/35430
     207# (23) Under 10.8 only: Patch to fix corelib linking
     208
    211209platform darwin 12 {
    212     patchfiles-append patch-EXPERIMENTAL-ML-fixes.diff
    213 }
    214 
    215 # (23) fix Framework directory in MacDeployQt tool
     210    patchfiles-append patch-src_corelib_corelib.pro.diff
     211}
     212
     213# (24) fix Framework directory in MacDeployQt tool
    216214
    217215patchfiles-append   \
     
    390388# -openssl-linked ensures that the MacPorts openssl is used.
    391389#
    392 # -no-framework ensures that this port is installed as separate
    393 #     libraries and headers, with guaranteed locations and names.
     390# -framework ensures that this port is installed as frameworks
     391#     (collections of {library, headers, resources}); in
     392#     post-destroot, link headers and libraries from the frameworks
     393#     into non-framework locations as if "-no-framework" were
     394#     specified.  Some dependent projects will not work properly if Qt
     395#     is installed as libraries by default, thus make it so #1.
    394396#
    395397# -no-phonon ensures that Qt does not install the 3rd-parth Phonon
     
    419421    -fast                                                 \
    420422    -optimized-qmake                                      \
    421     -no-framework                                         \
     423    -framework                                            \
    422424    -no-phonon                                            \
    423425    -no-phonon-backend
     
    572574    }
    573575
    574     if {![variant_isset framework]} {
    575 
    576         # if not doing framework install: install qt_menu.nib, used by
    577         # any applications making use of Qt's application class
    578 
    579         xinstall -m 755 -d ${destroot_qt}/lib/Resources
    580         copy ${worksrcpath}/src/gui/mac/qt_menu.nib \
    581             ${destroot_qt}/lib/Resources
    582 
    583     } else {
    584 
    585         # remove -L entries from .prl, and .la files; this is a
    586         # framework install, not a library install
    587 
    588         foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
    589             reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
    590         }
    591         foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
    592             reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
    593         }
    594 
    595         # remove redundant -F${prefix}/Library/Frameworks entries
    596 
    597         foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
    598             reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
    599                 ${fixfile}
    600             reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
    601             reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
    602                 ${fixfile}
    603         }
    604         foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
    605             reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
    606                 ${fixfile}
    607             reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
    608             reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
    609                 ${fixfile}
    610         }
    611 
    612         # move .pc files from ${qt_frameworks_dir}/pkgconfig to
    613         # ${qt_pkg_config_dir}
    614 
    615         file delete -force ${destroot}${qt_pkg_config_dir}
    616         xinstall -m 755 -d ${destroot}${qt_libs_dir}
    617         move ${destroot}${qt_frameworks_dir}/pkgconfig \
    618             ${destroot}${qt_libs_dir}
     576    # remove -L entries from .prl, and .la files; this is a
     577    # framework install, not a library install
     578
     579    foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
     580        reinplace "/QMAKE_PRL_LIBS/s|-L\[^ \]*||g" ${fixfile}
     581    }
     582    foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
     583        reinplace "/dependency_libs/s|-L\[^ \]*||g" ${fixfile}
     584    }
     585
     586    # remove redundant -F${prefix}/Library/Frameworks entries
     587
     588    foreach fixfile [exec find ${destroot_qt} -name "*.prl"] {
     589        reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*|FREPLACEME|1" \
     590            ${fixfile}
     591        reinplace "/QMAKE_PRL_LIBS/s|-F\[^ \]*||g" ${fixfile}
     592        reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
     593            ${fixfile}
     594    }
     595    foreach fixfile [exec find ${destroot_qt} -name "*.la"] {
     596        reinplace "/dependency_libs/s|-F\[^ \]*|FREPLACEME|1" \
     597            ${fixfile}
     598        reinplace "/dependency_libs/s|-F\[^ \]*||g" ${fixfile}
     599        reinplace "s|FREPLACEME|-F${prefix}/Library/Frameworks|1" \
     600            ${fixfile}
     601    }
     602
     603    # move .pc files from ${qt_frameworks_dir}/pkgconfig to
     604    # ${qt_pkg_config_dir}
     605
     606    file delete -force ${destroot}${qt_pkg_config_dir}
     607    xinstall -m 755 -d ${destroot}${qt_libs_dir}
     608    move ${destroot}${qt_frameworks_dir}/pkgconfig \
     609        ${destroot}${qt_libs_dir}
     610
     611    # get Qt's version numbers
     612
     613    set qt_vers [split ${version} "."]
     614    set qt_major [lindex ${qt_vers} 0]
     615    set qt_minor [lindex ${qt_vers} 1]
     616    set qt_patch [lindex ${qt_vers} 2]
     617
     618    # link includes and libraries for each actual installed framework
     619
     620    foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
     621                         -name "*.framework" | \
     622                         sed -e "s@${destroot}@@g"] {
     623
     624        set tf_full [strsed ${fixfile} {s@\\.framework@@}]
     625        set tf [strsed ${tf_full} {g@.*\/@@}]
    619626
    620627        # link headers into ${qt_includes_dir}, removing directories
    621628        # if they are already there first
    622629
    623         foreach fixfile [exec find ${destroot}${qt_frameworks_dir} \
    624                              -name "*.framework" | \
    625                              sed -e "s@${destroot}@@g"] {
    626             set tf_full [strsed ${fixfile} {s@\\.framework@@}]
    627             set tf [strsed ${tf_full} {g@.*\/@@}]
    628             set inc_file ${destroot}${qt_includes_dir}/${tf}
    629             if {[file exists ${inc_file}]} {
    630                 file delete -force ${inc_file}
    631             }
    632             ln -s ${tf_full}.framework/Headers ${inc_file}
     630        set inc_file ${destroot}${qt_includes_dir}/${tf}
     631        if {[file exists ${inc_file}]} {
     632            file delete -force ${inc_file}
    633633        }
     634        ln -s ${tf_full}.framework/Headers ${inc_file}
     635
     636        # link libraries into ${qt_libs_dir}, all 4 number variants as
     637        # well as the .prl and .la files
     638
     639        set libs_dir ${destroot}${qt_libs_dir}
     640
     641        ln -s ${tf_full}.framework/${tf}.prl ${libs_dir}/lib${tf}.prl
     642        ln -s ${tf_full}.la ${libs_dir}/lib${tf}.la
     643        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.dylib
     644        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.dylib
     645        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.dylib
     646        ln -s ${tf_full}.framework/${tf} ${libs_dir}/lib${tf}.${qt_major}.${qt_minor}.${qt_patch}.dylib
     647
    634648    }
    635649
    636650    # Install documentation.
     651
    637652    xinstall -m 755 -d ${worksrcpath}/${qt_docs_dir}
    638653    xinstall -m 644 -W ${worksrcpath} \
     
    641656        ${destroot}${qt_docs_dir}
    642657
     658    # Install private headers needed by QtCreator
     659
     660    foreach {src_dir include_dir} \
     661    {corelib QtCore gui QtGui script QtScript declarative QtDeclarative} {
     662        set dest_dir ${destroot}${qt_frameworks_dir}/${include_dir}.framework/Headers/private
     663        xinstall -m 755 -d ${dest_dir}
     664        set files [exec find ${worksrcpath}/src/${src_dir} -type f -name "*_p.h"]
     665        eval xinstall -m 644 [split ${files}] ${dest_dir}
     666    }
     667
    643668    # Move .apps into the applications_dir
     669
    644670    xinstall -m 755 -d ${destroot}${qt_apps_dir}
    645671    foreach app [glob ${destroot}/${qt_bins_dir}/*.app] {
     
    663689}
    664690
    665 variant framework description {Build as Frameworks} {
    666     configure.args-delete -no-framework
    667     configure.args-append -framework
     691variant framework description {Framework Legacy Compatibility Variant} {
     692    ui_error "${name} variant +framework has been disabled because ${name} now installs as both libraries and frameworks.  Please install ${name} without +framework."
     693    return -code error "Variant disabled"
    668694}
    669695
  • trunk/dports/aqua/qt4-mac/files/patch-config.tests_unix_precomp.test.diff

    r94241 r97950  
    1414     ;;
    1515 
    16 -*g++*|c++)
     16-*g++*|c++|*qcc*)
    1717-    case `"$COMPILER" -dumpversion 2>/dev/null` in
    18 +*g++*|c++|*gcc*|cc)
     18+*g++*|c++|*qcc*|*gcc*|cc)
    1919+    case `$COMPILER -dumpversion 2>/dev/null` in
    2020     3.*)
  • trunk/dports/aqua/qt4-mac/files/patch-configure.diff

    r96486 r97950  
    1 --- configure.orig      2012-08-08 16:12:36.000000000 -0400
    2 +++ configure   2012-08-08 16:39:19.000000000 -0400
    3 @@ -901,6 +901,7 @@
     1--- configure.orig      2012-09-17 11:00:59.000000000 -0400
     2+++ configure   2012-09-17 11:01:07.000000000 -0400
     3@@ -920,6 +920,7 @@
    44 QT_INSTALL_DOCS=
    55 QT_INSTALL_HEADERS=
     
    99 QT_INSTALL_PLUGINS=
    1010 QT_INSTALL_IMPORTS=
    11 @@ -1358,6 +1359,9 @@
     11@@ -1380,6 +1381,9 @@
    1212     libdir)
    1313         QT_INSTALL_LIBS="$VAL"
     
    1919         QT_NAMESPACE="$VAL"
    2020         ;;
    21 @@ -3649,6 +3653,19 @@
     21@@ -3697,6 +3701,19 @@
    2222     fi
    2323     QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"`
     
    3939     if [ -z "$QT_INSTALL_BINS" ]; then #default
    4040         if [ "$CFG_PREFIX_INSTALL" = "no" ]; then
    41 @@ -4700,6 +4717,7 @@
     41@@ -4752,6 +4769,7 @@
    4242 DOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_INSTALL_DOCS"`
    4343 HEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_INSTALL_HEADERS"`
     
    4747 PLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_INSTALL_PLUGINS"`
    4848 IMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_INSTALL_IMPORTS"`
    49 @@ -4725,6 +4743,7 @@
     49@@ -4777,6 +4795,7 @@
    5050     HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
    5151     HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
     
    5555     HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"`
    5656     HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"`
    57 @@ -4742,6 +4761,7 @@
     57@@ -4794,6 +4813,7 @@
    5858 static const char qt_configure_documentation_path_str[256 + 12] = "$HOSTDOCUMENTATION_PATH_STR";
    5959 static const char qt_configure_headers_path_str      [256 + 12] = "$HOSTHEADERS_PATH_STR";
     
    6363 static const char qt_configure_plugins_path_str      [256 + 12] = "$HOSTPLUGINS_PATH_STR";
    6464 static const char qt_configure_imports_path_str      [256 + 12] = "$HOSTIMPORTS_PATH_STR";
    65 @@ -4760,6 +4780,7 @@
     65@@ -4812,6 +4832,7 @@
    6666 static const char qt_configure_documentation_path_str[256 + 12] = "$DOCUMENTATION_PATH_STR";
    6767 static const char qt_configure_headers_path_str      [256 + 12] = "$HEADERS_PATH_STR";
     
    7171 static const char qt_configure_plugins_path_str      [256 + 12] = "$PLUGINS_PATH_STR";
    7272 static const char qt_configure_imports_path_str      [256 + 12] = "$IMPORTS_PATH_STR";
    73 @@ -4785,6 +4806,7 @@
     73@@ -4837,6 +4858,7 @@
    7474 #define QT_CONFIGURE_DOCUMENTATION_PATH qt_configure_documentation_path_str + 12;
    7575 #define QT_CONFIGURE_HEADERS_PATH qt_configure_headers_path_str + 12;
     
    7979 #define QT_CONFIGURE_PLUGINS_PATH qt_configure_plugins_path_str + 12;
    8080 #define QT_CONFIGURE_IMPORTS_PATH qt_configure_imports_path_str + 12;
    81 @@ -4944,20 +4966,11 @@
     81@@ -4996,20 +5018,11 @@
    8282             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
    8383             EXTRA_OBJS="qsettings_mac.o qcore_mac.o"
     
    105105                echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile"
    106106                echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile"
    107 @@ -5389,9 +5402,9 @@
     107@@ -5441,9 +5454,9 @@
    108108         psql)
    109109             if [ "$CFG_SQL_psql" != "no" ]; then
     
    118118                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
    119119                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
    120 @@ -7042,16 +7055,8 @@
     120@@ -7097,16 +7110,8 @@
    121121 
    122122 # set the global Mac deployment target. This is overridden on an arch-by-arch basis
     
    137137 # disable Qt 3 support on VxWorks, Symbian and INTEGRITY
    138138 case "$XPLATFORM" in
    139 @@ -7782,28 +7787,28 @@
     139@@ -7844,28 +7849,28 @@
    140140 # env. variable.
    141141 if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then
     
    182182 fi
    183183 
    184 @@ -8550,6 +8555,7 @@
     184@@ -8618,6 +8623,7 @@
    185185 QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
    186186 QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
  • trunk/dports/aqua/qt4-mac/files/patch-mkspecs_features_qt_functions.prf.diff

    r94241 r97950  
    1 --- mkspecs/features/qt_functions.prf.orig      2012-05-11 10:33:49.000000000 -0400
    2 +++ mkspecs/features/qt_functions.prf   2012-05-25 13:15:09.000000000 -0400
    3 @@ -16,24 +16,54 @@
     1--- mkspecs/features/qt_functions.prf.orig      2012-09-20 10:57:59.000000000 -0400
     2+++ mkspecs/features/qt_functions.prf   2012-09-20 15:31:19.000000000 -0400
     3@@ -16,24 +16,75 @@
    44 }
    55 
     
    6363-                     exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
    6464-                QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
     65+
     66+    # see if the framework, and exists in the current known paths
     67+
     68+    # add LIBS entries QMAKE_FRAMEWORKPATH, as appropriate
     69+
     70+    all_frmwrks = $$find(LIBS, -F.*) $$find(QMAKE_LFLAGS, -F.*)
     71+#    message(qtAddLibrary: all frameworks is $$all_frmwrks)
     72+
     73+    for(frmwrk_dir, all_frmwrks) {
     74+
     75+#      message(qtAddLibrary: this frmwrk_dir is $$frmwrk_dir)
     76+      tfp = $$frmwrk_dir
     77+      tfp ~= s,-F,,
     78+      QMAKE_FRAMEWORKPATH *= $$tfp
     79+#      message(qtAddLibrary: this frmwrk_path is $$tfp)
     80+
     81+    }
     82+
    6583+    mac:!qt_no_framework {
    66 +       for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
     84+       for(frmwrk_dir, $$list($$QMAKE_FRAMEWORKPATH $$QMAKE_FRAMEWORKDIR_QT $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH))) {
     85+
     86+#           message(qtAddLibrary: looking for framework $$LIB_NAME in directory $$frmwrk_dir)
    6787+           exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
    68 +               QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
     88+
     89+                message(qtAddLibrary: found framework $$LIB_NAME in directory $$frmwrk_dir)
    6990                FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers
    7091                !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) {
    7192                  INCLUDEPATH -= $$FRAMEWORK_INCLUDE
    72 @@ -42,8 +72,7 @@
     93@@ -41,10 +92,13 @@
     94                 }
    7395                LINKAGE = -framework $${LIB_NAME}
    7496                        break()
     97+
    7598               }
    7699-           }
     
    78101+         }
    79102     }
     103+
     104+    # special for symbian
     105+
    80106     symbian {
    81107         isEqual(LIB_NAME, QtCore) {
    82 @@ -73,7 +102,16 @@
     108             #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
     109@@ -70,10 +124,56 @@
     110         export(TARGET.EPOCHEAPSIZE)
     111         export(TARGET.CAPABILITY)
     112     }
     113+
     114+    isEmpty(LINKAGE) {
     115+
     116+      # not a framework or symbian
     117+      # see if the library exists in the current known paths
     118+
     119+      # add LIBS entries QMAKE_LIBPATH, as appropriate
     120+
     121+      all_libs = $$find(LIBS, -L.*) $$find(QMAKE_LFLAGS, -L.*)
     122+#      message(qtAddLibrary: all library paths is $$all_libs)
     123+
     124+      for(lib_dir, all_libs) {
     125+
     126+#        message(qtAddLibrary: this lib_dir is $$lib_dir)
     127+        tlp = $$lib_dir
     128+        tlp ~= s,-L,,
     129+        QMAKE_LIBPATH *= $$tlp
     130+#        message(qtAddLibrary: this lib_path is $$tlp)
     131+
     132+      }
     133+
     134+      for(lib_dir, $$list($$QMAKE_LIBPATH $$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR)) {
     135+
     136+#           message(qtAddLibrary: looking for library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
     137+           exists($${lib_dir}/lib$${LIB_NAME}$${QT_LIBINFIX}.*) {
     138+
     139+                message(qtAddLibrary: found library $${LIB_NAME}$${QT_LIBINFIX} in directory $$lib_dir)
     140+               LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
     141+                       break()
     142+
     143+              }
     144+         }
     145+    }
     146+
    83147     isEmpty(LINKAGE) {
     148+
     149+       message(WARNING: Could not find library or framework $$LIB_NAME in the current known search directories; assuming a default library.)
     150+
    84151        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
    85152            win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
     
    98165        isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}
    99166     }
    100 @@ -83,6 +121,9 @@
     167@@ -83,9 +183,13 @@
    101168         QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
    102169     }
     
    108175     export(INCLUDEPATH)
    109176     export(QMAKE_FRAMEWORKPATH)
    110 @@ -119,4 +160,3 @@
     177+    export(QMAKE_LIBPATH)
     178     export(QMAKE_LFLAGS)
     179     return(true)
     180 }
     181@@ -119,4 +223,3 @@
    111182 
    112183     return(true)
  • trunk/dports/aqua/qt4-mac/files/patch-qmake_qmake.pri.diff

    r94241 r97950  
    11--- qmake/qmake.pri.orig        2012-04-23 14:49:04.000000000 -0400
    22+++ qmake/qmake.pri     2012-04-17 14:38:16.000000000 -0400
    3 @@ -138,7 +138,7 @@
     3@@ -136,7 +136,7 @@
    44         mac {
    55           SOURCES += qfilesystemengine_mac.cpp
  • trunk/dports/aqua/qt4-mac/files/patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff

    r96486 r97950  
    1010         }
    1111 
    12 @@ -295,7 +295,7 @@
     12@@ -297,7 +297,7 @@
    1313 
    1414 !symbian-abld:!symbian-sbsv2 {
     
    1919     INSTALLS += modfile
    2020 } else {
    21 @@ -303,7 +303,7 @@
     21@@ -305,7 +305,7 @@
    2222 
    2323     inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
  • trunk/dports/aqua/qt4-mac/files/patch-src_tools_bootstrap_bootstrap.pro.diff

    r94241 r97950  
    11--- src/tools/bootstrap/bootstrap.pro.orig      2012-04-23 14:49:04.000000000 -0400
    22+++ src/tools/bootstrap/bootstrap.pro   2012-04-17 14:38:16.000000000 -0400
    3 @@ -104,7 +104,7 @@
     3@@ -103,7 +103,7 @@
    44 else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp
    55 
Note: See TracChangeset for help on using the changeset viewer.