Changeset 769 for trunk/doc/src/snippets


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:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/doc/src/snippets/code/doc_src_deployment.qdoc

    r651 r769  
    464464    ":\"Example Vendor\""
    465465
    466 default_deployment.pkg_prerules = vendorinfo
     466my_deployment.pkg_prerules = vendorinfo
     467DEPLOYMENT += my_deployment
    467468//! [56]
    468469
    … …  
    472473    "[0x1028315F],0,0,0,{\"S60ProductID\"}"
    473474
    474 default_deployment.pkg_prerules += supported_platforms
     475default_deployment.pkg_prerules -= pkg_platform_dependencies
     476my_deployment.pkg_prerules += supported_platforms
     477DEPLOYMENT += my_deployment
    475478//! [57]
    476479

  • trunk/doc/src/snippets/code/doc_src_emb-install.qdoc

    r651 r769  
    4242//! [0]
    4343cd <anywhere>
    44 gunzip qt-embedded-linux-commercial-src-4.6.2.tar.gz
    45 tar xf qt-embedded-linux-commercial-src-4.6.2.tar
     44gunzip qt-everywhere-opensource-src-4.6.3.tar.gz
     45tar xf qt-everywhere-opensource-src-4.6.3.tar
    4646//! [0]
    4747
    4848
    4949//! [1]
    50 ~/qt-embedded-linux-commercial-src-4.6.2
     50~/qt-everywhere-opensource-src-4.6.3
    5151//! [1]
    5252
    5353
     54//! [embedded help]
     55./configure -embedded -help
     56//! [embedded help]
     57
    5458//! [2]
    55 cd  ~/qt-embedded-linux-commercial-src-4.6.2
     59cd  ~/qt-everywhere-opensource-src-4.6.3
    5660./configure -embedded [architecture]
    5761//! [2]
    … …  
    6973
    7074//! [5]
    71 PATH=/usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
     75PATH=/usr/local/Trolltech/QtEmbedded-4.6.3/bin:$PATH
    7276export PATH
    7377//! [5]
    … …  
    7579
    7680//! [6]
    77 setenv PATH /usr/local/Trolltech/QtEmbedded-4.6.2/bin:$PATH
     81setenv PATH /usr/local/Trolltech/QtEmbedded-4.6.3/bin:$PATH
    7882//! [6]

  • trunk/doc/src/snippets/code/doc_src_installation.qdoc

    r651 r769  
    4242//! [0]
    4343cd /tmp
    44 gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
    45 tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
     44gunzip qt-everywhere-opensource-src-4.6.3.tar.gz        # uncompress the archive
     45tar xvf qt-everywhere-opensource-src-4.6.3.tar          # unpack it
    4646//! [0]
    4747
    4848
    4949//! [1]
    50 cd /tmp/qt-everywhere-opensource-src-4.6.2
     50cd /tmp/qt-everywhere-opensource-src-4.6.3
    5151./configure
    5252//! [1]
    … …  
    6969
    7070//! [5]
    71 PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     71PATH=/usr/local/Trolltech/Qt-4.6.3/bin:$PATH
    7272export PATH
    7373//! [5]
    … …  
    7575
    7676//! [6]
    77 setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     77setenv PATH /usr/local/Trolltech/Qt-4.6.3/bin:$PATH
    7878//! [6]
    7979
    … …  
    8686//! [8]
    8787C:
    88 cd /D C:\Qt\4.6.2
     88cd /D C:\Qt\4.6.3
    8989configure
    9090//! [8]
    … …  
    103103//! [11]
    104104cd /tmp
    105 gunzip qt-everywhere-opensource-src-4.6.2.tar.gz        # uncompress the archive
    106 tar xvf qt-everywhere-opensource-src-4.6.2.tar          # unpack it
     105gunzip qt-everywhere-opensource-src-4.6.3.tar.gz        # uncompress the archive
     106tar xvf qt-everywhere-opensource-src-4.6.3.tar          # unpack it
    107107//! [11]
    108108
    109109
    110110//! [12]
    111 cd /tmp/qt-everywhere-opensource-src-4.6.2
     111cd /tmp/qt-everywhere-opensource-src-4.6.3
    112112./configure
    113113//! [12]
    … …  
    130130
    131131//! [16]
    132 PATH=/usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     132PATH=/usr/local/Trolltech/Qt-4.6.3/bin:$PATH
    133133export PATH
    134134//! [16]
    … …  
    136136
    137137//! [17]
    138 setenv PATH /usr/local/Trolltech/Qt-4.6.2/bin:$PATH
     138setenv PATH /usr/local/Trolltech/Qt-4.6.3/bin:$PATH
    139139//! [17]
    140140
    … …  
    147147//! [19]
    148148C:
    149 cd \Qt\4.6.2
     149cd \Qt\4.6.3
    150150configure -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005
    151151//! [19]
    … …  
    170170
    171171//! [23]
    172 cd \Qt\4.6.2
     172cd \Qt\4.6.3
    173173configure -platform win32-g++ -xplatform symbian-abld
    174174//! [23]
    … …  
    209209
    210210//! [31]
    211 cd \Qt\4.6.2
     211cd \Qt\4.6.3
    212212configure -platform win32-g++ -xplatform symbian-sbsv2
    213213//! [31]

  • trunk/doc/src/snippets/code/doc_src_porting4.qdoc

    r651 r769  
    453453richText.setWidth(w);
    454454
    455 // Or set a resonable default size
     455// Or set a reasonable default size
    456456richText.adjustSize();
    457457

  • trunk/doc/src/snippets/code/doc_src_qmake-manual.qdoc

    r651 r769  
    934934
    935935//! [141]
    936 default_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
     936default_deployment.pkg_prerules -= pkg_platform_dependencies
     937my_deployment.pkg_prerules = "[0x11223344],0,0,0,{\"SomeSpecificDeviceID\"}"
     938DEPLOYMENT += my_deployment
    937939//! [141]
    938940
    … …  
    970972DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0"
    971973//! [147]
     974
     975//! [148]
     976# Set conditional libraries
     977LIB.MARM = "LIBRARY myarm.lib"
     978LIB.WINSCW = "LIBRARY mywinscw.lib"
     979LIB.default = "LIBRARY mydefault.lib"
     980
     981# Add the conditional MMP rules
     982MYCONDITIONS = MARM WINSCW
     983MYVARIABLES = LIB
     984
     985addMMPRules(MYCONDITIONS, MYVARIABLES)
     986//! [148]
     987
     988//! [149]
     989SUBDIRS += my_executable my_library
     990my_executable.subdir = app
     991my_executable.depends = my_library
     992my_library.subdir = lib
     993//! [149]
     994
     995//! [150]
     996symbian {
     997    SUBDIRS += emulator_dll
     998    emulator_dll.condition = WINSCW
     999}
     1000//! [150]
     1001
     1002//! [151]
     1003RSS_RULES.service_list += "uid = 0x12345678; datatype_list = \{\}; opaque_data = r_my_icon;"
     1004RSS_RULES.footer +="RESOURCE CAPTION_AND_ICON_INFO r_my_icon \{ icon_file =\"$$PWD/my_icon.svg\"; \}"
     1005//! [151]

  • trunk/doc/src/snippets/code/doc_src_qtestlib.qdoc

    r651 r769  
    111111//! [10]
    112112********* Start testing of TestQString *********
    113 Config: Using QTest library 4.6.2, Qt 4.6.2
     113Config: Using QTest library 4.6.3, Qt 4.6.3
    114114PASS   : TestQString::initTestCase()
    115115PASS   : TestQString::toUpper()

  • trunk/doc/src/snippets/code/doc_src_wince-customization.qdoc

    r651 r769  
    6363//! [4]
    6464cd c:\Qt\mobile5-shadow
    65 C:\Qt\4.6.2\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
     65C:\Qt\4.6.3\configure.exe -platform win32-msvc2005 -xplatform wincewm50pocket-msvc2005 -release
    6666//! [4]
    6767

  • trunk/doc/src/snippets/code/src_corelib_kernel_qobject.cpp

    r651 r769  
    375375           [WRITE setFunction]
    376376           [RESET resetFunction]
     377           [NOTIFY notifySignal]
    377378           [DESIGNABLE bool]
    378379           [SCRIPTABLE bool]
    379380           [STORED bool]
    380            [USER bool])
     381           [USER bool]
     382           [CONSTANT]
     383           [FINAL])
    381384//! [36]
    382385

  • trunk/doc/src/snippets/code/src_corelib_tools_qscopedpointer.cpp

    r651 r769  
    129129
    130130// this QScopedPointer frees its data using free():
    131 QScopedPointer<int, QScopedPointerPodDeleter<int> > podPointer(reinterpret_cast<int *>(malloc(42)));
     131QScopedPointer<int, QScopedPointerPodDeleter> podPointer(reinterpret_cast<int *>(malloc(42)));
    132132
    133133// this struct calls "myCustomDeallocator" to delete the pointer
Note: See TracChangeset for help on using the changeset viewer.