| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16004
Reviewed-by: Richard Moe Gustavsen
|
|\ \ |
|
| |/
| |
| |
| |
| |
| | |
Task-number: QTBUG-16004
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit 07ce2c31c3e020ad7c5ea4d7cc94296b6860adac)
|
|/ |
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
| |
Snake now uses the runtime property, which we don't have in QtDemo.
Task-number: QTBUG-15048
|
| |
|
|
|
|
|
| |
Task-number: QTBUG-14250
Reviewed-by: Martin Jones
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |
|
|
|
|
| |
Also changes the line documenting the quit signal on QDeclarativeEngine.
|
| |
|
|
|
|
|
|
|
| |
If declarative is configured out then QtDemo will now still build, with
all declarative demos disabled.
Task-number: QTBUG-12983
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
|
|
|
|
|
| |
Task-number: QTBUG-12485 QTBUG-12651
Reviewed-by: ck
|
|
|
|
| |
description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
|
|
|
|
|
|
| |
It relied on the now missing pixmap property. Since it isn't used, it
doesn't seem worth the effort to update it to use a declarative image
provider instead.
|
|
|
|
|
|
|
| |
Some people didn't figure it out intuitively, so extra help is now
provided.
Task-number: QTBUG-11868
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
|
| |
| |
| |
| | |
Task-number: QTBUG-11803
|
| |
| |
| |
| | |
Don't close on right click inside the demo.
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Task-number: QTBUG-11651
|
|/
|
|
|
|
|
| |
On case insensitive platforms, it would accidently pick up internal
components sometimes if you check the other way around.
Task-number: QTBUG-11566
|
| |
|
|
|
|
|
|
|
|
| |
Not sure whether it was the correct behaviour for a MouseArea to have
when enabled is false but hoverEnabled is true, that it would still get
hover events. But the current behaviour is unambigious and correct.
Task-number: QTBUG-11564
|
|
|
|
|
|
|
| |
If I missed any, just set inAnotherDemo to true on the SameGame root
item.
Task-number: QTBUG-11562
|
|
|
|
| |
Task-number: QTBUG-11411
|
|
|
|
|
|
| |
-don't crash if we aren't showing the FPS
-different method of unloading the QML example when hidden
-fix screwed up background when scaled.
|
|
|
|
|
| |
Make the UX more controlled from QML, and tweak the frame to be better.
Blur mechanism has been reworked, but still disabled by default.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Includes minor changes and additions to the existing doc and examples,
so that they follow Qt conventions better.
Note that while blurring the background was part of the plan for the
embedded QML viewer I could not get it to perform well enough. In the
future, when blur is fast enough (or someone else can get it to
perform better than I) -use-blur should become the default, and
-no-blur the option.
Task-number: QTBUG-10582
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This application is a demo which uses the QtMultimedia APIs to
capture and play back PCM audio. While either recording or playback
is ongoing, the application performs real-time level and frequency
spectrum analysis.
Reviewed-by: Alessandro Portale
|
|/
|
|
|
|
|
| |
This prevent debug and release object file to be mixed up when
linking these application in a debug_and_release configured Qt.
Reviewed-by: Marius Storm-Olsen
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
This fixes a valgrind warning.
|
|
|
|
|
|
|
|
|
| |
Brings the video examples into multimedia directory, and removes the
audio sub-directory so the directory structure is in line with the other
example categories.
Task-number: QT-667
Reviewed-by: Kurt Korbatits
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian already has the executables musicplayer.exe, mediaplayer.exe and
ftp.exe, with the result that we overwrite them with Qt. We solve this
by renaming the examples, and do it not only on Symbian, such that Qt
remains consistent across platforms.
This was previously partly done for mediaplayer. The folder name needs
to be consistent with the executable, for qtdemo to work. Done jointly
with Alessandro.
Task-number: QTBUG-4743
Reviewed-by: Alessandro Portale
Reviewed-by: Frans Englich
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
demos/embedded/fluidlauncher/fluidlauncher.pro
src/corelib/io/io.pri
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_s60.cpp
src/s60installs/qt_libs.pro
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
Task-number: 260779
Reviewed-by: Morten Engvoldsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This happens only when the standarddialogs demo is run from qtdemo. On
Windows 7, calling the GetOpenFileName() caches something in
%SystemDrive%\ProgramData\Microsoft\Windows\Caches. qtdemo was removing
all environment variables other than PATH for the child processes. This
caused the example to dump the cache in current directory instead.
Task-number: 260898
Reviewed-by: Jens Bache-Wiig
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
| |
| |
| |
| |
| |
| | |
The tank game example no longer exists, and should not be listed here.
Reviewed-by: Prasanth
|