diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 6 | ||||
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 25 | ||||
| -rw-r--r-- | doc/scripting-api/component.qdoc | 12 |
3 files changed, 17 insertions, 26 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index f23df0e26..a11a39b53 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -34,12 +34,6 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE qch_docs.depends += html_docs qch_docs.files = $$QCH_FILE -unix:!macx { - qch_docs.path = $$PREFIX/doc - qch_docs.CONFIG += no_check_exist - INSTALLS += qch_docs -} - docs_online.depends = html_docs_online QMAKE_EXTRA_TARGETS += html_docs_online docs_online diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index c18ccec47..08c5b5682 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -40,7 +40,7 @@ \section1 Supported Platforms You can use the Qt Installer Framework to create installers for all - platforms supported by \l{Desktop Platforms}{desktop Qt}. + platforms supported by \l[QtDoc]{Supported Platforms}{desktop Qt}. The installers have been tested on the following platforms: @@ -67,30 +67,15 @@ you do not have to deliver Qt libraries, which enables you to distribute installers as one file. - The minimum required Qt version is 5.4.0. + The minimum required Qt version is 5.5. \section3 Configuring Qt for Windows - Usually, you want to tweak Qt to statically link in the C - runtime library. This can be done by changing the default mkspec of - your compiler (Qt 5.4) or by passing \c{-static-runtime} to configure (Qt 5.5 - and newer). - - For Qt 5.4, you need to edit - \c{mkspecs\win32-msvc2013\qmake.conf} and replace in the CFLAGS sections - '-MD' with '-MT': - - \code - QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings - QMAKE_CFLAGS_DEBUG = -Zi -MTd - \endcode - We recommend that you use the following options when you configure Qt for Windows: \code - configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix %CD%\qtbase -release -static -static-runtime -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode @@ -99,7 +84,7 @@ We recommend that you use the following configuration options for Linux: \code - configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode \section3 Configuring Qt for OS X @@ -107,7 +92,7 @@ We recommend that you use the following configuration options for OS X: \code - configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode \section2 Setting up Qt Installer Framework diff --git a/doc/scripting-api/component.qdoc b/doc/scripting-api/component.qdoc index 0dcd28681..1765a1217 100644 --- a/doc/scripting-api/component.qdoc +++ b/doc/scripting-api/component.qdoc @@ -325,6 +325,18 @@ */ /*! + \qmlmethod boolean component::addOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! + \qmlmethod boolean component::addElevatedOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addElevatedOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! \qmlmethod boolean component::addElevatedOperation(string operation, stringlist parameters) Creates and adds an installation operation for \a operation. Add any number of parameters. |