summaryrefslogtreecommitdiffstats
path: root/qmake/doc
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-071-2/+4
|\ | | | | | | Change-Id: I9ee4176f0a0078908d49896508826154c9f71530
| * Doc: update Project Options section in qmake ManualLeena Miettinen2013-08-271-2/+4
| | | | | | | | | | | | | | | | | | | | Explain which mkspecs have the configuration option precompile_header set. Task-number: QTBUG-25683 Change-Id: I9b11eafad16b65523cbb90897fe88829add58bea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-272-9/+14
|\| | | | | | | | | | | | | Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
| * Doc: update description of qmake SUBDIRS variableLeena Miettinen2013-08-262-9/+14
| | | | | | | | | | | | | | | | | | | | | | You can specify a relative path to a .pro file in any directory. Fixed a capitalization issue and a grammar issue and changed the visible text in a link target. Task-number: QTBUG-14139 Change-Id: Ib476bd400c46645709950c582492edcaaba9d7ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-212-0/+135
|\| | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * Doc: public test functions in function librariesLeena Miettinen2013-08-152-0/+135
| | | | | | | | | | | | | | Task-number: QTBUG-29168 Change-Id: Ife486d65778ee2ac2d6e1e55f26942bda0bbdbb0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-142-1/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| * Doc: fix links to documentation in other modulesLeena Miettinen2013-08-081-0/+49
| | | | | | | | | | | | | | | | | | | | | | Add the depends variable with all modules as values, because the QT variable value documentation should list the import statements for all modules. This patch enables linking to other modules. Change-Id: I521ac22bac27d79537c14583f6592251288974a4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Add keywords for qmake variable/function reference pagesTopi Reinio2013-07-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Help mode in Qt Creator, many have accustomed to search e.g. for 'qmake variable reference' which no longer exists as a title in the qmake documentation. This change provides easier access to the qmake reference by creating keywords for them, making them appear in search results for searches starting with 'qmake'. Task-number: QTBUG-32268 Change-Id: If60a0cdc11464a8aeb50c62ddbde9683326e1384 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Doc: Fixed qmake manual's images and snippets directories.Jerome Pasion2013-08-1335-184/+183
| | | | | | | | | | | | | | | | | | | | | | -corrected qmake.qdocconf file to not read the manual twice -moved the snippets and images directories to make sure they are not in the src directory Task-number: QTBUG-32580 Change-Id: I7b702ce3b1c8709bbb1f473f70625083242f1a40 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Doc: add winextras to the list of QT variable valuesLeena Miettinen2013-08-082-0/+4
|/ | | | | | | | | Qt Windows Extras is a new add-on for Qt 5.2. To make the link work, also added qtwinextras to the doc configuration file. Change-Id: Ib7d117908c241812c200ec701b6f2be27fe893c6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: added more details about contains(variablename,value)Nico Vertriest2013-06-191-2/+4
| | | | | | | Task-number: QTBUG-31428 Change-Id: Ie9b4a1f5392f24b5b0b2cb94115edd0814ba92d1 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move qmake docs into qtbaseOswald Buddenhagen2013-06-1735-0/+6149
as of qttools/18a5e89623815f5355b4173a2e93609eb10289d1 Change-Id: I75cb55e0c404449a4e0d963e09185287a3f6343e Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 22:05:06 +0000