Changeset 769 for trunk/mkspecs


Ignore:
Timestamp:
Aug 2, 2010, 9:27:30 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
28 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/mkspecs/aix-xlc-64/qmake.conf

    r2 r769  
    4949QMAKE_LINK_THREAD       = xlC_r
    5050QMAKE_LINK_SHLIB        = ld
    51 QMAKE_LFLAGS            = -q64
     51QMAKE_LFLAGS            = -q64 -bbigtoc
    5252QMAKE_LFLAGS_RELEASE    =
    5353QMAKE_LFLAGS_DEBUG      =

  • trunk/mkspecs/aix-xlc/qmake.conf

    r2 r769  
    4949QMAKE_LINK_THREAD       = xlC_r
    5050QMAKE_LINK_SHLIB        = ld
    51 QMAKE_LFLAGS            =
     51QMAKE_LFLAGS            = -bmaxdata:0x80000000
    5252QMAKE_LFLAGS_RELEASE    =
    5353QMAKE_LFLAGS_DEBUG      =

  • trunk/mkspecs/common/symbian/symbian.conf

    r651 r769  
    2727QMAKE_CFLAGS_YACC       = -Wno-unused -Wno-parentheses
    2828
     29MMP_OPTION_KEYWORDS = CW ARMCC GCCE
     30VERSION_FLAGS.ARMCC = ARMCC_4_0
    2931QMAKE_CXX               = g++
    3032QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
    3133QMAKE_CXXFLAGS.CW       =
    32 QMAKE_CXXFLAGS.ARMCC    = --visibility_inlines_hidden
     34QMAKE_CXXFLAGS.ARMCC      = --visibility_inlines_hidden
     35QMAKE_CXXFLAGS.ARMCC_4_0  = --import_all_vtbl
    3336QMAKE_CXXFLAGS.GCCE     = -fvisibility-inlines-hidden
    3437QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
    … …  
    7174QMAKE_LIBS_EGL          = -llibEGL
    7275QMAKE_LIBS_OPENGL       =
    73 QMAKE_LIBS_OPENVG       = -llibOpenVG -lgraphicsresource -lfbscli -lbitgdi -lgdi
     76QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
    7477QMAKE_LIBS_COMPAT       =
    7578QMAKE_LIBS_QT_ENTRY     = -llibcrt0.lib
    7679QMAKE_LIBS_S60          = -lavkon
    7780
    78 !isEmpty(QMAKE_SH) {
     81exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
     82    QMAKE_LIBS_OPENVG += -lsgresource
     83}
     84
     85contains(QMAKE_HOST.os,Windows) {
     86    QMAKE_COPY           = copy /y
     87    QMAKE_COPY_DIR       = xcopy /s /q /y /i
     88    QMAKE_MOVE           = move
     89    QMAKE_DEL_FILE       = del
     90    QMAKE_MKDIR          = mkdir
     91    QMAKE_DEL_DIR        = rmdir
     92    QMAKE_CHK_DIR_EXISTS = if not exist
     93} else {
    7994    QMAKE_COPY           = cp
    8095    QMAKE_COPY_DIR       = cp -r
    … …  
    8499    QMAKE_DEL_DIR        = rmdir
    85100    QMAKE_CHK_DIR_EXISTS = test -d
    86 } else {
    87     QMAKE_COPY           = copy /y
    88     QMAKE_COPY_DIR       = xcopy /s /q /y /i
    89     QMAKE_MOVE           = move
    90     QMAKE_DEL_FILE       = del
    91     QMAKE_MKDIR          = mkdir
    92     QMAKE_DEL_DIR        = rmdir
    93     QMAKE_CHK_DIR_EXISTS = if not exist
    94101}
    95102
    … …  
    108115load(qt_config)
    109116load(platform_paths)
     117load(add_mmp_rules)
    110118
    111119symbian-abld {
    … …  
    116124    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
    117125}
    118 MMP_RULES += PAGED
     126MMP_RULES += PAGED BYTEPAIRCOMPRESSTARGET
    119127MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
    120128SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
    121129
    122 # Legacy support requires some hardcoded stdapis paths.
    123130INCLUDEPATH = \
    124131    $$[QT_INSTALL_PREFIX]/mkspecs/common/symbian/stl-off \
    … …  
    127134    $$OS_LAYER_LIBC_SYSTEMINCLUDE \
    128135    $$INCLUDEPATH
    129    
     136
     137# Ensure '.' directory is the first in include path.
     138# RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
     139MMP_RULES += "USERINCLUDE ."
     140
     141# pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer
     142# if multiple languages need to be supported by pkg file. In that case the developer should declare
     143# multiple language compatible dependency statements him/herself.
     144
     145default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
     146
    130147# Supports S60 3.0, 3.1, 3.2 and 5.0 by default
    131 default_deployment.pkg_prerules = \
     148pkg_platform_dependencies = \
    132149    "; Default HW/platform dependencies" \
    133150    "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
    … …  
    146163    } else {
    147164        S60_VERSION = 3.1
    148         MMP_RULES -= PAGED
     165        MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
    149166    }
    150167}
     168
     169QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
     170# [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
     171
     172symbian {
     173    armfpu = $$find(MMP_RULES, "ARMFPU")
     174    !isEmpty(armfpu) {
     175        vfpv2 = $$find(MMP_RULES, "vfpv2")
     176        !isEmpty(vfpv2) {
     177            # we will respect fpu setting obtained from configure, but,
     178            # if vfpv2 or softvfp+vfpv2 used we want to force RunFast VFP mode
     179            QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC}
     180            # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE}
     181        }
     182    }
     183}

  • trunk/mkspecs/features/dbusadaptors.prf

    r2 r769  
    1 isEmpty(QMAKE_QDBUSXML2CPP) {
    2     win32:QMAKE_QDBUSXML2CPP = $$[QT_INSTALL_BINS]\qdbusxml2cpp.exe
    3     else:QMAKE_QDBUSXML2CPP = $$[QT_INSTALL_BINS]/qdbusxml2cpp
    4 }
     1qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
    52
    63for(DBUS_ADAPTOR, $$list($$unique(DBUS_ADAPTORS))) {

  • trunk/mkspecs/features/dbusinterfaces.prf

    r2 r769  
    11load(moc)
    22
    3 isEmpty(QMAKE_QDBUSXML2CPP) {
    4     win32:QMAKE_QDBUSXML2CPP = $$[QT_INSTALL_BINS]\qdbusxml2cpp.exe
    5     else:QMAKE_QDBUSXML2CPP = $$[QT_INSTALL_BINS]/qdbusxml2cpp
    6 }
     3qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
    74
    85for(DBUS_INTERFACE, $$list($$unique(DBUS_INTERFACES))) {

  • trunk/mkspecs/features/default_post.prf

    r297 r769  
    1313QMAKE_INCDIR += $$QMAKE_INCDIR_POST
    1414QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
     15
     16# Let every project have a standard GNU `check' target
     17!contains(QMAKE_EXTRA_TARGETS, check) {
     18    # `make check' should iterate through all subdirs
     19    contains(TEMPLATE, subdirs) {
     20        check.CONFIG = recursive
     21        check.recurse = $$SUBDIRS
     22        check.recurse_target = check
     23    }
     24    # `make check' should imply building the project
     25    else {
     26        check.depends = first
     27    }
     28    QMAKE_EXTRA_TARGETS += check
     29}

  • trunk/mkspecs/features/default_pre.prf

    r2 r769  
    11load(exclusive_builds)
     2### Qt 5: remove "uic" and "resources" - or add "qt"
    23CONFIG = lex yacc warn_on debug uic resources $$CONFIG

  • trunk/mkspecs/features/moc.prf

    r572 r769  
    11
    22#global defaults
    3 isEmpty(QMAKE_MOC) {
    4     contains(QMAKE_HOST.os,Windows)|os2:QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe
    5     else:QMAKE_MOC = $$[QT_INSTALL_BINS]/moc
    6 }
     3qtPrepareTool(QMAKE_MOC, moc)
    74isEmpty(MOC_DIR):MOC_DIR = .
    85isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_
    … …  
    109106
    110107#auto depend on moc
    111 unix:!no_mocdepend {
     108unix:!symbian:!no_mocdepend {
    112109     moc_source.depends += $$first(QMAKE_MOC)
    113110     moc_header.depends += $$first(QMAKE_MOC)

  • trunk/mkspecs/features/qt.prf

    r651 r769  
    3131   }
    3232}
     33
     34#handle modules
     35for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod)
    3336
    3437#handle includes
    … …  
    167170       symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000
    168171
    169    } else:isEqual(QTLIB, webkit):qlib = QtWebKit
    170    else:isEqual(QTLIB, declarative):qlib = QtDeclarative
     172   } else:isEqual(QTLIB, webkit) {
     173       qlib = QtWebKit
     174       aix-xlc {
     175           # Flags recommended by IBM when using WebKit
     176           QMAKE_LFLAGS -= -bmaxdata:0x80000000
     177           QMAKE_LFLAGS += -bmaxdata:0xD0000000/dsa
     178       }
     179   } else:isEqual(QTLIB, declarative):qlib = QtDeclarative
    171180   else:isEqual(QTLIB, multimedia):qlib = QtMultimedia
    172181   else:message("Unknown QT: $$QTLIB"):qlib =

  • trunk/mkspecs/features/qt_functions.prf

    r561 r769  
    7979    return(true)
    8080}
     81
     82# variable, default
     83defineTest(qtPrepareTool) {
     84    isEmpty($$1) {
     85        !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2
     86        else:$$1 = $$[QT_INSTALL_BINS]/$$2
     87    }
     88    $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP,
     89    contains(QMAKE_HOST.os, Windows)|os2:!contains($$1, .*\\.exe$):$$1 = $$eval($$1).exe
     90    export($$1)
     91}

  • trunk/mkspecs/features/resources.prf

    r594 r769  
    1 isEmpty(QMAKE_RCC) {
    2     win32:QMAKE_RCC = $$[QT_INSTALL_BINS]\rcc.exe
    3     else:QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc
    4 }
     1defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
     2qtPrepareTool(QMAKE_RCC, rcc)
    53
    64isEmpty(RCC_DIR):RCC_DIR = .

  • trunk/mkspecs/features/symbian/application_icon.prf

    r561 r769  
    44# requires the registration resource file to exist always
    55contains( CONFIG, no_icon ) {
    6     symbian:RSS_RULES ="hidden = KAppIsHidden;"
     6    symbian:RSS_RULES += "hidden = KAppIsHidden;"
    77    CONFIG -= no_icon
    88} else {

  • trunk/mkspecs/features/symbian/data_caging_paths.prf

    r561 r769  
    7575}
    7676
    77 isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/plugins
     77isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
    7878isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
    7979isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps

  • trunk/mkspecs/features/symbian/default_post.prf

    r561 r769  
    66    } else:contains(QT, gui):contains(CONFIG,qt) {
    77        S60MAIN_LIBS = -leuser
    8         QMAKE_LIBS += -lqtmain.lib $$S60MAIN_LIBS
     8        QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib $$S60MAIN_LIBS
    99    } else {
    1010        QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY

  • trunk/mkspecs/features/symbian/platform_paths.prf

    r651 r769  
    230230
    231231        OS_LAYER_LIBUTILITY_SYSTEMINCLUDE = $$OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/utility)
    232 
    233         # ---------------------------------------
    234         # Definitions to export IBY files to different folders where they will be taken
    235         # to ROM image
    236         # ---------------------------------------
    237              
    238         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
    239             return(/epoc32/rom/include/core/app/$$1)
    240         }
    241         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
    242             return(/epoc32/rom/include/core/mw/$$1)
    243         }
    244         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
    245             return(/epoc32/rom/include/core/os/$$1)
    246         }
    247         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
    248             return(/epoc32/rom/include/core/os/$$1)
    249         }
    250         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
    251             return(/epoc32/rom/include/$$1)
    252         }
    253        
    254         # You need to define the following in pro-file, if you are using the stllib:
    255         # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
    256         # DEFINES *= $$STLLIB_USAGE_DEFINES
    257         STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
    258         STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
    259232
    260233    } else { # Old pre-SF structure
    … …  
    451424                                            /epoc32/include/stdapis/utility
    452425
    453         # ---------------------------------------
    454         # Definitions to export IBY files to different folders where they will be taken
    455         # to ROM image
    456         # ---------------------------------------
    457              
    458         defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
    459             return(/epoc32/rom/include/core/app/$$1)
    460         }
    461         defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
    462             return(/epoc32/rom/include/core/mw/$$1)
    463         }
    464         defineReplace(CORE_OSEXT_LAYER_IBY_EXPORT_PATH) {
    465             return(/epoc32/rom/include/core/osext/$$1)
    466         }
    467         defineReplace(CORE_OS_LAYER_IBY_EXPORT_PATH) {
    468             return(/epoc32/rom/include/core/osext/$$1)
    469         }
    470         defineReplace(CORE_ADAPT_LAYER_IBY_EXPORT_PATH) {
    471             return(/epoc32/rom/include/$$1)
    472         }
    473        
    474         # You need to define the following in pro-file, if you are using the stllib:
    475         # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
    476         # DEFINES *= $$STLLIB_USAGE_DEFINES
    477         STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
    478         STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
     426    }
     427
     428    # Definitions common to both structures
     429
     430    # ---------------------------------------
     431    # Definitions to export IBY files to different folders where they will be taken
     432    # to ROM image
     433    # ---------------------------------------
     434
     435    defineReplace(CORE_APP_LAYER_IBY_EXPORT_PATH) {
     436        return(/epoc32/rom/include/core/app/$$1)
     437    }
     438    defineReplace(CORE_MW_LAYER_IBY_EXPORT_PATH) {
     439        return(/epoc32/rom/include/core/mw/$$1)
     440    }
     441
     442    defineReplace(LANGUAGE_APP_LAYER_IBY_EXPORT_PATH) {
     443        return(/epoc32/rom/include/language/app/$$1)
     444    }
     445    defineReplace(LANGUAGE_MW_LAYER_IBY_EXPORT_PATH) {
     446        return(/epoc32/rom/include/language/mw/$$1)
     447    }
     448
     449    defineReplace(CUSTOMER_APP_LAYER_IBY_EXPORT_PATH) {
     450        return(/epoc32/rom/include/customer/app/$$1)
     451    }
     452    defineReplace(CUSTOMER_MW_LAYER_IBY_EXPORT_PATH) {
     453        return(/epoc32/rom/include/customer/mw/$$1)
     454    }
     455
     456    defineReplace(CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH) {
     457        return(/epoc32/rom/include/customervariant/app/$$1)
     458    }
     459    defineReplace(CUSTOMER_VARIANT_MW_LAYER_IBY_EXPORT_PATH) {
     460        return(/epoc32/rom/include/customervariant/mw/$$1)
     461    }
     462
     463    # You need to define the following in pro-file, if you are using the stllib:
     464    # QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
     465    # DEFINES *= $$STLLIB_USAGE_DEFINES
     466    STLLIB_USAGE_CW_FLAGS = "-wchar_t on"
     467    STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
     468
     469}
     470
     471
    479472   
    480     }
    481 }
    482 
    483 
    484    

  • trunk/mkspecs/features/symbian/qt.prf

    r561 r769  
    2323
    2424# Add dependency to Qt package to all other projects besides Qt libs.
    25 # Note: Qt libs with full capabilities has UID3 of 0x2001E61C,
     25# Note: Qt libs package with full capabilities has UID3 of 0x2001E61C,
    2626#       while self-signed version typically has temporary UID3 of 0xE001E61C.
    27 contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
    28     default_deployment.pkg_prerules += \
     27contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C):isEmpty(QT_LIBINFIX) {
     28    pkg_depends_qt += \
    2929        "; Default dependency to Qt libraries" \
    3030        "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"Qt\"}"
    … …  
    3232    # Projects linking to webkit need dependency to webkit
    3333    contains(QT, webkit): {
    34         default_deployment.pkg_prerules += \
     34        # these can be overridden by mkspecs/modules/qt_webkit.pri
     35        isEmpty(QT_WEBKIT_MAJOR_VERSION) {
     36            QT_WEBKIT_MAJOR_VERSION = $${QT_MAJOR_VERSION}
     37            QT_WEBKIT_MINOR_VERSION = $${QT_MINOR_VERSION}
     38            QT_WEBKIT_PATCH_VERSION = $${QT_PATCH_VERSION}
     39        }
     40
     41        pkg_depends_webkit += \
    3542            "; Dependency to Qt Webkit" \
    36             "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION},  {\"QtWebKit\"}"
     43            "(0x200267C2), $${QT_WEBKIT_MAJOR_VERSION}, $${QT_WEBKIT_MINOR_VERSION}, $${QT_WEBKIT_PATCH_VERSION},  {\"QtWebKit\"}"
     44    } else {
     45        default_deployment.pkg_prerules -= pkg_depends_webkit
    3746    }
     47} else {
     48    default_deployment.pkg_prerules -= pkg_depends_webkit pkg_depends_qt
    3849}
    3950

  • trunk/mkspecs/features/symbian/stl.prf

    r561 r769  
    1616
    1717# libstdcppv5 is preferred over libstdcpp as it has/uses the throwing version of operator new
    18 exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) {
    19     LIBS *= -llibstdcppv5.dll
     18STL_LIB = -llibstdcppv5.dll
    2019
    21     # STDCPP turns on standard C++ new behaviour (ie. throwing new)
    22     MMP_RULES += "STDCPP"
    23 } else {
    24     LIBS *= -llibstdcpp.dll
     20# STDCPP turns on standard C++ new behaviour (ie. throwing new)
     21STL_MMP_RULE = "STDCPP"
     22
     23# Fall back to old implementation if that is the only one that is found
     24exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcpp.dll)|exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcpp.dll) {
     25    !exists($${EPOCROOT}epoc32/release/armv5/urel/libstdcppv5.dll):!exists($${EPOCROOT}epoc32/release/winscw/udeb/libstdcppv5.dll) {
     26        STL_LIB = -llibstdcpp.dll
     27        STL_MMP_RULE =
     28    }
    2529}
     30
     31LIBS *= $$STL_LIB
     32MMP_RULES *= $$STL_MMP_RULE

  • trunk/mkspecs/features/uic.prf

    r572 r769  
    1 
    2 isEmpty(QMAKE_UIC3) {
    3     contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
    4     else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3
    5 }
    6 
    7 isEmpty(QMAKE_UIC) {
    8    contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
    9    else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
    10 }
     1defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf
     2qtPrepareTool(QMAKE_UIC3, uic3)
     3qtPrepareTool(QMAKE_UIC, uic)
    114
    125isEmpty(UI_DIR):UI_DIR = .

  • trunk/mkspecs/features/win32/qaxcontainer.prf

    r2 r769  
    99}
    1010
    11 isEmpty(QMAKE_DUMPCPP) {
    12     win32:QMAKE_DUMPCPP = $$[QT_INSTALL_BINS]\dumpcpp.exe
    13 }
     11qtPrepareTool(QMAKE_DUMPCPP, dumpcpp)
    1412
    1513dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE}

  • trunk/mkspecs/features/win32/qaxserver.prf

    r2 r769  
    1515
    1616equals(ACTIVEQT_IDE, "VisualStudio") {
    17     ACTIVEQT_IDC = $${QMAKE_IDC}
     17    ACTIVEQT_IDC = $${QMAKE_IDC}   ### Qt5: remove me
     18    qtPrepareTool(ACTIVEQT_IDC, idc)
    1819    ACTIVEQT_IDL = $${QMAKE_IDL}
    1920    ACTIVEQT_TARGET = "$(TargetPath)"

  • trunk/mkspecs/linux-g++-maemo/qplatformdefs.h

    r651 r769  
    4141
    4242#include "../linux-g++/qplatformdefs.h"
     43
     44#define QT_GUI_DOUBLE_CLICK_RADIUS 20

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm

    r651 r769  
    88# ****************************************************************************/
    99
    10 include $(FLMHOME)/metaflm.mk
    1110
    1211SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
    … …  
    1514define qmake_emulator_deployment
    1615$(ALLTARGET):: $(1)
    17 FINAL::$(1)
    1816
    1917# Prevent duplicate targets from being created

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm

    r651 r769  
    88# ****************************************************************************/
    99
    10 include $(FLMHOME)/metaflm.mk
    1110
    1211SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
    1312
     13$(call makepathfor,$(PREDEP_TARGET))
     14
    1415define qmake_extra_pre_targetdep
    15 $(ALLTARGET):: $(PREDEP_TARGET)
    1616EXPORT:: $(PREDEP_TARGET)
    17 LIBRARY:: $(PREDEP_TARGET)
    18 TARGET:: $(PREDEP_TARGET)
    1917
    2018# Prevent duplicate targets from being created
    2119$(SINGLETON):=1
    2220
    23 $(PREDEP_TARGET): $(DEPS) 
    24         $(call startrule,qmake_extra_pre_targetdep) \
     21$(PREDEP_TARGET): $(DEPS)
     22        $(call startrule,qmake_extra_pre_targetdep,FORCESUCCESS) \
    2523        $(COMMAND) \
    2624        $(call endrule,qmake_extra_pre_targetdep)

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm

    r651 r769  
    88# ****************************************************************************/
    99
    10 include $(FLMHOME)/metaflm.mk
    1110
    1211POST_LINK_TARGET:=POST_LINK_$(PLATFORM_PATH)_$(CFG_PATH)_$(call sanitise,$(LINK_TARGET))
    … …  
    2221define qmake_post_link
    2322$(ALLTARGET):: $(POST_LINK_TARGET)
    24 FINAL:: $(POST_LINK_TARGET)
    2523
    2624$(POST_LINK_TARGET): $(POST_LINK_DEP)

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm

    r651 r769  
    88# ****************************************************************************/
    99
    10 include $(FLMHOME)/metaflm.mk
    1110
    1211SINGLETON:=$(call sanitise,TSTORE_SINGLETON_$(EXTENSION_ROOT))
    … …  
    2827
    2928define qmake_store_build
    30 FINAL:: $(STORE_BUILD_TARGET)
     29$(ALLTARGET):: $(STORE_BUILD_TARGET)
    3130
    3231$(STORE_BUILD_TARGET):

  • trunk/mkspecs/symbian-sbsv2/flm/qt/qt.xml

    r651 r769  
    1717        <!-- Extension interfaces : replacements for Template Extension Makefiles -->
    1818   
    19     <interface name="qt.qmake_extra_pre_targetdep" extends="Symbian.UserFLM"
     19    <interface name="qt.qmake_extra_pre_targetdep.export" extends="Symbian.UserFLM"
    2020                flm="qmake_extra_pre_targetdep.flm">
    2121        <param name='PREDEP_TARGET' />

  • trunk/mkspecs/win32-g++/qmake.conf

    r2 r769  
    7676    MINGW_IN_SHELL      = 1
    7777        QMAKE_DIR_SEP           = /
     78        QMAKE_QMAKE             ~= s,\\\\,/,
    7879        QMAKE_COPY              = cp
    7980        QMAKE_COPY_DIR          = xcopy /s /q /y /i
Note: See TracChangeset for help on using the changeset viewer.