qt:cutterpillows-qt-iphone-clone.git
7 years agoAdded '-platform macx-g++-i386' to the iPhone Device configuration. 4.7-iphone
Dave Thorup [Wed, 7 Jul 2010 23:03:24 +0000 (18:03 -0500)]
Added '-platform macx-g++-i386' to the iPhone Device configuration.
The tools built for cross-compiling (qmake, moc, uic, etc.) must be built as 32-bit. Adding '-platform macx-g++-i386' will build the tools using the 32-bit Intel mkspec.

7 years agoA 32-bit only Mac mkspec - for cross-compiling iPhone device binaries.
Dave Thorup [Wed, 7 Jul 2010 20:40:11 +0000 (15:40 -0500)]
A 32-bit only Mac mkspec - for cross-compiling iPhone device binaries.

7 years agoChange QMAKE_RPATH to QMAKE_LFLAGS_RPATH as the former is depricated.
Dave Thorup [Wed, 7 Jul 2010 20:34:20 +0000 (15:34 -0500)]
Change QMAKE_RPATH to QMAKE_LFLAGS_RPATH as the former is depricated.

7 years agoAdded "-arch armv6" to the LFLAGS in iphone-armv6-g++.conf
Dave Thorup [Tue, 6 Jul 2010 23:47:26 +0000 (18:47 -0500)]
Added "-arch armv6" to the LFLAGS in iphone-armv6-g++.conf
Removed "-arch i386" from the iPhone Device configure in iPhone.txt.
These were causing configure test failures.

7 years agoMerge 4.7 updates
Mark Kromis [Tue, 6 Jul 2010 11:05:30 +0000 (07:05 -0400)]
Merge 4.7 updates

7 years agoMerge commit 'refs/merge-requests/1' of git://gitorious.org/+qt-iphone/qt/qt-iphone...
Mark Kromis [Tue, 6 Jul 2010 05:14:16 +0000 (01:14 -0400)]
Merge commit 'refs/merge-requests/1' of git://gitorious.org/+qt-iphone/qt/qt-iphone-clone into merge-requests-1

Conflicts:
configure
mkspecs/common/iphone-g++.conf

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sun, 4 Jul 2010 09:31:15 +0000 (11:31 +0200)]
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:
  make image handler includes private
  fix symbian build
  doc improvements
  rebuild configure
  s/INCPATH/INCLUDEPATH/
  Fix Windows build
  Consolidate zlib configuration redundancy
  Fixed whitespace formatting
  Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
  Split image handler plugin project files
  No explicit link to zlib/jpeg for system mng/tiff
  Removed stray line continuations
  Long live else!
  qdoc: Added a solution for creating tables of contents for manuals.
  Doc: Fixed markup.
  Fixed size hint for combo box on windows

7 years agomake image handler includes private
Oswald Buddenhagen [Sun, 4 Jul 2010 09:24:25 +0000 (11:24 +0200)]
make image handler includes private

now that they live in gui/image/ instead of plugins/imageformats/, the
handlers need to get the usual _p suffix.

7 years agofix symbian build
Oswald Buddenhagen [Sat, 3 Jul 2010 22:06:40 +0000 (00:06 +0200)]
fix symbian build

as absolutely braindead as it is, symbian is a unix as far as qmake is
concerned.

7 years agodoc improvements
Oswald Buddenhagen [Thu, 1 Jul 2010 11:36:55 +0000 (13:36 +0200)]
doc improvements

7 years agorebuild configure
Oswald Buddenhagen [Sat, 3 Jul 2010 12:27:09 +0000 (14:27 +0200)]
rebuild configure

7 years agos/INCPATH/INCLUDEPATH/
Oswald Buddenhagen [Sat, 3 Jul 2010 12:26:36 +0000 (14:26 +0200)]
s/INCPATH/INCLUDEPATH/

7 years agoFix Windows build
Mark Brand [Sat, 3 Jul 2010 11:07:41 +0000 (13:07 +0200)]
Fix Windows build

Set the QT_NO_IMAGEFORMAT_* defines like the unix configure does.
This avoids that we try to link the image handlers into QtGui when
they are built as plugins.

Reviewed-by: ossi
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sat, 3 Jul 2010 05:21:49 +0000 (07:21 +0200)]
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:
  Consolidate zlib configuration redundancy
  Fixed whitespace formatting
  Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
  Split image handler plugin project files
  No explicit link to zlib/jpeg for system mng/tiff
  Removed stray line continuations
  Long live else!
  qdoc: Added a solution for creating tables of contents for manuals.
  Doc: Fixed markup.
  Fixed size hint for combo box on windows

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Sat, 3 Jul 2010 02:52:17 +0000 (04:52 +0200)]
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:
  Hide some more files from git-status.
  Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed deployment locations for various profiles.
  Added a top-level runonphone target for Qt and QtWebKit.
  QS60Style: Simplify QMenu drawing
  QS60Style: Remove gap from QProgressDialog
  ColorDialog is incorrectly positioned
  Support for "deploy" make target in Symbian
  qtguiu.def merge conflict fix
  Fix for include "private/qt_s60_p.h" in non-symbian builds
  Making orbit input methods work with Qt apps with -no-s60
  Using the remaining valid data to construct the QTime object when msec parsing failed.
  QProgressDialog text is too close to dialog border
  fix for broken input method loading
  Avkon Removal DEF file updates
  Stub version of QS60Style
  Avkon removal configured with -no-s60
  QFileDialog broken in landscape in N8

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Fri, 2 Jul 2010 21:30:25 +0000 (23:30 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 2 Jul 2010 20:58:55 +0000 (22:58 +0200)]
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:
  Consolidate zlib configuration redundancy
  Fixed whitespace formatting
  Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
  Split image handler plugin project files
  No explicit link to zlib/jpeg for system mng/tiff
  Removed stray line continuations
  Long live else!
  qdoc: Added a solution for creating tables of contents for manuals.
  Doc: Fixed markup.
  Fixed size hint for combo box on windows

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 2 Jul 2010 18:08:58 +0000 (20:08 +0200)]
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:
  Crash when dragging with mingw
  Don't do alpha/opaque check which might cause a conversion and later pointer not-matching.

7 years agoConsolidate zlib configuration redundancy
Mark Brand [Fri, 2 Jul 2010 16:30:35 +0000 (18:30 +0200)]
Consolidate zlib configuration redundancy

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoFixed whitespace formatting
Mark Brand [Fri, 2 Jul 2010 16:30:34 +0000 (18:30 +0200)]
Fixed whitespace formatting

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoFix incomplete support for built-in jpeg, mng, tiff and gif handlers
Mark Brand [Fri, 2 Jul 2010 16:30:33 +0000 (18:30 +0200)]
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers

Previously, although the configure shell script could configure
built-in support for these image formats, the .pr[io] files
would nevertheless build them as plugins. Support was also
missing from qimagereader and qimagewriter. This has now been
added.

Configure.exe, while clearly intended to support this too,
needed a few minor fixes. For example, the usage of values
"qt" and "yes" was inconsistent.

For both configure tools, the explanation of the *non*-related
options has been clarified, i.e:
    -no-libjpeg
    -qt-libjpeg
    -system-libjpeg
These options have nothing to do with the plugin/built-in
distinction.

There are (still) no configure options for specifying "plugin" or
"built-in" for these image formats. Quite reasonably, "plugin"
is selected for shared Qt and "built-in" is selected for static Qt.

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoSplit image handler plugin project files
Mark Brand [Fri, 2 Jul 2010 16:30:31 +0000 (18:30 +0200)]
Split image handler plugin project files

One pri for each handler, e.g. src/gui/image/qjpeghandler.pri.
One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri.
One shared pri for zlib dependency of 3rd party packages.

This was really about image handler plugins, but PNG got the
same treatment for consistency's sake.

Also, moved image handler source files from plugins to src/gui/image
so they are with the other image handlers.

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoNo explicit link to zlib/jpeg for system mng/tiff
Mark Brand [Fri, 2 Jul 2010 16:30:30 +0000 (18:30 +0200)]
No explicit link to zlib/jpeg for system mng/tiff

For "system" mng or tiff, the shared library mechanism takes care
of loading zlib. For exotic cases like static system mng/tiff/zlib,
one should use configure's -l option. Trying to cover such cases
in project files leads to clutter which is at best harmless for other
cases.

Png already had this arrangement.

The same principle applies to jpeg which is a potential dependency
of tiff and mng. However, bundled tiff and mng are built without
jpeg. Shared system jpeg is loaded automatically if needed. Static
system jpeg can be handled with configure's -l option.

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoRemoved stray line continuations
Mark Brand [Fri, 2 Jul 2010 16:30:28 +0000 (18:30 +0200)]
Removed stray line continuations

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoLong live else!
Mark Brand [Fri, 2 Jul 2010 16:30:27 +0000 (18:30 +0200)]
Long live else!

Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
David Boddie [Fri, 2 Jul 2010 16:23:48 +0000 (18:23 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf

7 years agoqdoc: Added a solution for creating tables of contents for manuals.
David Boddie [Fri, 2 Jul 2010 16:21:25 +0000 (18:21 +0200)]
qdoc: Added a solution for creating tables of contents for manuals.

Reviewed-by: Trust Me
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 2 Jul 2010 15:18:29 +0000 (17:18 +0200)]
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:
  Hide some more files from git-status.
  Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
  Fixed deployment locations for various profiles.
  Added a top-level runonphone target for Qt and QtWebKit.
  QS60Style: Simplify QMenu drawing
  QS60Style: Remove gap from QProgressDialog
  ColorDialog is incorrectly positioned
  Support for "deploy" make target in Symbian
  qtguiu.def merge conflict fix
  Fix for include "private/qt_s60_p.h" in non-symbian builds
  Making orbit input methods work with Qt apps with -no-s60
  Using the remaining valid data to construct the QTime object when msec parsing failed.
  QProgressDialog text is too close to dialog border
  fix for broken input method loading
  Avkon Removal DEF file updates
  Stub version of QS60Style
  Avkon removal configured with -no-s60
  QFileDialog broken in landscape in N8

7 years agoUpdated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9
Simon Hausmann [Fri, 2 Jul 2010 14:07:20 +0000 (16:07 +0200)]
Updated WebKit to d59845f6fec84f15da116f50a1a0e52ce26116e9

Integrated:

|| <https://webkit.org/b/36618> || [Qt] LayoutTests/http/tests/appcache/fallback.html crashes ||
|| <https://webkit.org/b/39359> || [Qt] TiledBackingStore updates broken when not using resizesToContents mode ||

7 years agoHide some more files from git-status.
axis [Fri, 2 Jul 2010 08:49:05 +0000 (10:49 +0200)]
Hide some more files from git-status.

7 years agoFixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
axis [Thu, 1 Jul 2010 15:10:50 +0000 (17:10 +0200)]
Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.

Task:     QTBUG-11396
RevBy:    Simon Hausmann

7 years agoFixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
axis [Thu, 1 Jul 2010 15:09:43 +0000 (17:09 +0200)]
Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.

Task:     QTBUG-11396
RevBy:    Miikka Heikkinen

7 years agoFixed deployment locations for various profiles.
axis [Thu, 1 Jul 2010 14:40:11 +0000 (16:40 +0200)]
Fixed deployment locations for various profiles.

RevBy:    Trust me

7 years agoAdded a top-level runonphone target for Qt and QtWebKit.
axis [Thu, 1 Jul 2010 14:37:58 +0000 (16:37 +0200)]
Added a top-level runonphone target for Qt and QtWebKit.

RevBy:    Trust me

7 years agoQS60Style: Simplify QMenu drawing
Sami Merila [Fri, 2 Jul 2010 12:49:02 +0000 (15:49 +0300)]
QS60Style: Simplify QMenu drawing

This cleans up implementation of menu item drawing and "fixes" it, by
moving the rect calculations to occur in subElementRect() method,
instead of in the drawing code itself.

Reviewed-by: Alessandro Portale
7 years agoCrash when dragging with mingw
Thierry Bastian [Fri, 2 Jul 2010 12:38:33 +0000 (14:38 +0200)]
Crash when dragging with mingw

The problem was that there was a misalignment coming from the d&d code.
That called in the end our SSE optimized functions.
This code turns out to be calling QApplication::processEvents which
in the the calls the Qt event dispatcher for windows' processEvents
function. This function will now also always align the stack to 16
bytes and be SSE ready.

Task-number: QTBUG-11880
Reviewed-by: Zeno Albisser
7 years agoQS60Style: Remove gap from QProgressDialog
Sami Merila [Fri, 2 Jul 2010 12:40:06 +0000 (15:40 +0300)]
QS60Style: Remove gap from QProgressDialog

When showing a progressDialog with QS60Style, there is a strange
empty area after the QProgressbar. This is reserved for label even if
it is not showing one.

Reviewed-by: Alessandro Portale
7 years agoDon't do alpha/opaque check which might cause a conversion and later pointer not...
Michael Dominic K [Fri, 2 Jul 2010 12:37:18 +0000 (14:37 +0200)]
Don't do alpha/opaque check which might cause a conversion and later pointer not-matching.

Merge-request: 724
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoColorDialog is incorrectly positioned
Sami Merila [Fri, 2 Jul 2010 12:30:41 +0000 (15:30 +0300)]
ColorDialog is incorrectly positioned

Due to somewhat special nature of colorDialog, it makes no sense to
make it fullscreen, as it is not totally stretchable in height. Making
it fullscreen only makes it appear higher on the screen and there is
an ugly gap between the dialog and softkeys.

Therefore, as a fix, colorDialog is shown in its "natural" window
state.

Task-number: QTBUG-11668
Reviewed-by: Miikka Heikkinen
7 years agoSupport for "deploy" make target in Symbian
Miikka Heikkinen [Fri, 2 Jul 2010 11:20:09 +0000 (14:20 +0300)]
Support for "deploy" make target in Symbian

Executing "make deploy" will recreate project sis file and deploy it
into a device.

Task-number: QTBUG-5155
Reviewed-by: axis
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
mread [Fri, 2 Jul 2010 10:50:23 +0000 (11:50 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts fixed:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 2 Jul 2010 10:30:27 +0000 (12:30 +0200)]
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:
  qdoc: Fixed spacing before "default" and "read-only".
  Designer: Fix compiler warnings.
  Fix compiler warning.
  Abort if connection to DBus cannot be established.

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Fri, 2 Jul 2010 09:27:59 +0000 (11:27 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agoqdoc: Fixed spacing before "default" and "read-only".
Martin Smith [Fri, 2 Jul 2010 09:25:46 +0000 (11:25 +0200)]
qdoc: Fixed spacing before "default" and "read-only".

Task-number: QTBUG-11346

7 years agoDesigner: Fix compiler warnings.
Friedemann Kleint [Fri, 2 Jul 2010 08:51:51 +0000 (10:51 +0200)]
Designer: Fix compiler warnings.

Warnings introduced by 312c028d44a80f5d6029eb166a0de731f8452525
and gcc 4.5.

Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
7 years agoqtguiu.def merge conflict fix
mread [Fri, 2 Jul 2010 08:36:58 +0000 (09:36 +0100)]
qtguiu.def merge conflict fix

This takes the new exports added in qt/4.7, leaves them in place and
moves the Avkon Removal exports, which conflicted, to the end of the
DEF file.

Reviewed-by: Sami Merila
7 years agoFix compiler warning.
Aaron McCarthy [Fri, 2 Jul 2010 03:18:42 +0000 (13:18 +1000)]
Fix compiler warning.

7 years agoAbort if connection to DBus cannot be established.
Aaron McCarthy [Fri, 2 Jul 2010 03:15:54 +0000 (13:15 +1000)]
Abort if connection to DBus cannot be established.

Fixes network access issue when running Qt applications in scratchbox
environment.

Task-number: QT-3528

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 23:08:53 +0000 (01:08 +0200)]
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:
  Doc: Adding navigation and style fixes. Also rearranging qml elements

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 20:38:58 +0000 (22:38 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10

7 years agoUpdated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10
Simon Hausmann [Thu, 1 Jul 2010 20:07:38 +0000 (22:07 +0200)]
Updated WebKit to cd3aee284bddf4ff9d26f3bcaa7c33d478e81e10

Integrated changes:

|| <https://webkit.org/b/41451> || [Qt] Crash when destroying a QWebView with a QComboBox as its child. ||
|| <https://webkit.org/b/41157> || Spatial Navigation: refactor spatial-navigation-utils.js to support testing nested frames deeper than one level ||

7 years agoDoc: Adding navigation and style fixes. Also rearranging qml elements
Morten Engvoldsen [Thu, 1 Jul 2010 19:23:11 +0000 (21:23 +0200)]
Doc: Adding navigation and style fixes. Also rearranging qml elements

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 18:15:49 +0000 (20:15 +0200)]
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:
  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

7 years agoFix for include "private/qt_s60_p.h" in non-symbian builds
mread [Thu, 1 Jul 2010 15:59:47 +0000 (16:59 +0100)]
Fix for include "private/qt_s60_p.h" in non-symbian builds

Reviewed-by: Shane Kearns
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, 1 Jul 2010 15:43:42 +0000 (17:43 +0200)]
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: (51 commits)
  Symbian on Linux:  $QTDIR/bin is not necessarily in the path.
  Updated Symbian def files with new EGL exports.
  Added another missing EGL stub.
  Fixed compilation on Symbian.
  Added missing EGL stub function.
  Got rid of unused variable compiler warning.
  QGLWindowSurface support for partial updates via EGL_NOK_swap_region2
  Adding func prototypes for EGL_NOK_swap_region2 extension.
  Check for EGLSurface leak only when paint device is a QGLWidget.
  Fixed bug in drawTiledPixmap when width of pixmap matches target rect.
  Update def files for symbian
  Improved performance of 16 bit memrotates using NEON instructions.
  Use built-in iconv on Solaris if available
  Export various symbols needed to make a custom GL graphicssystem.
  Moc: fix compilation when templated types with multiple arguments are used.
  Fixes the documentation of QGraphicsEffect::update().
  support BGRA textures on SGX
  Avoid calling time.elapsed() twice in abstract animation
  Adds slowdownFactor to UnifiedTimer in abstract animation
  Add the conversion in-place for QPixmap::fromImageReader() on raster.
  ...

7 years agoSymbian on Linux: $QTDIR/bin is not necessarily in the path.
Olivier Goffart [Thu, 1 Jul 2010 14:23:00 +0000 (16:23 +0200)]
Symbian on Linux:  $QTDIR/bin is not necessarily in the path.

So it would not find elf2e32_qtwrapper

use the qtPrepareTool macro that does the right thing.

But this macro need QT_BUILD_TREE to be defined, which is not defined
yet early in the test process. So change the tests accordingly

Reviewed-by: ossi
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 15:14:53 +0000 (17:14 +0200)]
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:
  Making orbit input methods work with Qt apps with -no-s60
  Using the remaining valid data to construct the QTime object when msec parsing failed.
  QProgressDialog text is too close to dialog border
  fix for broken input method loading
  Avkon Removal DEF file updates
  Stub version of QS60Style
  Avkon removal configured with -no-s60
  QFileDialog broken in landscape in N8

7 years agoQSslSocket::systemCaCertificates(): have one common case for all Unices
Peter Hartmann [Thu, 1 Jul 2010 14:23:25 +0000 (16:23 +0200)]
QSslSocket::systemCaCertificates(): have one common case for all Unices

Reviewed-by: Simon Hausmann
7 years agoUpdated Symbian def files with new EGL exports.
Samuel Rødal [Thu, 1 Jul 2010 14:36:28 +0000 (16:36 +0200)]
Updated Symbian def files with new EGL exports.

Reviewed-by: Shane Kearns
7 years agoAdded another missing EGL stub.
Samuel Rødal [Thu, 1 Jul 2010 14:30:09 +0000 (16:30 +0200)]
Added another missing EGL stub.

Reviewed-by: Shane Kearns
7 years agoMaking orbit input methods work with Qt apps with -no-s60
mread [Thu, 1 Jul 2010 14:26:04 +0000 (15:26 +0100)]
Making orbit input methods work with Qt apps with -no-s60

This change allows Qt to load the Orbit input methods in Symbian
builds when Qt is configured with -no-s60

Reviewed-by: Sami Merila
7 years agoFixed compilation on Symbian.
Samuel Rødal [Thu, 1 Jul 2010 14:22:59 +0000 (16:22 +0200)]
Fixed compilation on Symbian.

Use EGLint, not GLint here, as GLint might not be defined.

Reviewed-by: Shane Kearns
7 years agoAdded missing EGL stub function.
Samuel Rødal [Thu, 1 Jul 2010 14:14:52 +0000 (16:14 +0200)]
Added missing EGL stub function.

Reviewed-by: Shane Kearns
7 years agoUsing the remaining valid data to construct the QTime object when msec parsing failed.
Liang Qi [Thu, 1 Jul 2010 13:32:20 +0000 (15:32 +0200)]
Using the remaining valid data to construct the QTime object when msec parsing failed.

It's relevant with QTBUG-11623, but not a fix for it.

Reviewed-by: Aleksandar Sasha Babic
7 years agoGot rid of unused variable compiler warning.
Samuel Rødal [Thu, 1 Jul 2010 13:19:52 +0000 (15:19 +0200)]
Got rid of unused variable compiler warning.

7 years agoQGLWindowSurface support for partial updates via EGL_NOK_swap_region2
Michael Dominic K [Thu, 1 Jul 2010 13:19:51 +0000 (15:19 +0200)]
QGLWindowSurface support for partial updates via EGL_NOK_swap_region2

(if extension available).

Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoAdding func prototypes for EGL_NOK_swap_region2 extension.
Michael Dominic K [Thu, 1 Jul 2010 13:19:51 +0000 (15:19 +0200)]
Adding func prototypes for EGL_NOK_swap_region2 extension.

Merge-request: 712
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 13:00:57 +0000 (15:00 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits)
  Reseted QtDeclarative module def files
  Get WebView tests passing again
  Remove arbitrary width checks
  Removed compilation warning for systems with no OpenGL support
  Fix bug in SameGame's dialog component
  doc fix
  Add abstractitemmodel example, and fix some model docs
  docs - quote code with snippets, other improvements
  Fix webkit import for webkit tests.
  Remove qmlviewer dependency on QDeclarativeTimer
  Remove a few more unnecessary exports.
  Don't export declarative private classes
  Add additional text layout benchmarks.
  Don't access uninitialized value.
  Minor Twitter demo enhancements
  Added SET_BINDING message to QDeclarative debugger protocol
  Add ListView.nextSection attached property
  Remove the old font.outline documentation
  Docs - add more links to relevant examples
  Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't
  ...

7 years agoCheck for EGLSurface leak only when paint device is a QGLWidget.
Michael Dominic K [Thu, 1 Jul 2010 08:14:09 +0000 (10:14 +0200)]
Check for EGLSurface leak only when paint device is a QGLWidget.

(not QGLWindowSurface for example).

Merge-request: 722
Reviewed-by: Trond
7 years agoFixed bug in drawTiledPixmap when width of pixmap matches target rect.
Samuel Rødal [Thu, 1 Jul 2010 12:31:34 +0000 (14:31 +0200)]
Fixed bug in drawTiledPixmap when width of pixmap matches target rect.

qt_memconvert's duff's device implementation assumes that count is > 0,
if count is 0 it will still blit eight pixels.

Reviewed-by: Trond
7 years agoFixed QX11EmbedContainer.
Denis Dzyubenko [Thu, 1 Jul 2010 10:00:05 +0000 (12:00 +0200)]
Fixed QX11EmbedContainer.

Enforce the creation of the native window id for the focusproxy widget inside
the container to make sure we won't get a CreateNotify event to try to embed
the focusproxy itself.

Task-number: QTBUG-10809
Reviewed-by: Bradley T. Hughes
7 years agoImproved a bit detection of a touch screen on Windows.
Denis Dzyubenko [Wed, 30 Jun 2010 10:45:42 +0000 (12:45 +0200)]
Improved a bit detection of a touch screen on Windows.

Use the bitfield description from MSDN instead of just checking if there is any
kind of digitizer.

Reviewed-by: Prasanth
7 years agoUpdate def files for symbian
Olivier Goffart [Thu, 1 Jul 2010 12:02:42 +0000 (14:02 +0200)]
Update def files for symbian

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Thu, 1 Jul 2010 12:01:01 +0000 (15:01 +0300)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoQProgressDialog text is too close to dialog border
Sami Merila [Thu, 1 Jul 2010 11:43:18 +0000 (14:43 +0300)]
QProgressDialog text is too close to dialog border

This is due to that in Symbian, dialog border is not definitive.
The actual border might be few pixels inside the dialog area to support
partial transparency of dialog corners. Therefore laying out labels
to near border (to y coordinate 0) makes the label cross the dialog
border area for some themes.

Fixed, by moving the dialog content down
PM_DefaultTopLevelMargin pixels.

Task-number: QT-3511
Reviewed-by: Alessandro Portale
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
Qt Continuous Integration System [Thu, 1 Jul 2010 10:36:35 +0000 (12:36 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316

7 years agoSet 'TARGET_PLATFORM' to 'iphone' - this is needed for the cross-compile to work...
Dave Thorup [Thu, 1 Jul 2010 10:14:02 +0000 (05:14 -0500)]
Set 'TARGET_PLATFORM' to 'iphone' - this is needed for the cross-compile to work. Otherwise it's set to 'mac' which we don't want for buildin iPhone binaries.

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Thu, 1 Jul 2010 09:59:12 +0000 (11:59 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agoqdoc: Fixed invalid format in the html header.
Martin Smith [Thu, 1 Jul 2010 09:58:17 +0000 (11:58 +0200)]
qdoc: Fixed invalid format in the html header.

Task-number: QTBUG-11803

7 years agofix for broken input method loading
mread [Thu, 1 Jul 2010 09:54:29 +0000 (10:54 +0100)]
fix for broken input method loading

Changed use of wrong flag "Q_WS_SYMBIAN" back to "Q_WS_S60" so that
input methods should work correctly in S60 builds of Qt.

7 years agoReseted QtDeclarative module def files
Joona Petrell [Thu, 1 Jul 2010 09:43:23 +0000 (19:43 +1000)]
Reseted QtDeclarative module def files

7 years agolink glu32 before opengl32
Oswald Buddenhagen [Thu, 1 Jul 2010 09:41:42 +0000 (11:41 +0200)]
link glu32 before opengl32

otherwise the build fails if the libraries are statically built, as glu
depends on opengl.

Task-number: QTBUG-11863

7 years agoUpdated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316
Simon Hausmann [Thu, 1 Jul 2010 09:22:23 +0000 (11:22 +0200)]
Updated WebKit to 0eee8df53d1873669a9dda8f9c0340543258a316

Integrated changes:

|| <https://webkit.org/b/38597> || [Qt] QtTestBrowser does not have a "Load" button ; therefore, unable to load pages on touch only symbian devices (portrait mode). ||
|| <https://webkit.org/b/40846> || [Qt] GraphicsLayerQt delay seems unnecessary. ||
|| <https://webkit.org/b/41160> || Spatial Navigation: make elements in inner frames nested more than 1 level deep focusable ||
|| <https://webkit.org/b/39019> || [Qt] Combobox doesn't close when scrolling in graphicsbased mode ||
|| <https://webkit.org/b/41164> || [Qt] QtWebKit crashes if <select>'s render changes in its onchange event ||
|| <https://webkit.org/b/41198> || [QT][S60] build-webkit scripts picks wrong make spec for windows build ||
|| <https://webkit.org/b/41278> || [Qt] Replace single treat-as-space characters with normal space ||
|| <https://webkit.org/b/37303> || [Qt] Application crash on exit if NPPlugin is loaded ||
|| <https://webkit.org/b/40378> || [Qt] When any geometry change happens to a node it will resize the backing cache ||
|| <https://webkit.org/b/40795> || [Qt] Crash when uploading document to Google Docs ||
|| <https://webkit.org/b/40446> || [Qt] Only 10 websites can be loaded consecutively when using QtWebkit 2.0 ||

7 years agoAvkon Removal DEF file updates
mread [Thu, 1 Jul 2010 09:14:47 +0000 (10:14 +0100)]
Avkon Removal DEF file updates

This adds the s60framework exports to the Symbian DEF files. These new
exports remove the need for apps using s60framework classes to link to
Avkon.

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Thu, 1 Jul 2010 08:48:15 +0000 (18:48 +1000)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 years agoGet WebView tests passing again
Alan Alpert [Thu, 1 Jul 2010 08:47:37 +0000 (18:47 +1000)]
Get WebView tests passing again

zoomFactor was removed in the new version.

7 years agoRemove arbitrary width checks
Alan Alpert [Thu, 1 Jul 2010 08:39:34 +0000 (18:39 +1000)]
Remove arbitrary width checks

Width is not an arbitrary value, it is the size of the rendered page
(which is whatever webkit says it is).

Width should be tested to be correct, but this change should be done by
the maintainers (who should also take the autotest out of declarative).

Task-number: QTBUG-11855

7 years agoImproved performance of 16 bit memrotates using NEON instructions.
Samuel Rødal [Wed, 30 Jun 2010 08:32:01 +0000 (10:32 +0200)]
Improved performance of 16 bit memrotates using NEON instructions.

Make the memrotate functions a function pointer table so that we can
replace it with optimized versions, and implement an optimized NEON
version for the 90 and 270 rotations.

Measured performance improvement for a 400x400 16-bit pixmap was
17 % for 270 degree rotation and 11 % for 90 degree rotation.

Reviewed-by: Trond
7 years agoStub version of QS60Style
mread [Wed, 30 Jun 2010 16:21:05 +0000 (17:21 +0100)]
Stub version of QS60Style

Added a stub version of QS60Style so that DEF files can be compatible
between Qt configured with and without style-s60.

Reviewed-by: Shane Kearns
7 years agoAvkon removal configured with -no-s60
mread [Wed, 30 Jun 2010 14:00:11 +0000 (15:00 +0100)]
Avkon removal configured with -no-s60

Avkon dependencies can be configured out with the -no-s60 configure
flag, conversely Qt on Symbian will use Avkon if -s60 is configured.

These changes are intended to keep or introduce binary compatibility
between the s60 and no-s60 configurations. To do this, it has been
necessary to introduce stub equivalents of the CAknAppUi related
classes into the no-s60 configuration, and override all Avkon framework
virtual functions in the QS60Main... classes.

Other than that, these changes are mostly just correcting the use of
the Q_WS_S60 flag so that it only refers to Avkon dependencies.

Reviewed-by: Sami Merila
7 years agoRemoved compilation warning for systems with no OpenGL support
Lasse Holmstedt [Wed, 30 Jun 2010 12:44:29 +0000 (14:44 +0200)]
Removed compilation warning for systems with no OpenGL support

Reviewed-by: Aaron Kennedy
7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Thu, 1 Jul 2010 08:07:14 +0000 (11:07 +0300)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoFix bug in SameGame's dialog component
Alan Alpert [Thu, 1 Jul 2010 07:50:45 +0000 (17:50 +1000)]
Fix bug in SameGame's dialog component

Was emitting closed after already being closed.

Task-number: QTBUG-11812

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Alan Alpert [Thu, 1 Jul 2010 07:14:06 +0000 (17:14 +1000)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 years agoMerge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Martin Smith [Thu, 1 Jul 2010 07:12:38 +0000 (09:12 +0200)]
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 years agodoc fix
Bea Lam [Thu, 1 Jul 2010 06:55:17 +0000 (16:55 +1000)]
doc fix

7 years agoAdd abstractitemmodel example, and fix some model docs
Bea Lam [Thu, 1 Jul 2010 06:32:30 +0000 (16:32 +1000)]
Add abstractitemmodel example, and fix some model docs

7 years agodocs - quote code with snippets, other improvements
Bea Lam [Thu, 1 Jul 2010 02:11:15 +0000 (12:11 +1000)]
docs - quote code with snippets, other improvements

7 years agoFix webkit import for webkit tests.
Martin Jones [Thu, 1 Jul 2010 05:52:45 +0000 (15:52 +1000)]
Fix webkit import for webkit tests.

7 years agoRemove qmlviewer dependency on QDeclarativeTimer
Martin Jones [Thu, 1 Jul 2010 04:41:23 +0000 (14:41 +1000)]
Remove qmlviewer dependency on QDeclarativeTimer