| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Task-number: 176267
Reviewed-by: Justin McPherson
|
|
|
|
|
|
|
|
| |
The test mimics examples/opengl/framebufferobjects in that it begins a
QPainter on a QGLWidget in it's paint event, then begins a second
QPainter on a QGLFramebufferObject, leaving 2 painters active at the same
time. When the FBO's painter is ended, GL rendering should be
re-targetted at the QGLWidget automatically.
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/network/access/qnetworkaccessbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
any point. Rather then keep a separate pointer to the cache in the
reply use the pointer kept by the manager so the reply never tries
to access a cache pointer that has already been deleted.
Autotest: included
Merge-request: 1124
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
the temporary cache rather than QDesktopServices::DataLocation
Merge-request: 1124
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Default value for script id in tests should be <-1, because -1 mean that
there is no script and all numbers >0 are valid. Two test cases were
marked as expected to fail.
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
The test also checks that when we ask for CombinedDepthStencil, that's
what we get.
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| | |
Call to JSC::Debugger::exceptionCatch when exception is catched were
added for JIT enabled. Few XFAIL were moved.
Reviewed-by: Kent Hansen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem is that deleting the previous model would triggera delayed
reset. This reset could happen after the model has changed and nodes
are expanded. We can now cancel a reset when reset is called from
another place (like when we set a new model).
Note: autotest included
Task-number: 245654
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of using different paths on Mac and Windows we now simply
use ":\icons" on all platforms. It is a little more effort to create
resources but it is certainly the Qt way to do it. :)
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the case of optimized animated gifs, we don't want to discard
the contents of the previous frame, this is handled if needed in the
disposal process.
Task-number: 247365
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| | |
Now it verifies that there are two non-intersecting polygons.
Reviewed-by: Gunnar Sletta <gunnar@trolltech.com>
|
| | |
|
| |
| |
| |
| |
| | |
This test failed randomly in the past, and more often on a KDE4
desktop with a slow graphics card.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
The +1 must be added to the version, not the serial number.
Reviewed-by: trustme
|
|\ \ \
| |/ / |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adds some cleanups (using QVarLengthArray), and reverting to the
initial and correct calculation (when the driver doesn't deem fit to
return SQL_NO_DATA).
|
| |/ /
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|\ \ \
| |/ /
|/| /
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fixes a regression introduced in 4.5.2 where QTemporaryFile would
no longer attempt to generate a random name after a failed open. Under
certain situations, this led to a non-random file being left behind in
QDir::tempPath when using the fallback implementation of QFile::copy.
Avoid calling QFSFileEngine::setFileName() on a template, so as not to
process it as file name.
By consistently not calling setFileTemplate in the constructor, we also
delay allocation of the fileEngine. Changes made to that function also
keep it from unnecessarily allocating the fileEngine.
Task-number: 260165
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| |
| | |
ietf.org changed their server to use gzip, therefore our check for the
content-length reply header was bogus.
Rev-By: Peter Hartmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
This implicitly adds "grayscale" support for indexed 8, but
only for the conversion. The alternative would be leave the pixels
uninitialized which would be less nice...
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since we need QMargins for other things then
the CSS helper functions in drawutil, we have to make it more
generic. It is already useful for QWidget::contentsMargins
for example. This ensures we have some flexibility on how to
use and modify it in the future.
Reviewed-by: mbm
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Consolidated Interlocked* declarations and API implementation through
macro hackery, (hopefully) for improved readability and maintainability.
Fixes anti-aliasing warnings with MinGW in qatomic_windows.h. Gcc
builds now use inline assembly for atomic operations, instead of relying
on Interlocked* functions which aren't consistently declared across
implementations (mingw32, mingw-w64, wine... others?).
Drops support for VC 6 and MetroWerks.
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| |
| |
| | |
Oops, forgot to remove the autotest after rewriting the gestures api.
Reviewed-by: trustme
|
| |
| |
| |
| | |
The data is essentially random line noise that happens to live in a .cpp file.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you show a child panel of an active panel, the child will now be
activated and the parent deactivated. Hiding the child panel will
reactive the parent. If the parent is 0, no other panel is activated.
Reparenting a panel onto an active panel will also activate the (new)
child. Reparenting away does not affect activation in any way.
This change also fixes QGraphicsWidget::isActiveWindow(), which returned
true for all toplevel widgets (not in a panel/window). This is wrong;
either the non-panel items are active, or a panel is active. The
correct behavior is the same as calling QGraphicsItem::isActive(). Fixed
the autotests (which wrongly tested that both a panel and a non-panel
item were active at the same time).
This change causes popups (QGraphics{Proxy,}Widget) to deactivate the
parent widget. On the positive side this activates the popup, and ensures
that the parent regains proper focus when the popup is closed. However
it also means the parent widget is inactive while the popup is open,
which (e.g.) causes editable combobox line edit cursors to stop blinking.
This is to be fixed soon, but the fix is a bit big so we'll do that later.
Autotests included.
Reviewed-by: Brad
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Allow delayed activation for more fine grained control over which panels
are activated or left inactive when the scene is created.
Autotests included.
Reviewed-by: Brad
|
| |
| |
| |
| |
| |
| | |
Compiler error: hex escape sequence out of range.
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| | |
Oftentimes and depending on your window manager, QTest::mouseClick is not
enough to set the focus on a widget. QTest::mouseMove to that widget first.
Reviewed-by: ogoffart
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Thiago Macieira
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
doc/src/desktop-integration.qdoc
doc/src/distributingqt.qdoc
doc/src/examples-overview.qdoc
doc/src/examples.qdoc
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/geometry.qdoc
doc/src/groups.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/qt3support.qdoc
doc/src/qtdbus.qdoc
doc/src/qtdesigner.qdoc
doc/src/qtgui.qdoc
doc/src/qtmain.qdoc
doc/src/qtopengl.qdoc
doc/src/qtsvg.qdoc
doc/src/qtuiloader.qdoc
doc/src/qundo.qdoc
doc/src/richtext.qdoc
doc/src/topics.qdoc
src/corelib/tools/qdumper.cpp
src/gui/embedded/qkbdpc101_qws.cpp
src/gui/embedded/qkbdsl5000_qws.cpp
src/gui/embedded/qkbdusb_qws.cpp
src/gui/embedded/qkbdvr41xx_qws.cpp
src/gui/embedded/qkbdyopy_qws.cpp
src/gui/embedded/qmousebus_qws.cpp
src/gui/embedded/qmousevr41xx_qws.cpp
src/gui/embedded/qmouseyopy_qws.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/opengl/gl2paintengineex/glgc_shader_source.h
src/opengl/gl2paintengineex/qglpexshadermanager.cpp
src/opengl/gl2paintengineex/qglpexshadermanager_p.h
src/opengl/gl2paintengineex/qglshader.cpp
src/opengl/gl2paintengineex/qglshader_p.h
src/opengl/util/fragmentprograms_p.h
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/script/parser/qscript.g
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext.cpp
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.h
src/script/qscriptecmaarray.cpp
src/script/qscriptecmaarray_p.h
src/script/qscriptecmaboolean.cpp
src/script/qscriptecmacore.cpp
src/script/qscriptecmadate.cpp
src/script/qscriptecmadate_p.h
src/script/qscriptecmaerror.cpp
src/script/qscriptecmaerror_p.h
src/script/qscriptecmafunction.cpp
src/script/qscriptecmafunction_p.h
src/script/qscriptecmaglobal.cpp
src/script/qscriptecmaglobal_p.h
src/script/qscriptecmamath.cpp
src/script/qscriptecmamath_p.h
src/script/qscriptecmanumber.cpp
src/script/qscriptecmanumber_p.h
src/script/qscriptecmaobject.cpp
src/script/qscriptecmaobject_p.h
src/script/qscriptecmaregexp.cpp
src/script/qscriptecmaregexp_p.h
src/script/qscriptecmastring.cpp
src/script/qscriptecmastring_p.h
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptengine_p.h
src/script/qscriptenginefwd_p.h
src/script/qscriptextenumeration.cpp
src/script/qscriptextenumeration_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
src/script/qscriptextvariant.cpp
src/script/qscriptfunction.cpp
src/script/qscriptfunction_p.h
src/script/qscriptgc_p.h
src/script/qscriptmember_p.h
src/script/qscriptobject_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_p.h
src/script/qscriptvalue.cpp
src/script/qscriptvalueimpl.cpp
src/script/qscriptvalueimpl_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/qscriptvalueiteratorimpl.cpp
src/script/qscriptxmlgenerator.cpp
src/script/qscriptxmlgenerator_p.h
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Needed due to commit 3636e666528b72de79f8c7012690bb9e279f0863
|
| |
| |
| |
| |
| |
| | |
The return value is not reported (we need a separate callback for that,
just like in the interpreter), but that isn't important to get our
tools (i.e. the debugger) working.
|
|\ \ |
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
tests/auto/xmlpatternsxqts/lib/tests/XMLWriterTest.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
When MSVC is used the default DESTDIR makes use a release/debug suffix.
For these tests DESTDIR needs to be "."/
Minor code cleanup was done whilst correcting these effected .pro files
Reviewed-by: Lincoln Ramsay
|
| |
| |
| |
| |
| |
| |
| | |
That ensures we don't create ambiguities. QSharedPointer shouldn't have
any implicit constructors.
Suggested-By: Olivier Goffart
|
| |
| |
| |
| | |
Reviewed-by: Trustme
|
| |
| |
| |
| |
| |
| | |
Currently there are some differences in behavior and availability
of information between the interpreter and the JIT. This is now
documented as expected failures in the relevant autotests.
|
| | |
|
| |
| |
| |
| | |
It even works better than with the interpreter
|