| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add new QSysInfo::symbianVersion() enums
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add new enums for future Symbian platforms and fix the docs of
existing ones.
Task-number: QT-4593
Reviewed-by: Sami Merila
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
Do not use SetSurfaceTransparency() on raster.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Avkon calls BeginFullScreen() and EndFullScreen() to trigger the
fullscreen system transition effects for application exit, however
the calls are made too late for Qt apps because the widgets are
already destroyed. Instead, the effects are triggered explicitly
from Qt, before closing the widgets, or from aboutToQuit, whichever
comes first.
Task-number: QT-4718
Reviewed-by: Jani Hautakangas
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
Have the backing store destroyed also in special Symbian scenarios.
Use FixNativeOrientation on Symbian when the application wants it.
QS60Style: itemview item with checkbox and text is drawn incorrectly
Revert "Have the backing store destroyed also in special Symbian scenarios."
Add focus frame support in style sheet
Two QListView autotests do not pass on Symbian^3 releases
tst_QStyle::drawItemPixmap test case fails on Symbian^3
Add the auto detection for OpenVG in configure
Add focus frame support in stylesheet
Make QS60Style to support new Tab graphics in new Symbian releases
GraphicsView is not reset if focusItem is not set when keyboard closes
Check the validity of qt_desktopWidget before dereferencing
Labels are not visible in dialogs with all themes (part2)
Labels are not visible in dialogs with all themes
Enable webkit for symbian-gcce in configure
Enable webkit build for the makefile build system with gcce
Add the rules for gcce in do_not_build_as_thumb.prf
Correct some parameters for the makefile build sytem, armcc and gcce
Support QMAKE_LFLAGS.ARMCC and QMAKE_LFLAGS.GCCE in makefile build system
Do not unnecessarily draw application twice in landscape
...
|
| | | |
| | |
| | |
| | | |
Reviewed-by: axis
|
| | | |
| | |
| | |
| | | |
Reviewed-by: axis
|
| | | |
| | |
| | |
| | | |
Reviewed-by: axis
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
look for makespec in the build dir first
make collection of SUBDIRS in solution generator less bizarre
run depend_command in build dir in VS generators as well
fixify target source against build tree
fix fixifying of QMAKE_SUBSTITUTES
dist target: fixify OBJECTS_DIR against output dir
fix paths of vpath-resolved files
simplify: absolute fixification ignores the base dir arguments
simplify: fileFixify for all same paths is always "."
simplify: the input and output dirs are already normalized
stop fixifying after first success
create a pwd string with a trailing slash only on demand
make uic3-generated moc files depend on mocinclude.tmp
useful location reporting for errors from QMAKE_SUBSTITUTES
clean up visual studio identification code
prefix TEMPLATE_PREFIX to TEMPLATE even if it is "default-constructed"
fix detection of relative location information
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-16951
Reviewed-by: mariusSO
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
TEMPLATE is (now) reliably prefixed with "vc" when a vs generator is
used.
Reviewed-by: mariusSO
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Lancelot: bail out if rendering consistently fails
Minor optimization to lance/elot
Make it possible to test the new font hinting in lance[elot]
Fixes: The "test: too many arguments" error after every make
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
If the gdb version string was not matched, it would be passed in full
to test. This new regexp matches the different kinds of gdb
version string observed in the wild, as listed in
qtcreator/tests/auto/debugger/tst_version.cpp
Reviewed-by: aep <arvid.picciani@nokia.com>
|
| | |\ \ \ \ \ \
| | |_|/ / / /
| |/| | / / /
| | | |/ / /
| | |/| | |
| | | | | | |
Conflicts:
src/gui/text/qfontengine_mac.mm
tests/auto/qdiriterator/tst_qdiriterator.cpp
|
| | | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Improve Flickable dynamics and allow platform specific tweaking.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Flickable's previous overshoot behavior was to continue past the
boundary without any additional friction (deceleration). It now
decelerates faster when overshooting.
On touch screens in particular, the last points when a touch point
is released are unreliable, resulting in sporadic flick velocities.
It also now allows the number of samples used for velocity calclations
to be tuned.
It is now easy to tune the Flickable behavior for different platforms.
Change-Id: I24142a50be1fde2f8877e359e30b8efcdd1f7d5c
Task-number: QTBUG-10894, QTBUG-16388, QTBUG-17830
Reviewed-by: Michael Brasser
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Commit a6d48ca corrected the problem for win32-g++. Here we do the same
for win32-g++-cross.
Merge-request: 1173
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
win32-g++: Correct the order of linked Windows libraries
Fixing a traling space on if statement that fails in Solaris.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
On Windows 7, kernel32.dll exports many of the same functions as
advapi32.dll. If executables link to these functions in kernel32.dll
instead of advapi32.dll, running these executables on older versions
of Windows will cause an entry point error. This would occur due to
kernel32 being specified before advapi32.
To resolve this issue, advapi32 is specified before kernel32 when
linking.
Task-number: QTBUG-18537
Merge-request: 1169
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |\ \ \ \ \
| | | |/ / / /
| | |/| | | /
| | | | |_|/
| | | |/| |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QGradient stop with NaN position on Symbian.
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
QApplication does not define flag for "single touch"
Native dialog softkeys are covered by QApplication softkeys
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
If the path to translation file is already absolute, do not add
the $$_PRO_FILE_PWD_ to it in symbian.conf
Task-number: QT-4842
Reviewed-by: axis
|
| | | |\ \ \ \
| | | |/ / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add the auto detection for OpenGL in configure for makefile build system on Symbian.
Don't display softkeys/statusbar on FS childs of non-FS windows
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Symbian.
Task-number: QTBUG-18485
Reviewed-by: Miikka Heikkinen
Reviewed-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
These options were found to be no longer required for MinGW releases at
this time (they are also never valid for MinGW64 when building 64bit).
They actually never worked anyway, as the GNU toolchain linker option
"-enable-stdcall-fixup" actually means "-e" "nable-stdcall-fixup".
Merge-request: 1158
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
all other unix mkspecs do so
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (42 commits)
Fixed QFtp autotests not to crash in network time out situations
Make createpackage and patch_capabilties scripts use tmp dir
Fix for QTBUG-16985.
Revert "QComboBox fix for QTBUG-16985"
Moving Symbian CPU core detection to qthread_symbian.cpp
QComboBox fix for QTBUG-16985
Making Symbian helper threads exit cleanly at app exit
Add ".make.cache" to the files to be cleaned for symbian-abld.
Fix mismatched $$translations handling after merge
Fix emulator deployment for items with "!:" drive.
Fix build break
Add digit conversion in default format function
Removed broken "deploy.path" support from Symbian
fixing build issue in qwaitcondition_symbian.cpp
fixing build error in qthread_symbian.cpp
Strip echo suppression character "@" from commands in symbian-sbsv2
key to string translations for Symbian return and tab characters
Copying change to unix and Windows QThread implementation to Symbian
Using Symbian native mutex type in tst_bench_qmutex
removing unused headers
...
|
| | | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Temporary files created by these two scripts will now be created
under a separate directory, contents of which is also added to cleanup.
Task-number: QTBUG-11394
Reviewed-by: axis
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
"make clean" will now delete any generated ".make.cache" files in
symbian-abld builds.
Task-number: QTBUG-15733
Reviewed-by: Janne Koskinen
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
One use of $$translations prepends "$$_PRO_FILE_PWD_/" to it in
symbian.conf, while another identical use doesn't. This discrepancy
was caused by merge from 4.7.
Reviewed-by: Janne Koskinen
|
| | |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Fixed deployment problems with MSVC 2005 and 2008 SP1
QLocalSocket/Win: handle ERROR_ACCESS_DENIED
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Notably, DLLs bundled with MSVC Express SP1 releases are only the ones
from the SP1, so it is a good idea to force binding to the latest
release of the runtime to avoid deployment problems.
Keep in mind that it is easier to bundle a private runtime for the
software in an setup EXE rather than lauching a runtime setup from the
software setup.
Task-number: QTBUG-8215
Merge-request: 1171
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| | |\ \ \ \ \ \ \
| | | |_|_|/ / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/declarative/example-slideswitch.qdoc
doc/src/development/qmake-manual.qdoc
doc/src/snippets/code/doc_src_qmake-manual.pro
doc/src/snippets/code/doc_src_qtscript.qdoc
src/corelib/animation/qabstractanimation.cpp
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/eabi/QtOpenGLu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qdir/qdir.pro
tests/auto/qsslsocket/tst_qsslsocket.cpp
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | | |\ \ \ \ \ \
| | | | |_|/ / /
| | | |/| | / /
| | | |_|_|/ /
| | |/| | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update changes for 4.7.3
directfb: avoid version dependency by setting DSPD_DST blend functions manually
fix -enable-stdcall-fixup usage
Report that an update is needed if no update was done
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
the leading "-Wl," was apparently accidentally split off to the wrong
line.
Originally done in 0953ee3 for mkspecs/win32-g++.
Merge-request: 1154
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
A new QSysInfo::S60Version enum value SV_S60_5_3 is introduced.
QSysInfo::symbianVersion still returns SV_SF_3 for the new platform.
The official name of the platform is still pending, so documentation
will be updated later.
Task-number: QT-4593
Reviewed-by: Sami Merila
|
| | |\ \ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Designer: Fix tab order in action editor dialog.
Make QtUiTools use the lib-infix passed to configure.
|
| | | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Patch contributed by OpenEmbedded project.
Reviewed-by: hjk
Task-number: QTBUG-7169
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add flag for forcibly propagating backing store alpha to framebuffer
Fixed unmatched quotes in s60installs.pro
Added setSwitchPolicy to MeeGo graphicssystem helper API.
Add /q switch to QMAKE_DEL_FILE command in symbian
|
| | | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Builds will otherwise halt without giving reason if a wildcard
is given in QMAKE_CLEAN in symbian-abld.
Task-number: QTBUG-18207
Reviewed-by: axis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
For QPA the unix tests are used to determine the availability of OpenGL
ES, so they need to compile even on Mac. Similarly the includes in the
OpenGL module have to be adapted on Mac.
Acked-by: Jørgen Lind
|
| |/ / / / / |
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/qws/macx-nacl-g++/qplatformdefs.h
|
| | |\ \ \ \
| | |/ / /
| | | / /
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure
mkspecs/symbian-gcce/qmake.conf
qmake/generators/metamakefile.cpp
qmake/generators/win32/mingw_make.cpp
src/corelib/global/global.pri
src/corelib/global/qglobal.h
src/opengl/qgl.cpp
src/opengl/qwindowsurface_gl.cpp
src/plugins/platforms/wayland/qwaylandbuffer.h
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tools/designer/src/components/formeditor/qdesigner_resource.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
