| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/imports/dialogs/DefaultFileDialog.qml
src/imports/widgets/qquickqfiledialog.cpp
Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
|
| |
| |
| |
| |
| | |
Change-Id: Ia739c995005635caf6fd0bd4e495ed8567350e83
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/qml/jsruntime/qv4managed_p.h
Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code.
Change-Id: I2d91518900c9b60ee8e8a8f549c88a1d50632b3d
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Without the QQuickView resizeMode set to
QQuickView::SizeRootObjectToView the text box control
appears in the middle and blocks the squircle effect.
Task-number: QTBUG-35584
Change-Id: Ib8fc40f087a44d05062e900c33b9de5a620d1cc5
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
They are being moved to the QtQuick Controls repository (see change
ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols).
This makes it possible to use QtQuick Controls in the implementation.
[ChangeLog][QtQuick][Dialogs]Moved dialog implementations from
qtdeclarative module to qtquickcontrols module due to dependencies
Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
|\|
| |
| |
| | |
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
|
| |
| |
| |
| |
| | |
Change-Id: I4c4577edde96978a986606bf30fbb925f871bd42
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-34100
Change-Id: Ic06ed2933b76704b1a298de826cbe6b8587fee76
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The existing HTTP url for logo.png was automatically
redirected to an HTTPS url which fails without SSL. So
updated the example to use different HTTP url.
Also updated another image URL, which is invalid now.
Task-number: QTBUG-35557
Change-Id: I793fc5ebda64b21f443da7db9ecda76ae951d5bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
On high-resolution displays it's important to size the window so that
the content will fit. Also show the DPI conversion for pixel density.
Change-Id: Ie35852ecff0bb0ee5ab9b77c6c18e82cfc300448
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/quick/items/qquickitem.cpp
src/quick/items/qquicktext.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-35210
Change-Id: I44bd9f19acba5b59711aa4ca3d2b12c246afcc59
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Sebastian Wozny <swozny@blackberry.com>
|
| |\|
| | |
| | |
| | | |
Change-Id: I894ad7b4888744833f487b481950c087fa960a5c
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update the examples to use Qt's resource file system to
store the qml files in, enabling them to run unmodified
in any platform/build configuration.
Also,
- Chapter 6: Move the plugin code to a subproject
and create a C++ application to use the plugin
- Update documentation related to above chapter
- Add thumbnails for the examples so they will
appear in Qt Creators example list.
Task-number: QTBUG-35001
Change-Id: I29122af11bb11c7e5e17993438e5fc18c7f96f89
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This allows displaying content outside the visible area of
the view.
[ChangeLog][QtQuick] Add displayMarginBeginning/End to
ListView and GridView.
Change-Id: Idf9b5a0cd34a781c9603a9ad98ea189754972ba1
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
|\|
| |
| |
| | |
Change-Id: Id732233d56e8d1706f62ef7a153d4a471406c551
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was more of a manual test than an example: it should be possible
to set the geometry of widget-based and qml-based dialogs. Since it
doesn't work for native dialogs let's not invite bug reports about it.
Change-Id: I43cb97bff0af932268ae541e3f812fc17a1f76ae
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It's normally disallowed without the WindowFullscreenButtonHint.
But if we're going to declare a value for flags, then we have to
put back the Window type which would otherwise be there by default.
Task-number: QTBUG-33607
Change-Id: Ibbd593b2648b98d37c7f70a0b9f96787b0a40f22
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The basic approach is to have the batched renderer create and bind a
vertex array object if it detects we are using an OpenGL Core profile
context. The VAO is bound for the duration of the QQ2 renderer's
work cycle and unbound at the end so as to not interfere with any
other VAO's a user may wish to use.
All shaders have been copied and ported to be compliant with the
GLSL 150 core specification which is the minimum for a Core profile
context (OpenGL 3.2 Core). We are not using any newer features as
yet so this will work anywhere we can get a Core profile context.
The QSGShaderSourceBuilder class has been extended to resolve any
requests for shaders to the same basefilename with "_core"
appended prior to any file extension. This could be extended in
the future to allow version, or GPU or platform specific shaders.
The QSGShaderSourceBuilder has also been extended to allow it to
insert #define definitions in the prologue of a shader. Any such
definition is inserted:
* After the last #extension directive (if any are found)
* Otherwise after the #version directive (if found)
* Otherwise at the start of the shader source
This is required by the custom particle shaders which make
extensive use of such #defines.
In addition the mechanism used by the distance field glyph cache to
extend the cache with new glyphs has been modified to work (and
work more efficiently) when using a Core profile context.
Rather than using a shader program and a buffer filling quad to
blit the old texture into the new cache texture, we instead use
the technique of framebuffer blitting. The existing fallback
implementation using glTexSubImage2D() is still available if
needed.
The DECLARATIVE_EXAMPLE_MAIN macro has been extended to allow easy
testing of any of the QtDeclarative examples with a core profile
context. Just run the example with
QT_QUICK_CORE_PROFILE=1 ./text
for e.g. The only ones that may not work out of the box are those
that provide GLSL shader source e.g. the customparticles or
shader effect examples. These work fine if the shader source is
adapted to GLSL 150 core.
In the future it may be a good idea to expose some context property
to QML that the user can use to determine what shader source
variation to provide to Qt Quick. Along these lines it would also
be very nice to allow the provision of shader source to
ShaderEffect or CustomParticle from a separate source file just as
we now do within Qt Quick.
Task-number: QTBUG-32050
Change-Id: Ia6e9f06dbb8508af9ae03c6b60fb418b4cc9e41f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Incorporate beta feedback, and hide QQmlAbstractUrlInterceptor as the
implementation (instead of making that "the API").
Change-Id: Ib7b14afeb9205fb8a87ed16a6d38b1f468b2aaaa
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|/
|
|
|
| |
Change-Id: I1b67acfdcdb1fb47593a6acd62ffd6c3315b5503
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|
|
|
|
|
|
|
|
| |
This is a more efficient way to expose the StandardButton and
StandardIcon enums.
Change-Id: I9d0becf54be2a883d55c9eaeaf10b83b23e59f3c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix a number of warnings from QML engine by adding
some boundary & sanity checks for properties. Also
address UI update issues by having XMLHTTPRequest
calls to trigger by a timer, instead of directly
binding them to multiple change notifier signals.
Task-number: QTBUG-33867
Change-Id: I48f573050b5dc3e3fe6e75bc423fe86ecc4a2469
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
| |
Change-Id: I273fc08405724158fbf7c7d410bfa38fef4600b1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Converts SameGame to use QML Singleton for storing global settings
data that was previously stored in javascript files. In addition
adds a BlackBerry specific selector to load a different singleton
settings instance.
Change-Id: If511e5efd0e539c764ab70eca4fb0f2874b6240e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
| |
Change-Id: I75a035939a390de8cdae03c11599efa0b7ed68df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
| |
On BB10 the shader effect displayed as a black rectangle.
Change-Id: I9cd12e66875c07cc7ecfa2aec6d7e5912926511e
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
| |
Change-Id: If0852e48dbbfea4fadca9c897ea0e62393763055
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
| |
Change-Id: I5712bbfa0cde9f2fe5fddc35c4cc23597717065c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
You can also manually apply them to a QQmlEngine using
setUrlInterceptor(new QQmlFileSelector(parent)), or using
your own QQmlAbstractUrlInterceptor subclass.
Change-Id: I0c0ff8b080c138686b3c03e0bc3b9f25bcd11a85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/qml.pro
Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The .qdoc files/images for these examples were lost during
modularization. This change adds them back and fixes related
links.
Change-Id: Id5260daad1c38284e3aa8178ae82d24067f4e88c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|/ /
| |
| |
| |
| | |
Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
As with FileDialog, it tries QPA, then QFontDialog, and falls back to
a QML implementation (which is also provided here) if neither type of
native dialog is available.
The update of plugins.qmltypes files will be in a separate commit.
Task-number: QTBUG-31852
Done-with: Shawn Rutledge <shawn.rutledge@digia.com>
Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QQuickAbstractDialog had x/y/width/height properties already but they
didn't do anything. It's still not possible with the native dialogs
because neither QPlatformDialogHelper nor QFileDialogOptions etc.
have any geometric properties; but the application author can now
see and control the geometry of any QML dialog implementation.
Change-Id: Icdac9592c72e81175436436027f7fe3d75ff7f42
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For example on Font Dialogs tab of
examples/quick/dialogs/systemdialogs/systemdialogs.qml
it was possible to open the color dialog by clicking slightly below
the open button, because the color dialog tab was behind the
current one.
Change-Id: If9917e2baef7cfd49a0d01acd73ffa69dfcee088
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add dragType enums with values of None, Automatic, Internal (default).
Setting to Automatic allows startDrag to be called automatically.
Setting to Internal (default) retains old behavior.
Add mimeData to Drag item to enable external drags.
Call startDrag to start drag manually or change from internal drag to
external drag. Added events dragStarted and dragFinished that get
invoked from startDrag.
Mime data must be specified in the mimeData property as
mime-type / data pairs.
Moved QQuickDrag from qquickmousearea* files to qquickdrag* files to
reduce header interdependencies that caused linking errors in other
modules and also to improve code organization.
Allow DropArea to receive and process external data.
Introduced new variable containsDrag to QQuickDropAreaPrivate. This
replaces mimeData which was previously being used to determine if a
drop operation was currently occurring. The problem was that mimeData
was being externally destructed.
Also introduced accessor methods for getting color, html, image, text,
and urls out of the drop. This facilitates dropping of external data of
those types onto a DropArea.
Added example quick/externaldraganddrop.
Task-number: QTBUG-27498
Change-Id: I1420df7c161ea3399e49a23305273e106baa246f
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/quick/qquickgridview/qquickgridview.pro
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Update the example project referred to in Getting Started with Qt
Quick tutorial.
- Fix coding/comment style issues
- Change plugin TARGET name, Use /imports as the
destination directory
- Fix qmldir with proper module info, delete unused
qmldir from /core
- Add a .qmlproject file
Change-Id: If269e61fb76399faae753469dc251d07cc219139
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The example code for getting started with QML doc has six smaller
projects under /parts - these out of sync with the main example
code in its parent directory, they are undocumented and not referred
to in any other documentation. The QML getting started guide itself
uses \code blocks to present the code snippets.
Change-Id: I3b9c83a60fdeb9fa13f364b04c38943222c682cb
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-32578
Change-Id: Ic89058abc55e5e079f44862986b2132114456147
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Qt.openUrlExternally is a nice feature to remind users about, and
gives this file dialog some purpose.
Change-Id: I56e436f8b2f4362891450d57b6d9c36e26983513
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
With the Qt.labs.settings module available, it makes sense for each
example to have its own settings file.
Change-Id: I8257f04ec13c7caf9995e03626e5453c653cfb92
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
-Generated HTML file name conflicted with accessibility group.
Task-number: QTBUG-32580
Change-Id: I5f5a4bb8134268c58105ea61d5ae3bbdd35c0d50
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
-the generated HTML page conflicts with the i18n.html page from qtdoc.
-edited the content.
Task-number: QTBUG-32580
Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749
Reviewed-by: Martin Smith <martin.smith@digia.com>
|