Commit Graph

126 Commits

Author SHA1 Message Date
J-P Nurmi 946b1349ff Add manual test app for buttons
Buttons have so many different states that it's useful have a test app
that can be used to visualize various states in different themes.

Change-Id: Ia714c1d769aa13529c3117852b0d9b625a50d7d0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-07-20 14:39:13 +00:00
J-P Nurmi 30d931b866 Setup a Qt.labs.platform module
This change just prepares the infrastructure and imports an icon
loader helper that will be used for the platform menu, dialog, and
system tray icon implementations.

Change-Id: I34a93050a7c988134c3daa986aca6021eac7a4d1
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-06-16 06:50:07 +00:00
J-P Nurmi 73e722a85f Replace tst_styles with tst_material & tst_universal
The CI was not able to catch failures in tst_styles, because the test
results were output by separate child processes. This change builds
three different versions of tst_controls, which each run with the
appropriate style.

Change-Id: I95b2bdd90221579a3176e827802236d80d9f1a09
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-06-14 14:52:32 +00:00
J-P Nurmi d4e9c964a2 Rename tst_material and tst_universal
These test specificly the QQuickMaterialStyle and QQuickUniversalStyle
implementations, so rename appropriately to make room for the upcoming
tst_material and tst_universal tests. See the next commit for more
details about that.

Change-Id: I08d6116d6219084f6087682b7e712f8499a0e945
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-06-13 14:16:41 +00:00
J-P Nurmi 3f69a5f164 Add a simple manual test for taking screenshots in style docs
Change-Id: Ib5a985796d56b66c5842f2e1ab0e460420f62b54
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2016-05-27 08:19:06 +00:00
J-P Nurmi f2ede1a012 QQuickStyleSelector: fix relative path handling
This makes it possible to pass a relative path to the style:

    ./myapp -style relative/path/to/my/style

To make the tests pass, includes a fix to avoid double slashes in
selected URLs.

Change-Id: I1b366eb7793523dd0f1058236661cedaa1216f3d
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-25 07:19:42 +00:00
J-P Nurmi 8e066180fd Implement case-insensitive style name lookup
Fixes the issue that "./app -style material" did no longer work,
but the case had to match exactly (./app -style Material).

Change-Id: I446654110af670c391f8e304ce8008fbd6e9acaa
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-04-23 12:37:46 +00:00
J-P Nurmi 00e81ce7a2 Fix QQuickDrawerPrivate::positionAt()
The position on the right and bottom edges is relative to the size of
the window, not the drawer itself.

Change-Id: Ia1d7418d4091a3a9e26f691bd75448023e0ca1cf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-04-21 14:08:48 +00:00
J-P Nurmi f70676242f Update .gitignore
Change-Id: Iaca71ec9a4281353bca0d7227f9c4e08ac5a4477
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-04-21 08:10:28 +00:00
J-P Nurmi 200c080375 Update .gitignore
Change-Id: Ib209b03133309069d7bef5df77acf7b50e0e9698
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-03-22 15:21:39 +00:00
J-P Nurmi 2ed7e28517 Turn libQtLabsControls to a public C++ library
Change-Id: Ia4365ff05d59920143d6288b47c383a202eba772
Task-number: QTBUG-50787
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-03-16 12:06:09 +00:00
Laszlo Agocs c64d60e694 D3D12: Basic image support
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>
2016-03-07 16:13:06 +00:00
J-P Nurmi 598d22e425 Update .gitignore
Change-Id: I056acffe44031cfae7b3a4080860b58a15a3a805
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-03-02 13:49:38 +00:00
Laszlo Agocs 2d1f8937ac Add the skeleton for a D3D12 backend
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>
2016-02-19 14:51:37 +00:00
J-P Nurmi f0cd88c0d7 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/imports/controls/universal/ToolButton.qml

Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
2016-02-07 01:35:46 +01:00
J-P Nurmi 2bac7d87d5 Update .gitignore
Change-Id: Iff06544f14964e442b66901d5c23254786008293
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-02 16:17:18 +00:00
J-P Nurmi 8318deb165 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
	src/templates/qquickapplicationwindow_p.h
	src/templates/qquickcombobox.cpp
	src/templates/qquickcombobox_p.h
	src/templates/qquickpopup.cpp

Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
2016-01-28 17:22:53 +01:00
J-P Nurmi de74c0ee3e Add Popup::closePolicy
Change-Id: Ie3d0f50a59aeaab36ec388af897cbf2596269ce3
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-28 09:29:22 +00:00
J-P Nurmi 5ada1525e0 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.gitignore
	src/templates/qquickcombobox_p.h
	src/templates/qquickmenu_p.h
	src/templates/qquickmenu_p_p.h
	src/templates/qquickoverlay_p.h
	src/templates/qquickpopup.cpp
	src/templates/qquickpopup_p.h
	src/templates/qquickstackview_p.cpp

Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
2016-01-25 11:03:53 +01:00
J-P Nurmi a33228fd11 Update .gitignore
Change-Id: Ib223ea2ef258fdc7812ed2daf329263e12292a52
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-01-22 14:09:09 +00:00
J-P Nurmi 7cad85c2f0 Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	src/controls/qquickstyle.cpp

Change-Id: I1c8273012b01726072e5cbfd4369453a780ff03e
2016-01-19 14:22:27 +01:00
J-P Nurmi b0ad4ff4a5 Update .gitignore
Change-Id: I763c889f675be2de199a3bd88fff0472318a831d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-14 14:55:16 +00:00
J-P Nurmi 6cbd098190 Support static builds
Change-Id: I17bb9131603da912597777b2ec0b9be3894ed858
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2016-01-13 15:45:28 +00:00
J-P Nurmi 5805fa6ade Add Gallery example
Task-number: QTBUG-49941
Change-Id: I7bd6b25e12a6e90ba637231790b9a2c7a92bb821
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-12-17 18:47:27 +00:00
J-P Nurmi 61e9e52e31 Update .gitignore
Change-Id: Ia724edb5ab73bd7369141902a82fd15aecc0a87b
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-12-05 13:22:47 +00:00
J-P Nurmi 489e9df743 Add tst_material
Tests that the inheritance of theme & accent works as expected. This
is useful for avoiding regressions in the process of introducing a
shared base class for QQuickMaterialStyle and QQuickUniversalStyle.

Change-Id: Ib2eb5922323131fb531344b80dc928a0a07cca90
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-30 09:53:50 +00:00
J-P Nurmi 07435a6a4f Cleanup .gitignore
Change-Id: Ibd2a4b51e99e9e6cebfee94c7cd734453b56e25f
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-27 23:29:06 +00:00
Mitch Curtis bb807b32b7 Remove pop-o-rama manual test
We will be working on new examples in cooperation with designers
that we can use to manually test and demonstrate popup usage with.

Change-Id: Ib3b2ffaa66f99698e1f27bec3ba0610da32bdd85
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-27 11:37:09 +00:00
J-P Nurmi 899780d171 Update .gitignore
Change-Id: Id762bddf87d7b3eb095d5d262b03349f9d370e27
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-20 19:15:42 +00:00
J-P Nurmi 68f68563c5 Add tst_styles
Re-runs tst_controls with all styles

Change-Id: I1feda621bfd5f48f42742b1f297abd11c6b437a9
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-12 16:13:20 +00:00
J-P Nurmi bf55d2b165 Add Universal style
https://dev.windows.com/design

Change-Id: I1d8c633ae246724649a6ed71b300a56ba9572405
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-12 09:21:47 +00:00
Mitch Curtis fe483bcaa4 Add Material style
Change-Id: I93662a53b42858a5b65154c5ede334182e738dde
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-11-12 07:51:16 +00:00
J-P Nurmi aad982d60f Refactor press and hold tests
We can't rely on timers in auto tests. They are not fired accurately
under heavy CPU load => random CI failures. This change make the press
and hold tests independent of timeouts.

The idea in a nutshell: the test creates two control instances, and
sends press events to both of them. Both controls run their timers and
emit pressAndHold() - unless canceled. The test waits as long as it
takes for the second control to emit pressAndHold(). At that point we
can reliably assume that the first control would have already emitted
the signal, if it was not canceled as appropriate.

Change-Id: I96aaf4d204db368171209271a4a0fa2ff15cc323
Task-number: QTBUG-47963
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-11-12 07:33:30 +00:00
J-P Nurmi 20d00976a0 Update .gitignore
Change-Id: I1de126dd2341f77b00b27695b57665bcbd8e0887
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-10-30 13:40:40 +00:00
J-P Nurmi 7145fc86a8 Add tst_gifs to .gitignore
Change-Id: I0f2c0174527c5e8497b83a74c246923e7b3c4186
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-10-09 20:37:45 +00:00
J-P Nurmi 2f90269465 Fix crash in theme code when loading engines in succession
Store global engine specific themes as dynamic properties on the
engines themselves. This avoids the problem that storing engines
and their themes to a hash map had that destroyed engines and themes
were not cleaned up from the hash map.

Change-Id: I7330995339c263d456f74d33f6535d5ac7d9d5d4
Task-number: QTBUG-48651
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-10-09 13:18:52 +00:00
J-P Nurmi 3f2ac67897 Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-01 09:03:42 +00:00
J-P Nurmi b948c83255 Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0
Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-01 09:03:38 +00:00
J-P Nurmi 98e7b3cca4 Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0
Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-01 09:03:34 +00:00
J-P Nurmi 7d0ab32ffb Fix QQuickDayOfWeekModel::setLocale()
It must emit dataChanged() even if the first day of week of the new
and old locales are the same. The names are most likely different.

Change-Id: I932215821962910ef1fb8a66f2dab81dcc51a3b1
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-09-24 15:28:18 +00:00
J-P Nurmi 2b40d7b8bb Update .gitignore
Change-Id: Idb66ae1aba88c7d8ee4077d4e5e2750a05c13bac
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-09-19 23:00:01 +00:00
Mitch Curtis 0797e0cb20 Merge Qt Quick Extras into Qt Quick Controls
The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.

Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-09-18 14:14:07 +00:00
J-P Nurmi 68e3bd74a6 Update .gitignore
Change-Id: Ia8b12afe818f1806d3c258fa97b1a37de7c23b14
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-09-18 08:31:28 +00:00
J-P Nurmi 5d54fb7b8f Update .gitignore
Change-Id: I948abfd5c7b2b34a176e669b2475f92e90475804
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-09-14 22:10:39 +00:00
J-P Nurmi 6fc6304036 .gitignore: add tst_applicationwindow
Change-Id: Id1924e002fd1954cf4f594bdac53101cb3f94ebd
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-08-27 14:03:54 +00:00
J-P Nurmi be1f632742 Add tst_snippets
This is going to include all snippets used in the documentation,
which will be then automatically tested for vality, and at the
same time the respective screenshots are automatically generated.

Notice that copying the screenshots over to src/doc/images is still
a manual step. This is fully intentional because the screenshot
results may vary quite a bit across different platforms due to
different fonts and so on. FWIW, my personal favorite for generating
the screenshots is OS X.

Change-Id: I72b299f15b498abc1afd0a686c56d43159bee775
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-06-27 08:41:16 +00:00
J-P Nurmi f5b24fd48d Auto test anchors & attached objects
Rename the former tst_declarative to tst_sanity and
extend it with tests to prevent:
a) use of anchors, and
b) multiple attached object instances of the same type.

Anchors are not allowed for two reasons:
- performance (QQuickAnchors is a QObject), and
- to let users relayout delegates (x/y/width/height bindings
  can be overridden, anchors not so easily)

Multiple attached object instances (eg. Theme) can easily happen by
accident. "Theme.fooColor" can be used in the control root, but in all
delegate items, "control.Theme.fooColor" must be used instead.

Change-Id: I4045d5bd717fa21db79d1c3bd618fc450e292fa4
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-06-14 16:10:05 +00:00
J-P Nurmi 7b0007e6c9 Move the drawer example under extras
Change-Id: I61827e005c9c7a047e181c8f23baac9a09a865ee
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-06-11 22:46:55 +00:00
J-P Nurmi ede8e3dcff Auto test 100% declarative QML layer
Not allowed:
- .js files
- signal handlers
- function declarations

Change-Id: I31247f154b96718ca95835120c9e7326e3c97968
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-06-11 16:08:32 +00:00
J-P Nurmi 2cf45bda2f Update .gitignore
Change-Id: I71df0935e69690775a58e868694632be9fbd7f78
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-06-06 07:27:59 +00:00
J-P Nurmi fce93e74ab Update .gitignore
Ignore non-developer build artifacts and intermediate
files to make 'git status' more pleasant to read.

Change-Id: Ie587bc31bcaf673db7c33251e92661ac1e5417b0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-05-15 07:58:19 +00:00
J-P Nurmi 799c991c22 Update .gitignore
Change-Id: I7abcadf4aa6432a59f831ba4321a5bba0b9c49fe
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-04-20 12:40:57 +00:00
J-P Nurmi b898b8c231 Rename benchmarks
Just to make it clear what they actually do. These project names
are also visible in Qt Creator when choosing the run-target...

Change-Id: I95dd54fd1b6cb3369ab19dbaccbd92d104ea5250
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2015-04-09 14:28:51 +00:00
J-P Nurmi 7b971c28e6 Rename Style to Theme
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-04-08 19:18:02 +03:00
J-P Nurmi 6b20665729 Rename tests/benchmark -> tests/benchmarks
Change-Id: I1ffd60772ca4a504d174c3ad4e321bf3c3fb5849
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-03-18 16:25:55 +02:00
J-P Nurmi 54ac1bde8e Add benchmark for the amount of created items & objects
Change-Id: I42328f7129051455150dfb0c77410e72f6ea4ed5
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-02-09 15:45:27 +02:00
J-P Nurmi 8b2a1ec431 Import the Qt Quick Controls 2 prototype
Change-Id: Ib8c0c4160958e5cfea29a6e9df1b3f1fb19715fc
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
2015-02-05 14:50:29 +02:00
Nobuaki Sukegawa ee771dda2e Add files generated by tests to gitignore
Change-Id: I1fac4df1e00cbe37c0c9ea69562dffc1eb4d5111
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-20 20:24:25 +01:00
J-P Nurmi d0c58e6ad2 Cleanup remaining QtQuick.Dialogs leftovers
QtQuick.Dialogs was moved to the qtquickcontrols module in Qt 5.3

Change-Id: I16d03dc1c342d396963c5bec3125b3d11d0d9bed
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-19 13:21:53 +02:00
Rainer Keller e5bed09956 Remove qtdemo from gitignore
QtDemo was removed with a commit in qtdoc.

Change-Id: I75228b748a2307a713f0c86ecf144dae3b3569a3
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-19 09:10:12 +02:00
J-P Nurmi 245352fa45 Build/install the qmleasing tool to bindir
Change-Id: Icc65ecf8ec7e2ef19d4181788706a23b186ead14
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-03-27 18:20:26 +01:00
Shawn Rutledge 2f83bdbe5d Dialogs: use resources for QML and images
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>
2013-10-16 10:39:38 +02:00
Simon Hausmann b67667d0d9 Revert "Simplify JS bindings generation"
This reverts commit f227c3392b.

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>
2013-06-13 14:17:03 +02:00
Simon Hausmann f227c3392b Simplify JS bindings generation
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>
2013-05-06 14:47:45 +02:00
Simon Hausmann 891f702945 Fix compilation with built-in v4vm JS engine
Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-04-15 13:03:20 +02:00
Miikka Heikkinen d194a31bdb Add qmake generated files to .gitignore.
Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-21 08:46:37 +01:00
Yuchen Deng b94b5531b0 Add doc/qtqml and doc/qtquick to .gitignore
Change-Id: I17fa26d5d1481318656b45776f38c3699e873718
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2012-08-28 12:11:27 +02:00
Oswald Buddenhagen ad5ee12241 nicer gitignore
Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-07-10 19:51:29 +02:00
Kent Hansen 35dd4cbd3d Remove QtDeclarative compatibility module
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>
2012-05-14 10:12:24 +02:00
Yuchen Deng c79ad1f30f Add some ignore rules to ignore list
Change-Id: I7953e503d5665aaccf87ca4fe8b1b4169bfae5c8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2012-05-03 18:48:06 +02:00
Alan Alpert 9d2b618fa0 Start of examples refactor
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>
2012-02-24 10:24:58 +01:00
Charles Yin a44a99b3fa update .gitignore
Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-02-02 09:09:37 +01:00
Charles Yin e073343971 update .gitignore
Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56
Reviewed-on: http://codereview.qt.nokia.com/3345
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-08-25 01:58:03 +02:00
Jason McDonald 038776e2aa Remove obsolete testlib files from .gitignore
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>
2011-08-23 10:49:44 +02:00
Liang Qi 14b8b7d3de Add QTDECLARATIVE_VERSION macro for qtdeclarative
Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
2011-05-11 13:21:07 +02:00
axis 10991179a6 Add .gitignore to each module 2011-04-27 12:06:07 +02:00