diff options
| author | Bill King <bking@trolltech.com> | 2010-02-09 06:11:09 (GMT) |
|---|---|---|
| committer | Bill King <bking@trolltech.com> | 2010-02-09 06:11:09 (GMT) |
| commit | 3318d412cb78a545790761161f243cb49da4abb7 (patch) | |
| tree | 62d6612926f7bbcce8a1a28cbdb1a382339aa566 /doc/src/snippets/code/doc_src_qmake-manual.qdoc | |
| parent | 7370dceadf969288a22c564728398cc7cb119d82 (diff) | |
| parent | 72f3caa5d7821b93a4e807fb61c5cda9f2c6f393 (diff) | |
| download | Qt-3318d412cb78a545790761161f243cb49da4abb7.zip Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.gz Qt-3318d412cb78a545790761161f243cb49da4abb7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-sql-team into 4.6
Diffstat (limited to 'doc/src/snippets/code/doc_src_qmake-manual.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qmake-manual.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.qdoc b/doc/src/snippets/code/doc_src_qmake-manual.qdoc index 74a469e..a48b53f 100644 --- a/doc/src/snippets/code/doc_src_qmake-manual.qdoc +++ b/doc/src/snippets/code/doc_src_qmake-manual.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -963,9 +963,9 @@ RSS_RULES += myrssrules //! [145] //! [146] -BLD_INF_RULES.prj_exports += \ - "$${LITERAL_HASH}include <platform_paths.hrh>" \ - "rom/my.iby APP_LAYER_PUBLIC_EXPORT_PATH(my.iby)" \ - "inc/myheader.h mycomp/myheader.h" \ - ":zip my_api.zip my_api" +DEPLOYMENT.installer_header = 0x12345678 //! [146] + +//! [147] +DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"My Application Installer\"},(0x12345678),1,0,0" +//! [147] |