qt:android-lighthouse.git
5 years agoAllow QtSharedMemory on win32-g++ builds ports-win
Ray Donnelly [Mon, 21 Jan 2013 21:40:59 +0000 (21:40 +0000)]
Allow QtSharedMemory on win32-g++ builds

6 years agoMore cross compilation fixes (case sensitivity for Windows, configure
Ray Donnelly [Wed, 8 Aug 2012 11:35:16 +0000 (12:35 +0100)]
More cross compilation fixes (case sensitivity for Windows, configure
 for mac)

Conflicts:

configure

6 years agomacx-g++-cross started.
Ray Donnelly [Wed, 8 Aug 2012 11:31:34 +0000 (12:31 +0100)]
macx-g++-cross started.

6 years agoFix for cross compilation of ports branch.
Ray Donnelly [Mon, 6 Aug 2012 18:14:42 +0000 (18:14 +0000)]
Fix for cross compilation of ports branch.

Rename mkspecs as their prefix must be win32-g++

6 years agoDetect *mingw* as XPLATFORM_MINGW
Ray Donnelly [Sun, 5 Aug 2012 16:19:02 +0000 (16:19 +0000)]
Detect *mingw* as XPLATFORM_MINGW

Conflicts:

configure

6 years agoAdd -mms-bitfields to QMAKE_CXXFLAGS in ms_bitfields.prf
Ray Donnelly [Sun, 5 Aug 2012 16:17:56 +0000 (16:17 +0000)]
Add -mms-bitfields to QMAKE_CXXFLAGS in ms_bitfields.prf

6 years agoOn MSYS, use cp -rf for copying mkspecs instead of ln -s
Ray Donnelly [Sat, 4 Aug 2012 21:59:15 +0000 (22:59 +0100)]
On MSYS, use cp -rf for copying mkspecs instead of ln -s

6 years agoCross compilation work started, targeting Windows
Ray Donnelly [Sat, 4 Aug 2012 20:14:14 +0000 (20:14 +0000)]
Cross compilation work started, targeting Windows

6 years agoFix trunc for mingw64
Ray Donnelly [Tue, 31 Jul 2012 17:20:13 +0000 (18:20 +0100)]
Fix trunc for mingw64

6 years agoJSC gcc 4.7.0 fixes
Ray Donnelly [Tue, 31 Jul 2012 12:01:05 +0000 (13:01 +0100)]
JSC gcc 4.7.0 fixes

6 years agoGCC 4.7.0 fixes
Ray Donnelly [Sat, 14 Jul 2012 20:01:32 +0000 (21:01 +0100)]
GCC 4.7.0 fixes

6 years agoFix webcore mac build error (https://bugs.webkit.org/show_bug.cgi?id=60951)
Ray Donnelly [Sun, 11 Dec 2011 17:39:03 +0000 (17:39 +0000)]
Fix webcore mac build error (https://bugs.webkit.org/show_bug.cgi?id=60951)

7 years agoForce CFG_ICONV=gnu for MinGW
Ray Donnelly [Fri, 19 Aug 2011 16:14:26 +0000 (17:14 +0100)]
Force CFG_ICONV=gnu for MinGW

7 years agowin32-g++ (if defined __GNUWIN32__), force uppercase drive letters in QDir::fromNativ...
Ray Donnelly [Thu, 18 Aug 2011 22:27:07 +0000 (23:27 +0100)]
win32-g++ (if defined __GNUWIN32__), force uppercase drive letters in QDir::fromNativeSeparators.

7 years agowin32-g++, disable activeqt (it doesn't build).
Ray Donnelly [Thu, 18 Aug 2011 22:23:12 +0000 (23:23 +0100)]
win32-g++, disable activeqt (it doesn't build).

7 years agowin32-g++, use ms_bitfields and static_gcclibs in bootstrap.pri.
Ray Donnelly [Thu, 18 Aug 2011 22:20:55 +0000 (23:20 +0100)]
win32-g++, use ms_bitfields and static_gcclibs in bootstrap.pri.

7 years agowin32-g++, add static_gcclibs feature.
Ray Donnelly [Thu, 18 Aug 2011 22:18:36 +0000 (23:18 +0100)]
win32-g++, add static_gcclibs feature.

7 years agowin32-g++, add ms_bitfields feature, use it in QMAKE_CONFIG.
Ray Donnelly [Thu, 18 Aug 2011 22:15:25 +0000 (23:15 +0100)]
win32-g++, add ms_bitfields feature, use it in QMAKE_CONFIG.

7 years agocodecs.pri, add iconv codecs for unix|win32-g++.
Ray Donnelly [Thu, 18 Aug 2011 22:08:27 +0000 (23:08 +0100)]
codecs.pri, add iconv codecs for unix|win32-g++.
qiconvcodec.cpp, remove un-needed #include <dlfcn.h>.
qiconvcodec_p.h, also compile if defined(__MINGW32__).

7 years agoDon't use mocinclude.tmp with win32-g++
Ray Donnelly [Thu, 18 Aug 2011 22:06:02 +0000 (23:06 +0100)]
Don't use mocinclude.tmp with win32-g++

7 years agoWindows fix, in qmake/option.cpp, default_mode(progname), handle qmakegen.exe and...
Ray Donnelly [Thu, 18 Aug 2011 22:01:59 +0000 (23:01 +0100)]
Windows fix, in qmake/option.cpp, default_mode(progname), handle qmakegen.exe and qt-config.exe

7 years agoPass -Wl as LFLAGS in config.tests/unix/compile.test (fixes Android OpenGLES2 detection).
Ray Donnelly [Thu, 18 Aug 2011 21:57:47 +0000 (22:57 +0100)]
Pass -Wl as LFLAGS in config.tests/unix/compile.test (fixes Android OpenGLES2 detection).

7 years agoFix Windows shell cmdline length (8192 char) limit when linking (@command-file argument).
Ray Donnelly [Thu, 18 Aug 2011 21:52:11 +0000 (22:52 +0100)]
Fix Windows shell cmdline length (8192 char) limit when linking (@command-file argument).

7 years agoAdd BUILD_ON_MSYS to configure.
Ray Donnelly [Thu, 18 Aug 2011 21:49:14 +0000 (22:49 +0100)]
Add BUILD_ON_MSYS to configure.
Make mkspecs/default/qmake.conf a soft link when BUILD_ON_MSYS.
Compile win32-g++ host qmake.exe with "-DUNICODE".
Link win32-g++ host qmake.exe with "-static-libgcc -static-libstdc++".
Use Makefile.win32-g++-sh if BUILD_ON_MSYS.
Add seded header (SOURCE_PATH = @SOURCE_PATH@ etc) to Makefile.win32-g++-sh.

7 years agoHandle file:/// and file:///C|/foo/bar (Q_OS_WIN) in qurl.cpp
Ray Donnelly [Sun, 14 Aug 2011 19:57:03 +0000 (20:57 +0100)]
Handle file:/// and file:///C|/foo/bar (Q_OS_WIN) in qurl.cpp

7 years agoHacky? fix propertyeditor for static build (tested on Windows and Linux)
Ray Donnelly [Sun, 14 Aug 2011 19:48:56 +0000 (20:48 +0100)]
Hacky? fix propertyeditor for static build (tested on Windows and Linux)

7 years agoWebkit compile fix (tests.pri, $$PWD/hybridPixmap added to INCLUDEPATH)
Ray Donnelly [Sun, 14 Aug 2011 19:44:23 +0000 (20:44 +0100)]
Webkit compile fix (tests.pri, $$PWD/hybridPixmap added to INCLUDEPATH)

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 4 Aug 2011 13:58:20 +0000 (23:58 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Preventing QSoftkeyManager giving false positive memory leaks
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Memory leak fix in Symbian open file dialog
  Runonphone with CODA support
  Memory leak fix for Symbian menus
  Eabi DEF file sync between Qt 4.7 and 4.8
  Winscw DEF file sync between Qt 4.7 and 4.8

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 4 Aug 2011 07:57:46 +0000 (17:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (217 commits)
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  QLabel documentation: add warning about sanitizing input
  runonphone: fix failure to terminate
  Fix license headers in new files from coda patch
  runonphone: command line args improperly passed to TRK after CODA patch
  Mark all Symbian debug binaries debuggable by default
  Preventing QSoftkeyManager giving false positive memory leaks
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)
  Fixed memory leak in QMessageBox::setInformativeText in Symbian
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Fix gamma corrected source color in GL
  Make macdeployqt more robust against usage of symbolic links.
  Memory leak fix in Symbian open file dialog
  Revert binary search in QTextEngine::findItem
  Runonphone with CODA support
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
Honglei Zhang [Thu, 4 Aug 2011 07:48:43 +0000 (10:48 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team

7 years agoMerge remote-tracking branch 'qt/4.8'
Honglei Zhang [Thu, 4 Aug 2011 07:47:56 +0000 (10:47 +0300)]
Merge remote-tracking branch 'qt/4.8'

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Wed, 3 Aug 2011 14:23:55 +0000 (00:23 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.
  Fix gamma corrected source color in GL

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 3 Aug 2011 08:36:27 +0000 (18:36 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fixed compile error in qwindowsurface_qws.cpp.
  Fixed regression introduced by 5842d19cf3dff37a85c.

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Wed, 3 Aug 2011 08:25:19 +0000 (18:25 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Remove DerivedSources.pro from WebKit.
  Support debuggable in the makefile build system
  Mark all Symbian debug binaries debuggable by default
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)

7 years agoFixed compile error in qwindowsurface_qws.cpp.
Samuel Rødal [Wed, 3 Aug 2011 07:27:19 +0000 (09:27 +0200)]
Fixed compile error in qwindowsurface_qws.cpp.

Task-number: QTBUG-20713
Reviewed-by: Jørgen Lind
7 years agoFixed regression introduced by 5842d19cf3dff37a85c.
Samuel Rødal [Wed, 3 Aug 2011 07:23:07 +0000 (09:23 +0200)]
Fixed regression introduced by 5842d19cf3dff37a85c.

We need a normalized rectangle.

Reviewed-by: aavit
7 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Wed, 3 Aug 2011 06:04:06 +0000 (08:04 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

7 years agoMerge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Liang Qi [Wed, 3 Aug 2011 06:03:54 +0000 (08:03 +0200)]
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 20:07:09 +0000 (06:07 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Remove DerivedSources.pro from WebKit.

7 years agoRemove DerivedSources.pro from WebKit.
Jocelyn Turcotte [Tue, 2 Aug 2011 16:42:20 +0000 (18:42 +0200)]
Remove DerivedSources.pro from WebKit.

This .pro file gets processed by qmake while looking recursively for pro files.
This may cause warnings and the file isn't necessary since derived sources have
to be pre-generated before importing WebKit into src/3rdparty.

Reviewed-by: Benjamin Poulain
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 16:25:58 +0000 (02:25 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Support debuggable in the makefile build system
  Mark all Symbian debug binaries debuggable by default

7 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Tue, 2 Aug 2011 16:03:43 +0000 (02:03 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 2 Aug 2011 15:18:06 +0000 (01:18 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  QLabel documentation: add warning about sanitizing input

7 years agoSupport debuggable in the makefile build system
Liang Qi [Tue, 2 Aug 2011 14:37:51 +0000 (16:37 +0200)]
Support debuggable in the makefile build system

Task-number: QTBUG-20697
Reviewed-by: Shane Kearns
Reviewed-by: Miikka Heikkinen
7 years agoQLabel documentation: add warning about sanitizing input
Peter Hartmann [Tue, 2 Aug 2011 14:09:24 +0000 (16:09 +0200)]
QLabel documentation: add warning about sanitizing input

make users more aware of QLabel guessing the text format.

Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
7 years agorunonphone: fix failure to terminate
Shane Kearns [Tue, 2 Aug 2011 14:06:05 +0000 (15:06 +0100)]
runonphone: fix failure to terminate

In some cases, the serial port is always completing with no error
and zero bytes read.
In this case, runonphone would not shut down properly as the
terminate file descriptor was never read.

Reviewed-By: mread
7 years agoFix license headers in new files from coda patch
Shane Kearns [Tue, 2 Aug 2011 14:05:10 +0000 (15:05 +0100)]
Fix license headers in new files from coda patch

7 years agorunonphone: command line args improperly passed to TRK after CODA patch
Shane Kearns [Mon, 1 Aug 2011 15:44:25 +0000 (16:44 +0100)]
runonphone: command line args improperly passed to TRK after CODA patch

7 years agoMark all Symbian debug binaries debuggable by default
Miikka Heikkinen [Tue, 2 Aug 2011 11:44:12 +0000 (14:44 +0300)]
Mark all Symbian debug binaries debuggable by default

CODA 4.1.* cannot be used to debug binaries that do not have
DEBUGGABLE_UDEBONLY keyword specified, so add this keyword to all
projects by default. Adding this keyword has no impact for previous
versions of CODA or TRK.

Task-number: QTBUG-20669
Reviewed-by: Shane Kearns
7 years agoPreventing QSoftkeyManager giving false positive memory leaks
mread [Tue, 2 Aug 2011 12:38:45 +0000 (13:38 +0100)]
Preventing QSoftkeyManager giving false positive memory leaks

QSoftkeyManager has a global static instance that was not being
deleted on app exit. This global static instance can own other objects,
the number of which grow with use up to a limit. This gives the
appearance of a memory leak when the app exits and you see increasing
heap cell counts.

The change is to use a QScopedPointer to clean up the static on app
exit.

Reviewed-by: Miikka Heikkinen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 12:17:34 +0000 (22:17 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Detect linked fonts by name (insead of via CLinkedTypeface* Api)

7 years agoDetect linked fonts by name (insead of via CLinkedTypeface* Api)
Alessandro Portale [Tue, 2 Aug 2011 11:38:04 +0000 (13:38 +0200)]
Detect linked fonts by name (insead of via CLinkedTypeface* Api)

The detection of Linked Fonts via CLinkedTypeface* Api does not
work in all cases. It works in QML apps, but not in QWidgets based
apps. The reason is still unclear.

This commit replaces the CLinkedTypeface* Api based code of commit
fa344b355d311fce7954e2fd1a22a87a88194783 whith a simple type face
anme analysis. Assumption is that the names of Linked Fonts always
end with "LF" and are all upper case.

This patch has been tested by more people than just me, but it is
too dirty to mention the others as reviewer. I take the shame and
blame.

Task-Number: QTBUG-20007

7 years agoFixed memory leak in QMessageBox::setInformativeText in Symbian
mread [Tue, 2 Aug 2011 09:20:55 +0000 (10:20 +0100)]
Fixed memory leak in QMessageBox::setInformativeText in Symbian

The Symbian implementation of QMessageBox::setInformativeText was
taking the text from a QLabel and using it in a QTextBrowser, leaving
the QLabel un-parented and therefore leaking. This is fixed by setting
the QMessageBox as the QLabel's parent

Task-number: QTBUG-20622
Reviewed-by: Miikka Heikkinen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Tue, 2 Aug 2011 08:37:17 +0000 (18:37 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Tue, 2 Aug 2011 08:21:15 +0000 (18:21 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Don't include qdbusvirtualobject header twice.

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 1 Aug 2011 13:56:32 +0000 (23:56 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Fix gamma corrected source color in GL

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 1 Aug 2011 12:56:50 +0000 (22:56 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (59 commits)
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Fix typo for ifdef QT_NO_ACCESSIBILITY
  Call QAccessible::updateAccessibility when a widget is deleted
  Revert binary search in QTextEngine::findItem
  Remove a duplicate include line
  Save previous font engine for right bearing adjustment
  Symbian^3 workaround: Avoid usage of linked fonts.
  Make it possible to update a related table after an external update
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Add test case name and drop parentheses for -datatags option.
  Adding QTDIR validation in tst_symbols autotest
  Disabled benchmarks referring to private headers.
  Add license header to printdatatags autotests
  Compile on symbian^3
  Compile on Symbian^3.
  Added -datatags option to QTestLib
  Fixed failure of tst_qxmlquery::evaluateToReceiver
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item
  Build Qt for Symbian on Mac/gcce again
  ...

7 years agoRevert "fix QFileInfo::isSymLink() for NTFS mount points"
Jiang Jiang [Fri, 22 Jul 2011 14:52:35 +0000 (16:52 +0200)]
Revert "fix QFileInfo::isSymLink() for NTFS mount points"

This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 1 Aug 2011 09:48:40 +0000 (19:48 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Make macdeployqt more robust against usage of symbolic links.
  Document support for Linguist on Mac.
  Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
  Guard macdeployqt against @rpath and @loader_path too.
  Fix typo.
  OpenVG cleanup.
  Include trailing space width in RTL text line width
  Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
  Fixed holes in border image drawing by introducing new API.
  Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Remove debug output.
  Add some sound support to the uikit platform.
  Add flickrdemo uikit example project.
  Fix uikit simulator build.
  Get subpixel antialiasing again w/combo of raster and affine transform
  Add initial support for bitmap version 4/5 headers.
  optimize QRawFont::supportsCharacter()
  Switch to use floating point pixelSize in QRawFont completely
  Add a way to check if we have a matching family in the database.

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 29 Jul 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoFix typo for ifdef QT_NO_ACCESSIBILITY
Frederik Gladhorn [Fri, 29 Jul 2011 21:43:01 +0000 (14:43 -0700)]
Fix typo for ifdef QT_NO_ACCESSIBILITY

Reviewed-by: TrustMe
7 years agoCall QAccessible::updateAccessibility when a widget is deleted
José Millán Soto [Fri, 29 Jul 2011 17:35:54 +0000 (10:35 -0700)]
Call QAccessible::updateAccessibility when a widget is deleted

Merge-request: 1310
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 29 Jul 2011 16:20:59 +0000 (02:20 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Revert binary search in QTextEngine::findItem
  Remove a duplicate include line
  Save previous font engine for right bearing adjustment
  Symbian^3 workaround: Avoid usage of linked fonts.
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item

7 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 29 Jul 2011 15:43:07 +0000 (17:43 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
src/gui/text/qfont_s60.cpp

7 years agoFix gamma corrected source color in GL
Jiang Jiang [Thu, 28 Jul 2011 08:55:21 +0000 (10:55 +0200)]
Fix gamma corrected source color in GL

GL_EXT_framebuffer_sRGB expects linear RGB as input color, thus we
need to convert sRGB based input color into linear RGB first before
using glBlendColor with it.

Task-number: QTBUG-20574
Reviewed-by: Samuel Rødal
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 29 Jul 2011 08:49:18 +0000 (18:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Make macdeployqt more robust against usage of symbolic links.

7 years agoMake macdeployqt more robust against usage of symbolic links.
Eike Ziller [Fri, 29 Jul 2011 08:40:47 +0000 (10:40 +0200)]
Make macdeployqt more robust against usage of symbolic links.

If binaries linked against Versions/Current *and* a specific version,
the framework's binary would be copied twice, leading to duplicate
symbols exceptions. Instead we now check for that condition and
replicate the symbolic link.

Reviewed-by: TrustMe
7 years agoMerge remote-tracking branch 'qt/4.8'
Honglei Zhang [Fri, 29 Jul 2011 06:57:30 +0000 (09:57 +0300)]
Merge remote-tracking branch 'qt/4.8'

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 28 Jul 2011 13:31:14 +0000 (23:31 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Revert binary search in QTextEngine::findItem

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
mread [Thu, 28 Jul 2011 13:24:56 +0000 (14:24 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team

7 years agoMemory leak fix in Symbian open file dialog
mread [Thu, 28 Jul 2011 13:22:02 +0000 (14:22 +0100)]
Memory leak fix in Symbian open file dialog

Symbian open file dialog was using a filter but not deleting it.

Task-number: QTBUG-20357
Reviewed-by: Laszlo Agocs
7 years agoRevert binary search in QTextEngine::findItem
Jiang Jiang [Thu, 28 Jul 2011 12:15:28 +0000 (14:15 +0200)]
Revert binary search in QTextEngine::findItem

It's part of c9607f069f0fb98021daf0af9f1d1b2981018e0c which caused
crash in certain cases.

Task-number: QTBUG-17209
Reviewed-by: Gunnar Sletta
7 years agoRunonphone with CODA support
Stephen Chong [Thu, 21 Jul 2011 19:39:55 +0000 (14:39 -0500)]
Runonphone with CODA support

Reviewed-By: Shane Kearns
7 years agoMemory leak fix for Symbian menus
mread [Thu, 28 Jul 2011 12:14:10 +0000 (13:14 +0100)]
Memory leak fix for Symbian menus

QSymbianMenuAction were not being deleted when the QSymbianMenuPrivate
that owned them was destroyed.

Task-number: QTBUG-20357
Reviewed-by: Laszlo Agocs
7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 27 Jul 2011 23:00:13 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 16:08:55 +0000 (02:08 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Remove a duplicate include line

7 years agoRemove a duplicate include line
Liang Qi [Wed, 27 Jul 2011 13:59:02 +0000 (15:59 +0200)]
Remove a duplicate include line

Build Qt 4.7 for Symbian on Mac/gcce again.

Reviewed-by: Honglei Zhang
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 27 Jul 2011 12:35:36 +0000 (22:35 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Document support for Linguist on Mac.

7 years agoDocument support for Linguist on Mac.
Eike Ziller [Wed, 27 Jul 2011 11:47:17 +0000 (13:47 +0200)]
Document support for Linguist on Mac.

Fixes dragging documents on Linguist dock icon, double clicking document
in Finder, and the "open" terminal command.

Task-number: QTBUG-20194
Reviewed-by: Oswald Buddenhagen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 12:12:04 +0000 (22:12 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Save previous font engine for right bearing adjustment
  Fix compilation under OSX 10.7 or using llvm-gcc.
  Fix typo in QFontDialog docs
  Reset previousGlyph once we reached a new text item

7 years agoSave previous font engine for right bearing adjustment
Jiang Jiang [Wed, 27 Jul 2011 08:42:40 +0000 (10:42 +0200)]
Save previous font engine for right bearing adjustment

In last fix I forgot that fd818312 was for saving and restoring the
right bearing (of last visible glyph) when a LineSeparator was hit
(which can have a different font engine but usually not visble),
thus we can't reset previousGlyph in that case. To make sure we
still get correct right bearing from the font engine used to shape
previousGlyph, we need to save that font engine as well. It does
make the code more complicated than simply saving the right bearing
when a QScriptItem boundary is hit, so hopefully it's an optimization
worth to be made (following e1915815).

Task-number: QTBUG-20423
Reviewed-by: Eskil
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 27 Jul 2011 08:19:46 +0000 (18:19 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Symbian^3 workaround: Avoid usage of linked fonts.

7 years agoSymbian^3 workaround: Avoid usage of linked fonts.
Alessandro Portale [Mon, 25 Jul 2011 14:22:22 +0000 (16:22 +0200)]
Symbian^3 workaround: Avoid usage of linked fonts.

"Linked Fonts" are a new feature in Symbian^3, first used in SR11.1.
This patch prevents Qt from using linked fonts in any way.

Avkon based applications benefit from Linked Fonts because they can now
transparently render multi-script text, e.g. Latin/Chinese/Japanese (Qt
does that by its own and calls the feature 'font merging'). From Qt's
poing of view, Linked Fonts are a severe regression in Symbian's API.
1 Font table Api for linked fonts is extremely slow
2 'cmap' tables do not seem to reflect the "linkage", causing garbled
  text or crashes.
3 Linked fonts appear with cryptic type face names, and are redundant
  since they are just compounds of the other, real fonts.

This patch adds a detection of Linked Fonts using
CLinkedTypefaceSpecification and prevents their inclusion into
QFontDataBase. Furthermore, it detects if the Symbian System font is a
Linked font and if needed tries to fall back to a classical Symbian
system font, e.g. "Nokia Sans S60" or "Series 60 Sans". Fallback to
"Pure" will need to be added, later on.

Task-Number: QTBUG-20007
Co-authored-by: Miklos Vlasa
Reviewed-by: mread <qt-info@nokia.com>
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 26 Jul 2011 23:34:47 +0000 (09:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Make it possible to update a related table after an external update

7 years agoMake it possible to update a related table after an external update
Andy Shaw [Fri, 3 Jun 2011 06:17:40 +0000 (08:17 +0200)]
Make it possible to update a related table after an external update

When a table that is related to in a QSqlRelationalTableModel gets
updated in some way (e.g. a new row, or the data is changed) then the
related model could not be updated without recreating the
QSqlRelationalTableModel.

Now, to get around this, select() can be called on the related model to
get it to be updated.

Task-number: QTBUG-7885
Reviewed-by: Charles Yin
Reviewed-by: Michael Goddard
Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca

7 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 26 Jul 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 26 Jul 2011 18:57:56 +0000 (04:57 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
  Guard macdeployqt against @rpath and @loader_path too.
  Fix typo.

7 years agoMake mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.
Eike Ziller [Tue, 26 Jul 2011 15:03:03 +0000 (17:03 +0200)]
Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.

Needed e.g. for Qt Creator, which is a bundle of plugins.

Reviewed-by: TrustMe
7 years agoGuard macdeployqt against @rpath and @loader_path too.
Eike Ziller [Tue, 26 Jul 2011 14:00:58 +0000 (16:00 +0200)]
Guard macdeployqt against @rpath and @loader_path too.

Reviewed-by: TrustMe
7 years agoFix typo.
Eike Ziller [Tue, 26 Jul 2011 13:14:20 +0000 (15:14 +0200)]
Fix typo.

Reviewed-by: TrustMe
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 26 Jul 2011 15:23:54 +0000 (01:23 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  OpenVG cleanup.
  Include trailing space width in RTL text line width

7 years agoOpenVG cleanup.
Nikolaos Korkakakis [Tue, 26 Jul 2011 14:32:46 +0000 (16:32 +0200)]
OpenVG cleanup.

Changes needed to reflect the updates in the QWindowSurface.

Merge-request: 1309
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoInclude trailing space width in RTL text line width
Jiang Jiang [Tue, 26 Jul 2011 14:03:37 +0000 (16:03 +0200)]
Include trailing space width in RTL text line width

Task-number: QTBUG-15511
Reviewed-by: Eskil
7 years agoFix compilation under OSX 10.7 or using llvm-gcc.
Mike McQuaid [Tue, 26 Jul 2011 11:43:48 +0000 (13:43 +0200)]
Fix compilation under OSX 10.7 or using llvm-gcc.

Use correct error codes instead of type errors.
Thanks to Dylan Luke <lukes.dylan@gmail.com> for this patch.

Merge-request: 1304
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 26 Jul 2011 11:31:45 +0000 (21:31 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (102 commits)
  Fix the compilation error when QT_NO_PLUGIN_CHECK was set.
  Fixed holes in border image drawing by introducing new API.
  Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.
  Revert "fix QFileInfo::isSymLink() for NTFS mount points"
  Remove debug output.
  Add some sound support to the uikit platform.
  Add flickrdemo uikit example project.
  Fix uikit simulator build.
  Get subpixel antialiasing again w/combo of raster and affine transform
  Add initial support for bitmap version 4/5 headers.
  optimize QRawFont::supportsCharacter()
  Removed demo files accidentally introduced by commit 3abaecc3.
  Doc: Added a link to the How to Learn Qt document.
  Doc: Fixed shader program snippet.
  importing QtDeclarative classes for usage in QML designer
  fix QFileInfo::isSymLink() for NTFS mount points
  QNetworkAccessFileBackend: Add warning for file url without scheme.
  Check for buffer overflow in Lookup_MarkMarkPos
  Delay masking the last character in Password echo mode.
  Add docs for QSqlRelationalTableModel::JoinMode
  ...

7 years agoFix the compilation error when QT_NO_PLUGIN_CHECK was set.
Nikolaos Korkakakis [Tue, 26 Jul 2011 08:58:46 +0000 (10:58 +0200)]
Fix the compilation error when QT_NO_PLUGIN_CHECK was set.

Merge-request: 1307
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoFixed holes in border image drawing by introducing new API.
Samuel Rødal [Thu, 7 Jul 2011 08:51:52 +0000 (10:51 +0200)]
Fixed holes in border image drawing by introducing new API.

When rasterizing two adjacent QRectFs it's important that the shared x
or y-edges have the exact same coordinates, or there might be a hole or
an overlapping pixel when they are rasterized. Since the
drawPixmapFragments API was based on a center position and a scale, it
can not be used for this purpose, as the in the situation of two
horizontally adjacent rectangles the right edge of the left-most rect
and the left edge of the right-most edge are computed differently. Thus
rounding errors can cause them to not be equal, especially when there's
also a scaling / translating painter transform involved.

Thus, to not sacrifice performance, we need to introduce a new
drawPixmapFragments API that's simply takes an array of target
rectangles and an array of source rectangles. It should give a slight
performance boost for the border pixmap use case as well, since there
are less floating point multiplications / divisions involved.

Task-number: QTBUG-19079
Reviewed-by: Kim
7 years agoProperly resolve and use glMapBuffer / glUnmapBuffer on GLES2.
Samuel Rødal [Fri, 15 Jul 2011 15:29:29 +0000 (17:29 +0200)]
Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.

Even though we're able to resolve the function pointers, the spec says
we have to check for the GL_OES_mapbuffer extension before we use them.
Fixes a crash on a platform that doesn't advertise the extension but
still resolves the function pointers.

Reviewed-by: Kim
7 years agoRevert "fix QFileInfo::isSymLink() for NTFS mount points"
Jiang Jiang [Fri, 22 Jul 2011 14:52:35 +0000 (16:52 +0200)]
Revert "fix QFileInfo::isSymLink() for NTFS mount points"

This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.

7 years agoRemove debug output.
Eike Ziller [Tue, 26 Jul 2011 07:07:10 +0000 (09:07 +0200)]
Remove debug output.