summaryrefslogtreecommitdiffstats
path: root/qmake/doc
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Doc: add documentation for QMAKE_HOSTSamuel Gaist2015-08-062-0/+26
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-13745 Change-Id: Ieeecb0f2bb065fe2ec5a1112a25a7b83bf701bd1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Doc: removed reference to index.html in qmake manualNico Vertriest2015-08-271-1/+1
|/ / | | | | | | | | | | | | Task-number: QTBUG-35004 Change-Id: I7a2a76b25551cfe9e17072ce1767384d276b1f4d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-061-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/global/qt-cpp-defines.qdocconf src/3rdparty/forkfd/forkfd.c src/corelib/codecs/qtextcodec.cpp src/corelib/kernel/qmetatype.cpp src/corelib/tools/qset.qdoc src/gui/accessible/qaccessible.cpp src/gui/image/qpixmapcache.cpp src/opengl/qgl.cpp src/tools/qdoc/generator.cpp src/widgets/kernel/qwidget.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
| * Doc: uiplugin in the qmake variable referenceLeena Miettinen2015-07-281-0/+4
| | | | | | | | | | | | Task-number: QTBUG-47180 Change-Id: Ia563445e36b0abb0ef7707e7a0e4241d70e60cfd Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Doc: remove the table of values from QT variable in QMake ManualLeena Miettinen2015-07-281-45/+3
| | | | | | | | | | | | | | | | | | | | Add a link to the topic that lists all Qt modules with links to their documentation. Change-Id: I0f488ea8c2f3479c7bace6ffbdbb7a70324c1649 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | deprecate DEPLOYMENT variableJoerg Bornemann2015-06-022-47/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate the qmake variable DEPLOYMENT that was used for installing files on remote devices for Windows RT and Windows CE Visual Studio projects. Use INSTALLS for both nmake and Visual Studio projects. [ChangeLog][core][qmake] Deprecated the qmake variable DEPLOYMENT in favor of INSTALLS. Task-number: QTBUG-21854 Change-Id: Ia9d2c69feb7d87b0b9dc69ff7c0a68be35a57acd Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Introduce qmake RC_DEFINES for RC preprocessor definesM. Moellney2015-06-022-0/+13
|/ | | | | | | | | | | | | | | | | | qmake win32 generators by default used values of DEFINES for RC preprocessor defines, too. For simple defines this works. For string literals this failed for the .vcxproj files: DEFINES += "FOO=\"BAR BAR\"" works for CL but fails for RC. DEFINES += "FOO=\\\"BAR BAR\\\"" works for RC but fails for CL. This patch introduces the qmake variable RC_DEFINES. The variable contains the preprocessor defines, that are used for RC. If the varible is not set, the DEFINES values are used for RC. Task-number: QTBUG-44184 Change-Id: I4202271759d29de8c1829347ae3ef117eda54b38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Adding qmake doc details for generating rc filesM. Moellney2015-04-152-33/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | The qmake documentation was missing details about when rc files are autogenerated under Windows. A new section about windows rc files is added in "Platform Notes". Some hints are added in section VERSION. Link to new "Platform Notes" section is added. The VERSION example is extended, too. Link to new "Platform Notes" section is added to RC_ICONS as this is a rc file generator trigger, too. The section "Building an Application" gets a link to the "Platform Notes" and the system variable list was shortened by all entries relevant to windows only rc files. Many links to VERSION were not resolved by qdoc. Adds explicit linkage. Change-Id: Iacbc34d53a6bafa6e7658aaee8c751f32e978177 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix qmake generating bizarre msvc /VERSION valuesM. Moellney2015-04-082-0/+14
| | | | | | | | | | | | | | | | | | | | The msvc_nmake and msvc_vcproj generators deduced the exe/dll header version number from the VERSION variable in a "bizarre" way: VERSION=1.2.3.4567 was converted to /VERSION:1.234567. But a minor number beyond 65535 is not accepted by the linker. This fix deduces the major and minor from the major and minor of VERSION: VERSION=1.2.3.4567 leads to /VERSION:1.2. In addition, a new variable is introduced: VERSION_PE_HEADER. With this variable, legacy pro files that rely on the bizarre behavior can re-create it: VERSION=1.2.3.45 and VERSION_PE_HEADER=1.2345 lead to the old result: /VERSION:1.2345 by just taking the VERSION_PE_HEADER to overrule the new behavior. Task-number: QTBUG-44823 Change-Id: Ie093ade83290c098fe2b2a429ce5d6ed6dc750ea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-03-311-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
| * WinRT: Fix documentation for manifest capability descriptionMaurice Kalinowski2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | 0c7241cc contains the wrong identifier for device capabilities. This has been updated in a previous commit, but documentation was not properly updated. Task-number: QTBUG-45098 Change-Id: I300a2ea19ebdf8a1aaed492a1bdf24b9af2bd60a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Andrew Knight <qt@panimo.net>
* | WinRT: Update documentation on icon handlingMaurice Kalinowski2015-03-051-6/+53
| | | | | | | | | | | | | | | | | | ecf6e34efefcedbff0a457ed4b5e0f4e5d096b37 introduced new values to specify icons in the manifest. Change-Id: I8f0cc9790ffd2f50ed2008bc8bab053b3db4965e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-242-7/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
| * qmake: Replace qt-project.org/doc with doc.qt.ioSergio Ahumada2015-02-161-1/+1
| | | | | | | | | | | | Change-Id: I503e4e4c50a147cc1d81019228593f502132f28a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: remove reference to the VS integrationJoerg Bornemann2015-02-131-6/+1
| | | | | | | | | | | | | | | | | | The VS integration does not exist anymore and has been replaced by the Qt VS Add-in years ago. Change-Id: I0202b0b2909318ed8869a738ec87b507c4c746af Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Updated BSD licensed file headersJani Heikkinen2015-02-1511-33/+33
| | | | | | | | | | Change-Id: I6441ff931dbd33b698d762e6f6784898f3f60fe7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1112-61/+61
|/ | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* Doc: added entry for link to main page Qt CreatorNico Vertriest2015-01-161-4/+4
| | | | | | | Task-number: QTBUG-43115 Change-Id: I10413536b981bf248950522dfe07b96394db9c29 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* document QMAKE_CFLAGSOswald Buddenhagen2015-01-091-0/+9
| | | | | | | Task-number: QTBUG-16577 Change-Id: I9ab76dc0715187e059c3403447c27929261bd064 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Mention the c++14 CONFIG option in the qmake variable referenceLaszlo Papp2014-12-201-0/+3
| | | | | | Change-Id: Iaad18c39925c07b9bf068c02f2cda5d7f06fd38f Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Doc: fix copy & paste errorJoerg Bornemann2014-12-121-1/+1
| | | | | | Task-number: QTBUG-8536 Change-Id: I381690b9c25750cbc72de3a36f70879936482e11 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into ↵Simon Hausmann2014-12-051-0/+2
|\ | | | | | | refs/staging/5.4
| * Doc: add navigation info to qmake ManualLeena Miettinen2014-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | Add the navigation.landingpage variable to the qdocconf file. Task-number: QTBUG-42965 Change-Id: Ia5ee411fc0dbd5cd8c2d238f346b0f1818b54289 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Add missing documentation for some variablesAndy Shaw2014-12-051-0/+64
|/ | | | | | | Task-number: QTBUG-5109 Change-Id: I38e12b957cad099d2f815a0d192cf3ab9fee52e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Use title case in section1 titlesNico Vertriest2014-09-301-1/+1
| | | | | | | | Using Python script title-cased.py Task-number: QTBUG-41250 Change-Id: I00d3d7a0b30db7304a7904efd6d63abd9a7b493b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Fixed broken links introduced by "OS X" doc change.Jerome Pasion2014-09-111-22/+22
| | | | | | | | | | | | | -qtdoc repo uses "OS X" instead of "Mac OS X" and this caused broken links. -more comprehensive change still needs to be done but the new name is used in the page to maintain consistency. At least within the page or class. Change-Id: I8a5650046fc0413cbb18359b743ecd30fd62e417 Task-number: QTBUG-40759 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qmake: Add QMAKE_SONAME_PREFIX variableAdam Strzelecki2014-09-082-0/+45
| | | | | | | | | | | If defined, the value of this variable is prepended to the built shared library's SONAME identifier. For more information, see: qmake/doc/src/qmake-manual.qdoc#qmake-soname-prefix Task-number: QTBUG-31814 Change-Id: I4bceaf0c93162e4fad6bb424af1b82e74d38acdc Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-301-0/+12
|\
| * Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-291-0/+12
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslsocket_openssl_symbols.cpp Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
| | * qmake: Document the "aux" template type.Christian Kandeler2014-07-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Better late than never. Change-Id: If3bbeb4dfe3a8d49ceb02d9c2d0f2eff71595105 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Doc: remove old FORMS3 snippetJoerg Bornemann2014-07-301-8/+1
|/ / | | | | | | | | Change-Id: Ibb39c85facfbe8604e4b8a47525eb2c6babd2716 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Removed "url" variable from qdocconf files.Jerome Pasion2014-07-041-1/+0
| | | | | | | | | | | | | | | | url is set in qtbase/doc/global which is inherited by the Qt 5 module qdocconf files. Change-Id: Ieffa174f598f4a3b8ce8be9bfae7ca9b6981f12b Reviewed-by: Martin Smith <martin.smith@digia.com>
* | winrt: Remove WP8.0 references from package manifest featureAndrew Knight2014-06-251-24/+10
|/ | | | | | | Also, harmonize the qmake documentation. Change-Id: I8722370f86982e33ccf97f631ae257c4c46cade2 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-011-0/+10
|\ | | | | | | | | | | This merge adds the opengl rename. Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
| * document new QTPLUGIN magicOswald Buddenhagen2014-04-251-0/+10
| | | | | | | | | | | | | | Change-Id: Ia12f55a3e6bd670cb95c21c8f896b0451dd63693 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Windows Phone: add language control to the package manifestAndrew Knight2014-04-301-0/+7
|/ | | | | | | | | | This allows the developer to provide a list of languages to the manifest by listing them in WINRT_MANIFEST.languages. It also allows setting the default language with WINRT_MANIFEST.default_language. Task-number: QTBUG-38557 Change-Id: I5cb94c9f45146e3068d0833b9e669dc17dca14b2 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* purge vestiges of opengl es 1 supportOswald Buddenhagen2014-04-041-4/+3
| | | | | | | | amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Add documentation for WINRT_MANIFESTMaurice Kalinowski2014-03-311-0/+112
| | | | | | | | Basically a copy of the inline documentation inside the prf file. Task-number: QTBUG-37788 Change-Id: Ie6df1597297223be778c748aad525f5521232cb7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* qmake: add replacement function getenvJoerg Bornemann2014-03-201-0/+7
| | | | | | | | | This is useful for querying environment variables which have parentheses in their name. Such jewels exist on Windows. The usual $$(VARNAME) syntax fails for those. Change-Id: I1d2766cabdc7f637caa9ae6408967685e02f5029 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make property name doc match realityOswald Buddenhagen2014-03-151-1/+1
| | | | | | | | it's QT_INSTALL_CONFIGURATION, not QT_INSTALL_SETTINGS. probably the most useless of all properties, but anyway. Change-Id: Ia1e739ab4ed59e2bcd3199914caed2b3db9070ee Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Fix broken linksSze Howe Koh2014-02-041-7/+5
| | | | | Change-Id: Ic275dfbf0b332fc34ea0fac1c31c4935ad961527 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* qdocconf: Remove nonexistent dependencySze Howe Koh2014-01-151-1/+0
| | | | | Change-Id: I9d2f36102691a2bd8ab0697d20f6eac59d59a84f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* clean out some garbage in CONFIGOswald Buddenhagen2013-12-221-9/+0
| | | | | | | | | | | | | - thread was duplicated - x86 & ppc are obsolete and don't actually do anything - incremental was just plain nonsense (it does something entirely different, and it's better to hide this "feature" from public view) - resources is basically an implementation detail (it's on by default if qtcore is used) Change-Id: I9163af6e8db7988382ccf993d4be280f7faec1f2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix confusion surrounding debug, release & debug_and_releaseOswald Buddenhagen2013-12-221-25/+26
| | | | | | Done-with: Leena Miettinen <riitta-leena.miettinen@digia.com> Change-Id: I1e031402bc3d857cf29782957e5340e3c82f1ed2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: fixed invalid referenceNico Vertriest2013-12-031-0/+1
| | | | | | | | | | Link to "Getting started with qmake" was invalid Task-number: QTBUG-34749 Change-Id: I782dc99f5182f2fe7661377eb82f35ebb50a46cf Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* support a cache that is really just a cacheOswald Buddenhagen2013-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | unlike .qmake.cache & co., the presence of this file has no magic effects on where mkspecs, modules and other things are searched. as the obvious name "cache" is of course already taken, we call it "stash". the file is searched up to the super cache (if present), otherwise up to the normal cache/conf (if present), otherwise up to the root. if it's not found, it is created next to the super cache (if present), otherwise next to the cache/conf (if present), otherwise in the current output directory. note that the cache really should be created and populated by the top-level project if there are subprojects: otherwise, if there is an "anchor" (super/cache/conf), subprojects would race for updating the cache and make a mess. without an "anchor", each subproject would just create its own cache, kind of defeating its purpose. this is no different from the existing "cache", but it's worth mentioning that removing the "anchoring" function does not remove the "nesting order" constraint. Task-number: QTBUG-31340 Change-Id: I786d40cef40d14582a0dd4a9407863001bec4c98 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-2/+1
| | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Ifa55fcd9e402b0e184a41e316340e46aeb7101de Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Mention that the c++11 CONFIG flag sometimes has no effect.Mitch Curtis2013-10-091-2/+3
| | | | | | | | It has no effect when the compiler doesn't support it. Task-number: QTBUG-33952 Change-Id: I23b1fcdf4ec31924b1b59987846f7e0fbf17c6c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Document c++11 CONFIG flag.Mitch Curtis2013-10-081-0/+2
| | | | | | Task-number: QTBUG-33952 Change-Id: I752c85ba1a6d42d9794c18fb3f3198df50952c61 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Doc: Add a dependency to qtdoc for qmake manualTopi Reinio2013-09-111-0/+1
| | | | | | | | | | qmake manual needs to be able to link to pages in qtdoc module, for example, to information about Third Party Libraries. Change-Id: I6ccaa0c3aecc54bd5d76c6b1573c797423048207 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:09:51 +0000