| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| | |
You can't static_cast from a signed to an unsigned type and vice versa.
Reviewed-by: Kim
|
| |
| |
| |
| | |
Reviewed-by: jbache
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Basically we need to revert more of Oliviers change. The reason
is that we just cannot run the demo on mac without timer based
updates (as opposed to graphics view itself tries to figure out
when to update). The reason is that the demo uses QItemAnimations
extensivelly, which again uses QTimelines, wich again uses
separate timers. And on mac, because of coalesced updated, each
item animation will result in an individual redrawing of the scene.
Task-number: 255751
Reviewed-by: Olivier
|
| |
| |
| |
| |
| |
| |
| | |
The QT_BUILD_TREE variable only works in the source or build dir, but fails
in the demo which *install* the sources that should be buildable too.
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| |
| |
| |
| |
| | |
Change 259b65c2f5d736dd7f6d81b6390f54464dd5f183
prevents the animation from running on Windows. This is a partial
revert that still preserves most of the performance fixes.
Reviewed-by: ogoffart
|
| | |
|
| |
| |
| |
| | |
after installing
|
| |
| |
| |
| |
| |
| | |
GLchar is defined to be unsigned on Solaris for some reason.
Reviewed-by: Tom
|
| |
| |
| |
| |
| | |
This is achieved by using QTimer::singleShot
after the QWebView object is shown with simple text page.
|
| |
| |
| |
| | |
webkit
|
| | |
|
| | |
|
| | |
|
|\ \ |
|
| | | |
|
| | | |
|
|/ / |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Now qdesktopservices example will show message box if openUrl call
fails i.e. returns false.
|
|/ / |
|
|\ \ |
|
| | | |
|
|/ /
| |
| |
| |
| | |
Now only the relevant files are shown under images and music tabs,
even the folder would contain other content types.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qlocalsocket/tst_qlocalsocket.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The tick timer is always active, even if the moving gree Qt logo is not visible.
But the code that is supposed to pause it when the app loose the focus doesn't works if
the moving Qt logo is not visible.
Also the call to syncX makes Xorg takes lot of cpu.
It doesn't fix the fact that the timer is still running while the green logo is not visible,
but at least doesn't take the cpu anymore if qtdemo loose the focus.
Task-number: 255020
Reviewed-by: Richard Moe Gustavsen
|
| | |
|
|\ \ |
|
| |\ \ |
|
| | | | |
|
|/ / /
| | |
| | |
| | | |
xbel files.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/itemviews/puzzle/puzzle.pro
examples/qtconcurrent/imagescaling/imagescaling.pro
examples/widgets/movie/movie.pro
tools/configure/configureapp.cpp
Will rebuild configure.exe in next commit.
|
| |
| |
| |
| |
| |
| | |
That was a bug in the exemple.
Reviewed-by: Kavindra Palaraja
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/io/qfile.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/network/socket/qnativesocketengine_p.h
src/network/socket/qnativesocketengine_unix.cpp
|
| |
| |
| |
| | |
Reviewed-by: Samuel
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
|
| |
| |
| |
| | |
Reviewed-by: Lincoln Ramsay
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| | |
| | |
| | |
| | | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | |
| | |
| | |
| | | |
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|