summaryrefslogtreecommitdiffstats
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Add .qmake.stash to .gitignoreMitch Curtis2019-05-031-0/+1
| | | | | Change-Id: I9465c71e870332c275ac7d2476096b348af33b99 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Add *.pro.user.* to .gitignoreMitch Curtis2019-01-281-0/+2
| | | | | | | To ignore likes like foo.pro.user.4.8-pre1 Change-Id: If00bc540da49a06aa2be8ec38bc900996c6837c0 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Move the QML_COMPILE_HASH macro definition from the command-lineThiago Macieira2018-02-211-0/+1
| | | | | | | | | | | | If it's in the command-line, it is added to the precompiled header, which won't be regenerated if the macro changed. Instead, let's create a header that can be #included only in the file it needs to. Since qmldevtools compiles the file that has this new #include, we need to ensure it was created before the module is compiled. Change-Id: I940917d6763842499b18fffd1513b9c64cd98387 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-191-0/+5
|\ | | | | | | Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
| * Update .gitignoreSimon Hausmann2016-08-151-0/+5
| | | | | | | | | | | | | | | | | | Added the target wrappers shell scripts generated by commit 282f15feaae4c525602d537ab65cb61987eb5f7f from qtbase to the list of ignored files. Similarly the config.log is also not desirable for version tracking. Change-Id: I5cf832ea706f2109d2935cc6a086ece0979cc588 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Ignore generated QML/JS code cache filesSimon Hausmann2016-08-151-0/+4
| | | | | | | | | | Change-Id: Ic6fd156a1f9088c35d217a6f450610ac4b7d3284 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | D3D12: Basic image supportLaszlo Agocs2016-03-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now there is no mipmapping, no atlases, and all image data is converted to RGBA8888. Regardless, this already makes it possible to use basic Image elements. Follow the same pattern as with rectangles: most of the code is shared via a material-less, abstract QSGDefaultNoMaterialImageNode, with the material-related bits provided by QSGDefaultImageNode for GL and QSGD3D12ImageNode for D3D. Also fixes the harmless but incorrect miscalculation of the VBV size for indexed draws. Image data is copied into an intermediate upload buffer when invoking the render context's createTexture(). The upload is triggered on a separate copy command queue. The main command queue is synchronized via a fence before executing the commands for the current frame. Root signatures are now cached more cleverly and include zero or more SRVs as parameter 1. This involves the engine having to manage a shader (GPU) visible CBV-SRV-UAV descriptor heap as well. Change-Id: I67c35577ff2677e1c7776dd8e5011860e2d78b00 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* | Add the skeleton for a D3D12 backendLaszlo Agocs2016-02-191-0/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proof of concept. The plan is to proceed slowly with supporting node types one by one, starting with QSGRectangleNode. Opaque rectangles work already, but only non-smooth for now. The renderer is incomplete (no clip/opacity) and is based on simplerenderer on scenegraph playground. Buffer handling is not necessarily optimal yet. Use QT_QUICK_BACKEND=d3d12 to request this backend. Set QT_D3D_DEBUG=1 to enable the D3D debug layer. The render loop handles everything, incl. swap chain setup, handling resizes, etc. This being D3D, there are no further enablers needed from the QtGui or platform plugin side. By default the first hardware adapter is picked. In the absence of that, WARP is tried. The list of adapters is printed at startup, use QT_D3D_ADAPTER_INDEX to force a given card in case there are multiple ones in the system. The goal is not to productize a fast and great renderer, but to pave the way to better future backends for D3D12 and similar graphics APIs. Compiling in the support into Qt Quick is bad since the dependency onto d3d12.dll is not necessarily acceptable, but it's good enough for now, this being a wip branch. Change-Id: Ifbe088e7507223328096b22eec2c73f77bb5680e Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add files generated by tests to gitignoreNobuaki Sukegawa2014-12-201-3/+11
| | | | | Change-Id: I1fac4df1e00cbe37c0c9ea69562dffc1eb4d5111 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Cleanup remaining QtQuick.Dialogs leftoversJ-P Nurmi2014-09-191-1/+0
| | | | | | | QtQuick.Dialogs was moved to the qtquickcontrols module in Qt 5.3 Change-Id: I16d03dc1c342d396963c5bec3125b3d11d0d9bed Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* Remove qtdemo from gitignoreRainer Keller2014-09-191-1/+0
| | | | | | | QtDemo was removed with a commit in qtdoc. Change-Id: I75228b748a2307a713f0c86ecf144dae3b3569a3 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Build/install the qmleasing tool to bindirJ-P Nurmi2014-03-271-0/+1
| | | | | Change-Id: Icc65ecf8ec7e2ef19d4181788706a23b186ead14 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Dialogs: use resources for QML and imagesShawn Rutledge2013-10-161-0/+1
| | | | | | | | | | | | | | | | All the qml and image files are embedded in the QtQuick.Dialogs plugin. If DefaultFileDialog.qml is missing from the installation directory, loading from resources will be enabled. Otherwise, the files will be loaded from the local path. This is analogous to change b2e5d1acb1aca93157a6d4d0a026153134f9ad01 in Qt Quick Controls: it reduces the number of files that need to be installed, but also preserves ease of debugging whenever the QML files are separately installed. Task-number: QTBUG-31565 Change-Id: Idbe6be5d818eb6a25367f2053ea52bc7ac1485bc Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Revert "Simplify JS bindings generation"Simon Hausmann2013-06-131-2/+0
| | | | | | | | | | | | This reverts commit f227c3392beda68beb2792eb9fec467d9a0794da. Conflicts: src/qml/qml/v4/qv4object_p.h src/qml/qml/v4/v4.pri src/qml/qml/v4/v4classgen Change-Id: I8aba402878a460ac612c853d14650efc6cb21761 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Simplify JS bindings generationSimon Hausmann2013-05-061-0/+2
| | | | | | | | Added a little helper script that can generate the code to set up the prototype properties Change-Id: I957ed4419c8b16398720fea4203c1a00434c4fba Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix compilation with built-in v4vm JS engineSimon Hausmann2013-04-151-0/+8
| | | | | Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-211-0/+3
| | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add doc/qtqml and doc/qtquick to .gitignoreYuchen Deng2012-08-281-0/+2
| | | | | Change-Id: I17fa26d5d1481318656b45776f38c3699e873718 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* nicer gitignoreOswald Buddenhagen2012-07-101-0/+1
| | | | | Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove QtDeclarative compatibility moduleKent Hansen2012-05-141-4/+0
| | | | | | | | | | | | | | | When the QtDeclarative module was renamed to QtQml, a compatibility module was introduced to avoid disrupting downstream projects. Time has passed, and it's now appropriate to remove this module. Existing projects that haven't ported can still use the bin/rename-qtdeclarative-symbols.sh script to ease the porting. Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
* Add some ignore rules to ignore listYuchen Deng2012-05-031-0/+4
| | | | | Change-Id: I7953e503d5665aaccf87ca4fe8b1b4169bfae5c8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Start of examples refactorAlan Alpert2012-02-241-15/+1
| | | | | | | | | | | | This is the general reorg of the examples directory structure, plus additional guidelines. calculator, animations and accessibility have been updated to the new standards and tested, as an example. Task-number: QTBUG-24133 Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* update .gitignoreCharles Yin2012-02-021-0/+2
| | | | | | Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* update .gitignoreCharles Yin2011-08-251-0/+13
| | | | | | Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56 Reviewed-on: http://codereview.qt.nokia.com/3345 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Remove obsolete testlib files from .gitignoreJason McDonald2011-08-231-2/+0
| | | | | | | Change-Id: Id68d91dcf6c6d980e59aeb97ab9f8a57ffedb7b4 Reviewed-on: http://codereview.qt.nokia.com/3369 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Add QTDECLARATIVE_VERSION macro for qtdeclarativeLiang Qi2011-05-111-0/+2
| | | | | | | Provide version info for each library. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* Add .gitignore to each moduleaxis2011-04-271-0/+261