Changeset 874


Ignore:
Timestamp:
Jun 30, 2011, 12:01:24 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

general: Enabled building of QtDeclarative by default. Closes #221.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure.cmd

    r861 r874  
    221221    G.CFG_EXCEPTIONS = "unspecified"
    222222    G.CFG_CONCURRENT = "auto"
     223    G.CFG_GUI = "auto"
    223224    G.CFG_SCRIPT = "auto"
    224225    G.CFG_SCRIPTTOOLS = "auto"
    … …  
    256257    G.CFG_SVG = "yes"
    257258    G.CFG_DECLARATIVE = "auto"
     259    G.CFG_DECLARATIVE_DEBUG = "yes"
    258260    G.CFG_WEBKIT = "auto"
    259261    G.CFG_JAVASCRIPTCORE_JIT = "auto"
    … …  
    700702    G.CFG_LARGEFILE = "no"
    701703    G.CFG_PRECOMPILE = "no" /* GCC 4.4.2 crashes with PCH */
    702     G.CFG_DECLARATIVE = "no" /* sources are not in the tree at all */
    703704
    704705    /*--------------------------------------------------------------------------
    … …  
    971972    /* the current "tests" don't actually need qmake, we just keep the
    972973     * structure similar to ./configure */
     974
     975    /* For many things we simply apply "yes" to "auto" options so far */
     976
     977    if (G.CFG_GUI == "auto")    then G.CFG_GUI = "yes"
     978
     979    if (G.CFG_GIF == "auto")    then G.CFG_GIF = "yes"
     980    if (G.CFG_TIFF == "auto")   then G.CFG_TIFF = "yes"
     981    if (G.CFG_PNG == "auto")    then G.CFG_PNG = "yes"
     982    if (G.CFG_JPEG == "auto")   then G.CFG_JPEG = "yes"
     983    if (G.CFG_MNG == "auto")    then G.CFG_MNG = "yes"
     984    if (G.CFG_ZLIB == "auto")   then G.CFG_ZLIB = "yes"
     985
     986    if (G.CFG_GRAPHICS_SYSTEM == "default") then G.CFG_GRAPHICS_SYSTEM = "raster"
     987
     988    if (G.CFG_MMX == "auto")    then G.CFG_MMX = "yes"
     989    if (G.CFG_3DNOW == "auto")  then G.CFG_3DNOW = "yes"
     990    if (G.CFG_SSE == "auto")    then G.CFG_SSE = "yes"
     991    if (G.CFG_SSE2 == "auto")   then G.CFG_SSE2 = "yes"
     992
     993    if (G.CFG_ACCESSIBILITY == "auto")  then G.CFG_ACCESSIBILITY = "yes"
     994    if (G.CFG_SM == "auto")             then G.CFG_SM = "yes"
     995    if (G.CFG_STL == "auto")            then G.CFG_STL = "yes"
     996    if (G.CFG_CONCURRENT == "auto")     then G.CFG_CONCURRENT = "yes"
     997    if (G.CFG_PHONON == "auto")         then G.CFG_PHONON = "yes"
     998    if (G.CFG_MULTIMEDIA == "auto")     then G.CFG_MULTIMEDIA = "yes"
     999    if (G.CFG_QGTKSTYLE == "auto")      then G.CFG_QGTKSTYLE = "yes"
     1000    if (G.CFG_OPENSSL == "auto")        then G.CFG_OPENSSL = "yes"
     1001    if (G.CFG_DBUS == "auto")           then G.CFG_DBUS = "yes"
    9731002
    9741003    /* auto-detect SQL-modules support */
    … …  
    10531082    end
    10541083
     1084    if (G.CFG_SCRIPT == "auto") then
     1085        G.CFG_SCRIPT = "yes"
     1086
     1087    if (G.CFG_SCRIPTTOOLS == "yes" & G.CFG_SCRIPT == "no") then do
     1088        call SayErr "ERROR: QtScriptTools was requested, but it can't be",
     1089                    "built due to QtScript being disabled."
     1090        call Done 1
     1091    end
     1092
     1093    if (G.CFG_SCRIPTTOOLS == "auto" & G.CFG_SCRIPT \== "no") then
     1094        G.CFG_SCRIPTTOOLS = "yes"
     1095    else if (G.CFG_SCRIPT == "no") then
     1096        G.CFG_SCRIPTTOOLS = "no"
     1097
     1098    if (G.CFG_DECLARATIVE == "yes") then do
     1099        if (G.CFG_SCRIPT == "no" | G.CFG_GUI == "no") then do
     1100            call SayErr "ERROR: QtDeclarative was requested, but it can't be",
     1101                        "built due to QtScript or QtGui being disabled."
     1102            call Done 1
     1103        end
     1104    end
     1105
     1106    if (G.CFG_DECLARATIVE == "auto") then do
     1107        if (G.CFG_SCRIPT == "no" | G.CFG_GUI == "no") then
     1108            G.CFG_DECLARATIVE = "no"
     1109        else
     1110            G.CFG_DECLARATIVE = "yes"
     1111    end
     1112
    10551113    /*--------------------------------------------------------------------------
    10561114     ask for all that hasn't been auto-detected or specified in the arguments
    … …  
    10711129        end
    10721130    end
    1073 
    1074     /* For everything else, simply apply "yes" to "auto" options */
    1075 
    1076     if (G.CFG_GIF == "auto")    then G.CFG_GIF = "yes"
    1077     if (G.CFG_TIFF == "auto")   then G.CFG_TIFF = "yes"
    1078     if (G.CFG_PNG == "auto")    then G.CFG_PNG = "yes"
    1079     if (G.CFG_JPEG == "auto")   then G.CFG_JPEG = "yes"
    1080     if (G.CFG_MNG == "auto")    then G.CFG_MNG = "yes"
    1081     if (G.CFG_ZLIB == "auto")   then G.CFG_ZLIB = "yes"
    1082 
    1083     if (G.CFG_GRAPHICS_SYSTEM == "default") then G.CFG_GRAPHICS_SYSTEM = "raster"
    1084 
    1085     if (G.CFG_MMX == "auto")    then G.CFG_MMX = "yes"
    1086     if (G.CFG_3DNOW == "auto")  then G.CFG_3DNOW = "yes"
    1087     if (G.CFG_SSE == "auto")    then G.CFG_SSE = "yes"
    1088     if (G.CFG_SSE2 == "auto")   then G.CFG_SSE2 = "yes"
    1089 
    1090     if (G.CFG_ACCESSIBILITY == "auto")  then G.CFG_ACCESSIBILITY = "yes"
    1091     if (G.CFG_SM == "auto")             then G.CFG_SM = "yes"
    1092     if (G.CFG_STL == "auto")            then G.CFG_STL = "yes"
    1093     if (G.CFG_CONCURRENT == "auto")     then G.CFG_CONCURRENT = "yes"
    1094     if (G.CFG_PHONON == "auto")         then G.CFG_PHONON = "yes"
    1095     if (G.CFG_MULTIMEDIA == "auto")     then G.CFG_MULTIMEDIA = "yes"
    1096     if (G.CFG_DECLARATIVE == "auto")    then G.CFG_DECLARATIVE = "yes"
    1097     if (G.CFG_SCRIPT == "auto")         then G.CFG_SCRIPT = "yes"
    1098     if (G.CFG_SCRIPTTOOLS == "auto")    then G.CFG_SCRIPTTOOLS = "yes"
    1099     if (G.CFG_QGTKSTYLE == "auto")      then G.CFG_QGTKSTYLE = "yes"
    1100     if (G.CFG_OPENSSL == "auto")        then G.CFG_OPENSSL = "yes"
    1101     if (G.CFG_DBUS == "auto")           then G.CFG_DBUS = "yes"
    11021131
    11031132    /*--------------------------------------------------------------------------
    … …  
    12471276        G.QT_CONFIG = Join(G.QT_CONFIG, "freetype")
    12481277
     1278    if (G.CFG_GUI == "no") then do
     1279        QT_CONFIG = Join(G.QT_CONFIG, "no-gui")
     1280        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_GUI")
     1281    end
     1282
    12491283    if (G.CFG_ZLIB == "yes") then
    12501284        G.QT_CONFIG = Join(G.QT_CONFIG, "zlib")
    … …  
    13241358        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SVG")
    13251359
    1326     if (G.CFG_DECLARATIVE == "yes") then
    1327         G.QT_CONFIG = Join(G.QT_CONFIG, "declarative")
    1328     else
    1329         G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_DECLARATIVE")
    1330 
    13311360    if (G.CFG_WEBKIT == "yes") then do
    13321361        G.QT_CONFIG = Join(G.QT_CONFIG, "webkit")
    … …  
    13371366    end
    13381367    else do
    1339         /* The reason we set CFG_WEBKIT, is such that the printed overview of
    1340          * what will be enabled, shows correctly. */
    1341         G.CFG_WEBKIT = "no"
    13421368        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_WEBKIT")
    13431369    end
    … …  
    13501376    if (G.CFG_SCRIPTTOOLS == "yes") then
    13511377        G.QT_CONFIG = Join(G.QT_CONFIG, "scripttools")
    1352     else do
    1353         G.CFG_SCRIPTTOOLS = "no"
     1378    else
    13541379        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_SCRIPTTOOLS")
    1355     end
     1380
     1381    if (G.CFG_DECLARATIVE == "yes") then do
     1382        G.QT_CONFIG = Join(G.QT_CONFIG, "declarative")
     1383        if (G.CFG_DECLARATIVE_DEBUG == "no") then do
     1384            G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS,,
     1385                                   "QDECLARATIVE_NO_DEBUG_PROTOCOL")
     1386        end
     1387    end
     1388    else
     1389        G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS, "QT_NO_DECLARATIVE")
    13561390
    13571391    if (G.CFG_EXCEPTIONS == "no") then do
    … …  
    19071941    /* @todo process CFG_INCREMENTAL? */
    19081942
    1909     call SayLog "Build ............... "G.CFG_BUILD_PARTS
    1910     call SayLog "Configuration ....... "G.QMAKE_CONFIG G.QT_CONFIG
     1943    call SayLog "Build .................. "G.CFG_BUILD_PARTS
     1944    call SayLog "Configuration .......... "G.QMAKE_CONFIG G.QT_CONFIG
    19111945    if (G.CFG_DEBUG_RELEASE == "yes") then do
    1912        call SayLog "Debug ............... yes (combined)"
     1946       call SayLog "Debug .................. yes (combined)"
    19131947       if (G.CFG_DEBUG == "yes") then
    1914            call SayLog "Default Link ........ debug"
     1948           call SayLog "Default Link ........... debug"
    19151949       else
    1916            call SayLog "Default Link ........ release"
     1950           call SayLog "Default Link ........... release"
    19171951    end
    19181952    else
    1919        call SayLog "Debug ............... "G.CFG_DEBUG
    1920 
    1921     call SayLog "Qt 3 compatibility .. "G.CFG_QT3SUPPORT
     1953       call SayLog "Debug .................. "G.CFG_DEBUG
     1954
     1955    call SayLog "Qt 3 compatibility ..... "G.CFG_QT3SUPPORT
    19221956    if (G.CFG_DBUS == "no") then
    1923         call SayLog "QtDBus module ....... no"
     1957        call SayLog "QtDBus module .......... no"
    19241958    if (G.CFG_DBUS == "yes") then
    1925         call SayLog "QtDBus module ....... yes (run-time)"
     1959        call SayLog "QtDBus module .......... yes (run-time)"
    19261960    if (G.CFG_DBUS == "linked") then
    1927         call SayLog "QtDBus module ....... yes (linked)"
    1928     call SayLog "QtConcurrent code.... "G.CFG_CONCURRENT
    1929     call SayLog "QtScript module ..... "G.CFG_SCRIPT
    1930     call SayLog "QtScriptTools module  "G.CFG_SCRIPTTOOLS
    1931     call SayLog "QtXmlPatterns module  "G.CFG_XMLPATTERNS
    1932     call SayLog "Phonon module ....... "G.CFG_PHONON
    1933     call SayLog "Multimedia module ... "G.CFG_MULTIMEDIA
    1934     call SayLog "SVG module .......... "G.CFG_SVG
    1935     call SayLog "WebKit module ....... "G.CFG_WEBKIT
     1961        call SayLog "QtDBus module .......... yes (linked)"
     1962    call SayLog "QtConcurrent code....... "G.CFG_CONCURRENT
     1963    call SayLog "QtGui module ........... "G.CFG_GUI
     1964    call SayLog "QtScript module ........ "G.CFG_SCRIPT
     1965    call SayLog "QtScriptTools module ... "G.CFG_SCRIPTTOOLS
     1966    call SayLog "QtXmlPatterns module ... "G.CFG_XMLPATTERNS
     1967    call SayLog "Phonon module .......... "G.CFG_PHONON
     1968    call SayLog "Multimedia module ...... "G.CFG_MULTIMEDIA
     1969    call SayLog "SVG module ............. "G.CFG_SVG
     1970    call SayLog "WebKit module .......... "G.CFG_WEBKIT
    19361971    if (G.CFG_WEBKIT == "yes") then do
    19371972        if (G.CFG_JAVASCRIPTCORE_JIT == "auto") then
    1938             call SayLog "JavaScriptCore JIT .. To be decided by JavaScriptCore"
     1973            call SayLog "JavaScriptCore JIT ..... To be decided by JavaScriptCore"
    19391974        else
    1940             call SayLog "JavaScriptCore JIT .. "G.CFG_JAVASCRIPTCORE_JIT
    1941     end
    1942     /* declarative sources are not in the tree at all
    1943     call SayLog "Declarative module .. "G.CFG_DECLARATIVE
    1944     */
    1945     call SayLog "STL support ......... "G.CFG_STL
    1946     call SayLog "PCH support ......... "G.CFG_PRECOMPILE
    1947     call SayLog "MMX/3DNOW/SSE/SSE2..  "G.CFG_MMX"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
    1948     call SayLog "Graphics System ..... "G.CFG_GRAPHICS_SYSTEM
    1949     call SayLog "IPv6 support ........ "G.CFG_IPV6
    1950     call SayLog "Accessibility ....... "G.CFG_ACCESSIBILITY
    1951     call SayLog "NIS support ......... "G.CFG_NIS
    1952     call SayLog "CUPS support ........ "G.CFG_CUPS
     1975            call SayLog "JavaScriptCore JIT ..... "G.CFG_JAVASCRIPTCORE_JIT
     1976    end
     1977    call SayLog "Declarative module ..... "G.CFG_DECLARATIVE
     1978    call SayLog "Declarative debugging .. "G.CFG_DECLARATIVE_DEBUG
     1979    call SayLog "STL support ............ "G.CFG_STL
     1980    call SayLog "PCH support ............ "G.CFG_PRECOMPILE
     1981    call SayLog "MMX/3DNOW/SSE/SSE2 ..... "G.CFG_MMX"/"G.CFG_3DNOW"/"G.CFG_SSE"/"G.CFG_SSE2
     1982    call SayLog "Graphics System ........ "G.CFG_GRAPHICS_SYSTEM
     1983    call SayLog "IPv6 support ........... "G.CFG_IPV6
     1984    call SayLog "Accessibility .......... "G.CFG_ACCESSIBILITY
     1985    call SayLog "NIS support ............ "G.CFG_NIS
     1986    call SayLog "CUPS support ........... "G.CFG_CUPS
    19531987/* @todo do we really need this?
    1954     call SayLog "IPv6 ifname support . "G.CFG_IPV6IFNAME
    1955     call SayLog "getifaddrs support .. "G.CFG_GETIFADDRS
    1956     call SayLog "Iconv support ....... "G.CFG_ICONV
    1957     call SayLog "Glib support ........ "G.CFG_GLIB
    1958     call SayLog "GStreamer support ... "G.CFG_GSTREAMER
     1988    call SayLog "IPv6 ifname support .... "G.CFG_IPV6IFNAME
     1989    call SayLog "getifaddrs support ..... "G.CFG_GETIFADDRS
     1990    call SayLog "Iconv support .......... "G.CFG_ICONV
     1991    call SayLog "Glib support ........... "G.CFG_GLIB
     1992    call SayLog "GStreamer support ...... "G.CFG_GSTREAMER
    19591993*/
    1960     call SayLog "Large File support .. "G.CFG_LARGEFILE
    1961     call SayLog "GIF support ......... "G.CFG_GIF
     1994    call SayLog "Large File support ..... "G.CFG_LARGEFILE
     1995    call SayLog "GIF support ............ "G.CFG_GIF
    19621996    if (G.CFG_TIFF == "no") then
    1963         call SayLog "TIFF support ........ "G.CFG_TIFF
     1997        call SayLog "TIFF support ........... "G.CFG_TIFF
    19641998    else
    1965         call SayLog "TIFF support ........ "G.CFG_TIFF" ("G.CFG_LIBTIFF")"
     1999        call SayLog "TIFF support ........... "G.CFG_TIFF" ("G.CFG_LIBTIFF")"
    19662000    if (G.CFG_JPEG == "no") then
    1967         call SayLog "JPEG support ........ "G.CFG_JPEG
     2001        call SayLog "JPEG support ........... "G.CFG_JPEG
    19682002    else
    1969         call SayLog "JPEG support ........ "G.CFG_JPEG" ("G.CFG_LIBJPEG")"
     2003        call SayLog "JPEG support ........... "G.CFG_JPEG" ("G.CFG_LIBJPEG")"
    19702004    if (G.CFG_PNG == "no") then
    1971         call SayLog "PNG support ......... "G.CFG_PNG
     2005        call SayLog "PNG support ............ "G.CFG_PNG
    19722006    else
    1973         call SayLog "PNG support ......... "G.CFG_PNG" ("G.CFG_LIBPNG")"
     2007        call SayLog "PNG support ............ "G.CFG_PNG" ("G.CFG_LIBPNG")"
    19742008    if (G.CFG_MNG == "no") then
    1975         call SayLog "MNG support ......... "G.CFG_MNG
     2009        call SayLog "MNG support ............ "G.CFG_MNG
    19762010    else
    1977         call SayLog "MNG support ......... "G.CFG_MNG" ("G.CFG_LIBMNG")"
    1978     call SayLog "zlib support ........ "G.CFG_ZLIB
    1979     call SayLog "Session management .. "G.CFG_SM
     2011        call SayLog "MNG support ............ "G.CFG_MNG" ("G.CFG_LIBMNG")"
     2012    call SayLog "zlib support ........... "G.CFG_ZLIB
     2013    call SayLog "Session management ..... "G.CFG_SM
    19802014
    19812015    if (G.CFG_OPENGL == "desktop") then
    1982         call SayLog "OpenGL support ...... yes (Desktop OpenGL)"
     2016        call SayLog "OpenGL support ......... yes (Desktop OpenGL)"
    19832017    else if (G.CFG_OPENGL == "es1") then
    1984         call SayLog "OpenGL support ...... yes (OpenGL ES 1.x Common profile)"
     2018        call SayLog "OpenGL support ......... yes (OpenGL ES 1.x Common profile)"
    19852019    else if (G.CFG_OPENGL == "es1cl") then
    1986         call SayLog "OpenGL support ...... yes (OpenGL ES 1.x Common Lite profile)"
     2020        call SayLog "OpenGL support ......... yes (OpenGL ES 1.x Common Lite profile)"
    19872021    else if (G.CFG_OPENGL == "es2") then
    1988         call SayLog "OpenGL support ...... yes (OpenGL ES 2.x)"
     2022        call SayLog "OpenGL support ......... yes (OpenGL ES 2.x)"
    19892023    else
    1990         call SayLog "OpenGL support ...... no"
     2024        call SayLog "OpenGL support ......... no"
    19912025
    19922026    if (G.CFG_SQL_mysql \== "no") then
    1993         call SayLog "MySQL support ....... "G.CFG_SQL_mysql
     2027        call SayLog "MySQL support .......... "G.CFG_SQL_mysql
    19942028    if (G.CFG_SQL_psql \== "no") then
    1995         call SayLog "PostgreSQL support .. "G.CFG_SQL_psql
     2029        call SayLog "PostgreSQL support ..... "G.CFG_SQL_psql
    19962030    if (G.CFG_SQL_odbc \== "no") then
    1997         call SayLog "ODBC support ........ "G.CFG_SQL_odbc
     2031        call SayLog "ODBC support ........... "G.CFG_SQL_odbc
    19982032    if (G.CFG_SQL_oci \== "no") then
    1999         call SayLog "OCI support ......... "G.CFG_SQL_oci
     2033        call SayLog "OCI support ............ "G.CFG_SQL_oci
    20002034    if (G.CFG_SQL_tds \== "no") then
    2001         call SayLog "TDS support ......... "G.CFG_SQL_tds
     2035        call SayLog "TDS support ............ "G.CFG_SQL_tds
    20022036    if (G.CFG_SQL_db2 \== "no") then
    2003         call SayLog "DB2 support ......... "G.CFG_SQL_db2
     2037        call SayLog "DB2 support ............ "G.CFG_SQL_db2
    20042038    if (G.CFG_SQL_ibase \== "no") then
    2005         call SayLog "InterBase support ... "G.CFG_SQL_ibase
     2039        call SayLog "InterBase support ...... "G.CFG_SQL_ibase
    20062040    if (G.CFG_SQL_sqlite2 \== "no") then
    2007         call SayLog "SQLite 2 support .... "G.CFG_SQL_sqlite2
     2041        call SayLog "SQLite 2 support ....... "G.CFG_SQL_sqlite2
    20082042    if (G.CFG_SQL_sqlite \== "no") then
    2009         call SayLog "SQLite support ...... "G.CFG_SQL_sqlite" ("G.CFG_SQLITE")"
     2043        call SayLog "SQLite support ......... "G.CFG_SQL_sqlite" ("G.CFG_SQLITE")"
    20102044
    20112045    OPENSSL_LINKAGE = ""
    … …  
    20142048    else if (G.CFG_OPENSSL == "linked") then
    20152049        OPENSSL_LINKAGE = "(linked)"
    2016     call SayLog "OpenSSL support ..... "G.CFG_OPENSSL OPENSSL_LINKAGE
     2050    call SayLog "OpenSSL support ........ "G.CFG_OPENSSL OPENSSL_LINKAGE
    20172051
    20182052    if (G.CFG_PTMALLOC \== "no") then
    2019         call SayLog "Use ptmalloc ........ "G.CFG_PTMALLOC
     2053        call SayLog "Use ptmalloc ........... "G.CFG_PTMALLOC
    20202054
    20212055    if (G.QMAKE_EXEPACK \== "") then
    2022         call SayLog "Exepack support ..... yes ("G.QMAKE_EXEPACK")"
     2056        call SayLog "Exepack support ........ yes ("G.QMAKE_EXEPACK")"
    20232057    else
    2024         call SayLog "Exepack support ..... no"
     2058        call SayLog "Exepack support ........ no"
    20252059
    20262060    /* complain about not being able to use dynamic plugins if we are using a static build */
    … …  
    20452079    /* we don't want to print this, it's in .qmake.cache anyway */
    20462080    /*
    2047     call SayVerbose "qmake vars .......... "G.EOL'  'replace(G.QMAKE_VARS,G.EOL,G.EOL'  ')
    2048     call SayVerbose "qmake switches ...... "G.QMAKE_SWITCHES
     2081    call SayVerbose "qmake vars ............. "G.EOL'  'replace(G.QMAKE_VARS,G.EOL,G.EOL'  ')
     2082    call SayVerbose "qmake switches ......... "G.QMAKE_SWITCHES
    20492083    call SayVerbose
    20502084    */

  • trunk/src/declarative/declarative.pro

    r846 r874  
    11TARGET     = QtDeclarative
     2os2:TARGET_SHORT = QtDecl
    23QPRO_PWD   = $$PWD
    34QT         = core gui script network
Note: See TracChangeset for help on using the changeset viewer.