diff options
Diffstat (limited to 'doc/src/snippets')
6 files changed, 110 insertions, 5 deletions
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc index b3c9903..ac94cf7 100644 --- a/doc/src/snippets/code/doc_src_installation.qdoc +++ b/doc/src/snippets/code/doc_src_installation.qdoc @@ -225,10 +225,8 @@ SYMBIANBUILD_DEPENDENCYOFF=1 //! [34] cd src\s60installs -patch_capabilities.pl Qt_template.pkg release-armv5 make sis QT_SIS_OPTIONS=-i cd ..\3rdparty\webkit\WebCore -patch_capabilities.pl QtWebkit_template.pkg release-armv5 make sis QT_SIS_OPTIONS=-i //! [34] @@ -240,3 +238,87 @@ cd ..\3rdparty\webkit\WebCore patch_capabilities.pl QtWebKit_template.pkg release-armv5 "ALL -Tcb -AllFiles -DRM" make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> //! [35] + +//! [36] +EPOCROOT=/home/user/s60-sdk/ +export EPOCROOT +//! [36] + +//! [37] +PATH=/home/user/qt/%VERSION%/bin:$EPOCROOT/epoc32/tools:$PATH +export PATH +//! [37] + +//! [38] +cd /home/user/qt/%VERSION% +./configure -platform linux-g++ -xplatform symbian/linux-armcc -arch symbian +//! [38] + +//! [39] +cd /home/user/qt/%VERSION% +./configure -platform linux-g++ -xplatform symbian/linux-gcce -arch symbian -no-webkit +//! [39] + +//! [40] +make +//! [40] + +//! [41] +cd src/s60installs +make sis +//! [41] + +//! [42] +cd src/s60installs +patch_capabilities.pl Qt_template.pkg - "ALL -Tcb -AllFiles -DRM" +make sis QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> +cd ../3rdparty/webkit/WebCore +patch_capabilities.pl QtWebKit_template.pkg - "ALL -Tcb -AllFiles -DRM" +make sis QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<certificate key file> +//! [42] + +//! [43] +lsusb +//! [43] + +//! [44] +sudo rmmod usbserial +sudo modprobe usbserial vendor=0x0XXX product=0x0XXX +//! [44] + +//! [45] +$ qmake -version +QMake version 2.01a +Using Qt version 4.6.2 in /usr/lib/qt4 +//! [45] + +//! [46] +cd $HOME/runonphone +qmake +make +//! [46] + +//! [47] +runonphone -s lib/Qt.sis +//! [47] + +//! [48] +cd demos/embedded/fluidlauncher +runonphone -s fluidlauncher.sis fluidlauncher.exe +//! [48] + +//! [49] +cd myapp +qmake +make +make sis +runonphone -s myapp.sis myapp.exe +//! [49] + +//! [50] +nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis +nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis +nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis +//! [50] + + diff --git a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp index 22ea240..e3ad483 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp @@ -67,3 +67,23 @@ beginInsertColumns(parent, 6, 8); //! [5] beginRemoveColumns(parent, 4, 6); //! [5] + + +//! [6] +beginMoveRows(sourceParent, 2, 4, destinationParent, 2); +//! [6] + + +//! [7] +beginMoveRows(sourceParent, 2, 4, destinationParent, 6); +//! [7] + + +//! [8] +beginMoveRows(parent, 2, 2, parent, 0); +//! [8] + + +//! [9] +beginMoveRows(parent, 2, 2, parent, 4); +//! [9] diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp index 2d86f8c..77c67ab 100644 --- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp +++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp @@ -374,10 +374,13 @@ Q_PROPERTY(type name READ getFunction [WRITE setFunction] [RESET resetFunction] + [NOTIFY notifySignal] [DESIGNABLE bool] [SCRIPTABLE bool] [STORED bool] - [USER bool]) + [USER bool] + [CONSTANT] + [FINAL]) //! [36] diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp index ad5725e..13040ea 100644 --- a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp +++ b/doc/src/snippets/code/src_gui_text_qtextlayout.cpp @@ -42,7 +42,6 @@ //! [0] int leading = fontMetrics.leading(); qreal height = 0; -qreal widthUsed = 0; textLayout.beginLayout(); while (1) { QTextLine line = textLayout.createLine(); @@ -53,7 +52,6 @@ while (1) { height += leading; line.setPosition(QPointF(0, height)); height += line.height(); - widthUsed = qMax(widthUsed, line.naturalTextWidth()); } textLayout.endLayout(); //! [0] diff --git a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp index d97d61a..800a332 100644 --- a/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp +++ b/doc/src/snippets/code/src_qdbus_qdbusmetatype.cpp @@ -40,5 +40,6 @@ ****************************************************************************/ //! [0] +#include <QDBusMetaType> qDBusRegisterMetaType<MyClass>(); //! [0] diff --git a/doc/src/snippets/declarative/script.js b/doc/src/snippets/declarative/script.js new file mode 100644 index 0000000..cd67311 --- /dev/null +++ b/doc/src/snippets/declarative/script.js @@ -0,0 +1 @@ +# Just here so that workerscript.qml succeeds. |