qt:qt.git
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 13 May 2011 10:39:05 +0000 (20:39 +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:
  X11: Keep the menubar inside the widgetbox window in toplevel mode
  Retain ABI and API compatibility when Qt is built with EGL.

11 years agoX11: Keep the menubar inside the widgetbox window in toplevel mode
Michał Zając [Fri, 13 May 2011 08:40:05 +0000 (10:40 +0200)]
X11: Keep the menubar inside the widgetbox window in toplevel mode

For now the appmenu protocol does not make it possible to associate a
menubar with all application windows. This means in top level mode you
can only reach the menubar when the widgetbox window is active. Since
this is quite inconvenient, better not use the native menubar in this
configuration and keep the menubar in the widgetbox window.

Merge-request: 1229
Reviewed-by: denis
11 years agoRetain ABI and API compatibility when Qt is built with EGL.
Michał Zając [Fri, 13 May 2011 08:39:34 +0000 (10:39 +0200)]
Retain ABI and API compatibility when Qt is built with EGL.

Author: Felix Geyer <debfx-pkg@fobos.de>

Merge-request: 1230
Reviewed-by: ossi
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 13 May 2011 06:32:13 +0000 (16:32 +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:
  Fix QtOpenGL def file for armv5.
  Disable QtConcurrent for Symbian winscw builds.
  Fix loss of focus and activation when hiding a child widget
  Symbian build failure for Armv5
  Fix softkeys in case a dialog with softkeys that have icons is closed.
  Update softkeys after orientation switch.
  Provide internal API to avoid automatic translation of input widget
  Do not allow fullscreen/maximized windows to expand beyond client rect

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 12 May 2011 17:40:55 +0000 (03:40 +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:
  Fix QtOpenGL def file for armv5.

11 years agoFix QtOpenGL def file for armv5.
Laszlo Agocs [Thu, 12 May 2011 13:37:04 +0000 (15:37 +0200)]
Fix QtOpenGL def file for armv5.

Reviewed-by: TRUSTME
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 12 May 2011 13:20:27 +0000 (23:20 +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: (250 commits)
  Disable QtConcurrent for Symbian winscw builds.
  Fix loss of focus and activation when hiding a child widget
  Symbian build failure for Armv5
  update def files
  Fix softkeys in case a dialog with softkeys that have icons is closed.
  Update softkeys after orientation switch.
  ifdef out mac/no_coreservices path more cleanly
  fix build on symbian
  Provide internal API to avoid automatic translation of input widget
  Allow different text for undo actions and items in QUndoView
  Allow using not only prefixes for undo command text
  QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
  Massively update the hurd-g++ mkspec.
  Sockets: Fix potential null pointer usages
  Update QTBUG-17223 for Qt 4.8
  Do not allow multiple threads to acquire a QMutex
  rebuild configure
  fix tst_qnetworkreply::httpProxyCommands autotest
  Send User-Agent from the network request in http proxy CONNECT command
  QSslConfiguration documentation fix
  ...

11 years agoDisable QtConcurrent for Symbian winscw builds.
Laszlo Agocs [Thu, 12 May 2011 10:16:45 +0000 (12:16 +0200)]
Disable QtConcurrent for Symbian winscw builds.

While QtConcurrent is nowadays usable with RVCT and GCCE compilers,
the compiler used for the winscw target has problems with the
templates still. To enable building 4.8 on winscw, the patch
defines QT_NO_CONCURRENT and QT_NO_QFUTURE in qglobal.h for
this target. However this causes further complications in the
Q_OBJECT classes of QtConcurrent because moc will be run without
having QT_NO_CONCURRENT and QFUTURE defined (as moc is not a Symbian
app and for other Symbian targets they must not be defined, which makes
differentiation in qglobal.h impossible for the moc run) and having a
moc file generated for a class that will be ifdef'ed out during
compilation causes build breaks. Therefore additional dummy stubs are
provided in QFutureWatcherBase.

Reviewed-by: Liang Qi
11 years agoFix loss of focus and activation when hiding a child widget
Miikka Heikkinen [Wed, 11 May 2011 12:42:25 +0000 (15:42 +0300)]
Fix loss of focus and activation when hiding a child widget

Don't deactivate the active window when hiding its child if it has
another child that currently has the focus.

Task-number: QTBUG-19196
Reviewed-by: Sami Merila
11 years agoSymbian build failure for Armv5
Sami Merila [Thu, 12 May 2011 07:27:03 +0000 (10:27 +0300)]
Symbian build failure for Armv5

1. Changed externs to Q_GUI_EXPORTs
2. ABSENTed missing exports from openGL's DEF-file

Reviewed-by: Tomi Vihria
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Thu, 12 May 2011 07:15:00 +0000 (17:15 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QmlDebug: Fix QmlOstPlugin compilation failure
  QmlDebug: Fix QmlOstPlugin compilation failure
  Enable performance monitoring at application startup.
  Augment documentation
  QmlDebugger: removing slots in Live Preview
  QmlDebugger: adding slots to items in Live Preview
  Fixed license header
  Fixed compile on Windows
  Added forgotten file qdeclarativeobserverinterface_p.h
  Removed some trailing whitespace
  Introduced a CONFIG option that enables declarative debug services
  Moved the QML Observer Service and related functionality into Qt
  QDeclarativeDebugServer: Send hello answer before any service messages
  Removed some superfluous semicolons

11 years agoQmlDebug: Fix QmlOstPlugin compilation failure
Kai Koehne [Thu, 12 May 2011 06:33:21 +0000 (08:33 +0200)]
QmlDebug: Fix QmlOstPlugin compilation failure

Fix signature of waitForMessage.

Reviewed-by: Tom Sutcliffe
11 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master...
Qt Continuous Integration System [Wed, 11 May 2011 15:39:22 +0000 (01:39 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
  Fix GLES2 include path for applications when not using the dash shell
  Remove not supported qmake api
  Added Wayland selection support.
  Added Wayland selection support.
  Add the wayland client libraries to rpath if we use rpath
  Fix the wayland windowsurface so that we have stencil and depth buffer
  Dont do doneCurrent in swapBuffers
  Lighthouse: Fix up Xlib

11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Wed, 11 May 2011 13:14:36 +0000 (16:14 +0300)]
Merge remote-tracking branch 'qt/4.8'

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

11 years agoFix GLES2 include path for applications when not using the dash shell
Paul Olav Tvete [Wed, 11 May 2011 10:32:46 +0000 (12:32 +0200)]
Fix GLES2 include path for applications when not using the dash shell

Backslash escapes normally requires "-e" option to echo

Reviewed-by: Jørgen
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Wed, 11 May 2011 10:36:46 +0000 (20:36 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
  qmake vc(x)proj generator: support x64 Qt builds
  qmake: remove dead code from VcxprojGenerator
  qmake nmake generator: pass MAKEFLAGS to sub-make calls

11 years agofixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e
Joerg Bornemann [Wed, 11 May 2011 10:24:46 +0000 (12:24 +0200)]
fixup for 23e772584531278e3b2a6c735ff9db88f7ffd76e

Reviewed-by: TrustMe
11 years agoQmlDebug: Fix QmlOstPlugin compilation failure
Tom Sutcliffe [Wed, 11 May 2011 10:09:23 +0000 (12:09 +0200)]
QmlDebug: Fix QmlOstPlugin compilation failure

Implement waitForMessage()/waitForReadyRead functionality required
by bde58ad1e7d2b38d.

Reviewed-by: kkoehne
11 years agoMerge remote branch 'qt/4.8' into master-qml-staging
Kai Koehne [Tue, 10 May 2011 13:14:16 +0000 (15:14 +0200)]
Merge remote branch 'qt/4.8' into master-qml-staging

Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 10 May 2011 12:35:12 +0000 (22:35 +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:
  update def files
  Sockets: Fix potential null pointer usages
  Update QTBUG-17223 for Qt 4.8
  fix tst_qnetworkreply::httpProxyCommands autotest
  Send User-Agent from the network request in http proxy CONNECT command
  Fix spelling mistake
  Fix crash when QSocketNotifier used with an invalid descriptor
  Add autotests for configuration dependent network proxies
  Fix QNetworkReplyImpl error handling
  Enable per network configuration proxy settings in QNetworkAccessManager
  Allow a network configuration to be included in a proxy query
  Optimisation - buffer packet read in pendingDatagramSize
  Fix error handling in write for socks socket engine
  Remove warnings when disabling notifications on a closed socket
  Fix some warnings in symbian network tests

11 years agoupdate def files
Shane Kearns [Tue, 10 May 2011 12:11:45 +0000 (13:11 +0100)]
update def files

Reviewed-by: Trust Me
11 years agoFix softkeys in case a dialog with softkeys that have icons is closed.
Miikka Heikkinen [Tue, 10 May 2011 09:46:52 +0000 (12:46 +0300)]
Fix softkeys in case a dialog with softkeys that have icons is closed.

Icons were not cleared from softkeys properly when a dialog with
softkeys that had icons was closed, resulting in having those icons in
softkeys that should have been empty or have text.

Task-number: QTBUG-19154
Reviewed-by: Sami Merila
11 years agoUpdate softkeys after orientation switch.
Miikka Heikkinen [Tue, 10 May 2011 09:25:31 +0000 (12:25 +0300)]
Update softkeys after orientation switch.

This is needed to render the softkeys correctly in case the softkeys
have icons.

Task-number: QTBUG-19150
Reviewed-by: Sami Merila
11 years agoMerge remote branch 'qt/4.8' into staging-master
Shane Kearns [Tue, 10 May 2011 10:29:32 +0000 (11:29 +0100)]
Merge remote branch 'qt/4.8' into staging-master

11 years agoEnable performance monitoring at application startup.
Kai Koehne [Tue, 22 Mar 2011 10:13:08 +0000 (11:13 +0100)]
Enable performance monitoring at application startup.

Reviewed-by: Michael Brasser
(cherry picked from commit 8765bdaebf5db409dc2121bce3b9838f3663bd7e)

11 years agoMerge branch 'symbian-socket-engine' into staging-master
Shane Kearns [Tue, 10 May 2011 09:23:30 +0000 (10:23 +0100)]
Merge branch 'symbian-socket-engine' into staging-master

11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 10 May 2011 06:54:28 +0000 (09:54 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 9 May 2011 23:27:07 +0000 (09:27 +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:
  ifdef out mac/no_coreservices path more cleanly
  fix build on symbian

11 years agoifdef out mac/no_coreservices path more cleanly
Oswald Buddenhagen [Mon, 9 May 2011 15:44:48 +0000 (17:44 +0200)]
ifdef out mac/no_coreservices path more cleanly

the symbian path was also dead

11 years agofix build on symbian
Oswald Buddenhagen [Mon, 9 May 2011 15:42:53 +0000 (17:42 +0200)]
fix build on symbian

provide dummy implementation of QProcessEnvironment::systemEnvironment()

11 years agoProvide internal API to avoid automatic translation of input widget
Sami Merila [Mon, 9 May 2011 13:21:11 +0000 (16:21 +0300)]
Provide internal API to avoid automatic translation of input widget

There will be cases when client will want to disable splitview
automatic view translation, so that keyboard is just brought on top of
the application and no other actions happen. There will be no new
public Qt GUI API to cover the cases (the public API will come from
QML Components), but the implementation is done with new private API.

Task-number: QTBUG-18716
Reviewed-by: Miikka Heikkinen
11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Mon, 9 May 2011 12:18:02 +0000 (15:18 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoRemove not supported qmake api
Jørgen Lind [Mon, 9 May 2011 12:07:55 +0000 (14:07 +0200)]
Remove not supported qmake api

11 years agoAdded Wayland selection support.
Laszlo Agocs [Fri, 6 May 2011 16:36:43 +0000 (18:36 +0200)]
Added Wayland selection support.

Messed up when I cherry-picked eb0c2e7229bb3559e6f8754122b298479407c153

11 years agoAdded Wayland selection support.
Laszlo Agocs [Mon, 9 May 2011 10:09:33 +0000 (12:09 +0200)]
Added Wayland selection support.

11 years agoAdd the wayland client libraries to rpath if we use rpath
Jørgen Lind [Sun, 8 May 2011 15:41:36 +0000 (17:41 +0200)]
Add the wayland client libraries to rpath if we use rpath

11 years agoFix the wayland windowsurface so that we have stencil and depth buffer
Jørgen Lind [Sun, 8 May 2011 08:53:56 +0000 (10:53 +0200)]
Fix the wayland windowsurface so that we have stencil and depth buffer

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 9 May 2011 09:41:20 +0000 (19:41 +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:
  Allow different text for undo actions and items in QUndoView
  Allow using not only prefixes for undo command text

11 years agoAllow different text for undo actions and items in QUndoView
Alexander Potashev [Mon, 9 May 2011 08:39:18 +0000 (10:39 +0200)]
Allow different text for undo actions and items in QUndoView

Now the texts used for undo actions and for items in QUndoView can
be set separately. This introduces an extended format of text that
can be passed to QUndoCommand::setText or QUndoCommand constructor.

The action text can now contain two strings separated by a "\n". The
first string (that goes before "\n") is then returned by
QUndoCommand::text() and used as name of item in QUndoView.
The second string (that goes after "\n") is returned by
QUndoCommand::actionText() and used when the text properties of the
undo and redo actions are updated.

If the text passed to QUndoCommand does not contain "\n", everything
works as before, and both QUndoCommand::text() and
QUndoCommand::actionText() return the same string.

Even though action text in English usually does not need different forms
for undo actions and QUndoView item, translators can employ this new
command text format, for example to adjust the grammatical case used in
command text to match the context of "Undo %1"/"Redo %1".

Merge-request: 2610
Reviewed-by: ossi
11 years agoAllow using not only prefixes for undo command text
Alexander Potashev [Mon, 9 May 2011 08:35:29 +0000 (10:35 +0200)]
Allow using not only prefixes for undo command text

Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action
text templates "Undo %1" and "Redo %1" if no custom prefix was provided.

This makes more flexible translations possible. The surrounding text
(like "Undo" and "Redo") can now be suffixed to the command name as
German and Korean languages require ("%1 rueckgaengig machen" for German).

Also, now the default action text (when no command can be undone) can be
translated differently from the prefix. For example, it can be
translated as "Undo action", not just "Undo".

When a non-empty prefix is passed to QUndo*****::create****Action(),
those functions work as before, and the features described above become
unavailable.

Task-number: QTBUG-14442
Merge-request: 1212
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Mon, 9 May 2011 02:49:19 +0000 (12:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Augment documentation

11 years agoAugment documentation
Alan Alpert [Mon, 9 May 2011 02:42:44 +0000 (12:42 +1000)]
Augment documentation

Change-Id: I3469c63207d4ca75c5f942dc3fa84c5a71ceb3a2
Task-number: QTBUG-19112
Reviewed-by: Martin Jones
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Fri, 6 May 2011 14:06:06 +0000 (00:06 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QmlDebugger: removing slots in Live Preview
  QmlDebugger: adding slots to items in Live Preview

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 6 May 2011 11:36:08 +0000 (21:36 +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:
  Do not allow multiple threads to acquire a QMutex

11 years agoqmake vc(x)proj generator: support x64 Qt builds
Joerg Bornemann [Thu, 5 May 2011 08:51:27 +0000 (10:51 +0200)]
qmake vc(x)proj generator: support x64 Qt builds

Task-number: QTBUG-17911
Reviewed-by: ossi
11 years agoqmake: remove dead code from VcxprojGenerator
Joerg Bornemann [Thu, 5 May 2011 12:04:22 +0000 (14:04 +0200)]
qmake: remove dead code from VcxprojGenerator

Reviewed-by: ossi
11 years agoQmlDebugger: removing slots in Live Preview
Christiaan Janssen [Fri, 29 Apr 2011 13:54:59 +0000 (15:54 +0200)]
QmlDebugger: removing slots in Live Preview

Reviewed-by: Kai Koehne
11 years agoQmlDebugger: adding slots to items in Live Preview
Christiaan Janssen [Fri, 29 Apr 2011 13:33:11 +0000 (15:33 +0200)]
QmlDebugger: adding slots to items in Live Preview

Reviewed-by: Kai Koehne
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 6 May 2011 07:08:55 +0000 (17:08 +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:
  QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
  Massively update the hurd-g++ mkspec.
  rebuild configure

11 years agoMerge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Bradley T. Hughes [Fri, 6 May 2011 06:52:44 +0000 (08:52 +0200)]
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 6 May 2011 02:00:40 +0000 (12:00 +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:
  QSslConfiguration documentation fix
  Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
  HTTP auto tests: do not load resources from cache that must be revalidtd
  HTTP cache backend: do not load resources that must be revalidated
  HTTP backend: do not load resources from cache that must be revalidated
  Compile fix for QLocale on Symbian.
  Added Kazakh language to the QLocale mapping table on Symbian.
  Added support for QLocale::uiLanguages on Symbian.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Thu, 5 May 2011 17:47:42 +0000 (03:47 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Fixed license header
  Fixed compile on Windows
  Added forgotten file qdeclarativeobserverinterface_p.h
  Removed some trailing whitespace
  Introduced a CONFIG option that enables declarative debug services
  Moved the QML Observer Service and related functionality into Qt
  QDeclarativeDebugServer: Send hello answer before any service messages
  Removed some superfluous semicolons

11 years agoFixed license header
Thorbjørn Lindeijer [Thu, 5 May 2011 17:43:38 +0000 (19:43 +0200)]
Fixed license header

File added in 35faeb205843c4f0b921d2b878d2d24962c64664

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 5 May 2011 17:36:36 +0000 (03:36 +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:
  QNAM HTTP: Fix bug with explicitly zero-length compressed responses.
  Add enablers for Symbian App Booster
  Don't rely on uninitialized data
  Don't realloc user-provided buffer

11 years agoQFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX...
Pino Toscano [Thu, 5 May 2011 17:19:28 +0000 (19:19 +0200)]
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case

... in the same way as done in the other code path.

This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd).

Merge-request: 1218
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMassively update the hurd-g++ mkspec.
Pino Toscano [Thu, 5 May 2011 17:18:23 +0000 (19:18 +0200)]
Massively update the hurd-g++ mkspec.

Bring it to the same level as linux-g++:
- copy the defines from common/linux.conf
- use the common gcc/g++ .conf files
- keep the trick of linking the pthread library everywhere
- leave out the wayland variables, which are not useful for Hurd

Merge-request: 1219
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Thu, 5 May 2011 16:30:28 +0000 (18:30 +0200)]
Merge remote-tracking branch 'origin/4.8'

11 years agoSockets: Fix potential null pointer usages
Shane Kearns [Thu, 5 May 2011 15:32:11 +0000 (16:32 +0100)]
Sockets: Fix potential null pointer usages

QAbstractSocketEngine::createSocketEngine can return 0 as well as throw.
In two cases the pointer was being used before the null check, in a 3rd
case the null check was missing.

Reviewed-by: Markus Goetz
11 years agoDont do doneCurrent in swapBuffers
Jørgen Lind [Thu, 5 May 2011 15:34:07 +0000 (17:34 +0200)]
Dont do doneCurrent in swapBuffers

11 years agoUpdate QTBUG-17223 for Qt 4.8
Shane Kearns [Thu, 5 May 2011 15:03:14 +0000 (16:03 +0100)]
Update QTBUG-17223 for Qt 4.8

In Qt 4.7, http network requests are assigned to http connection
channels before connecting the channel.
In Qt 4.8, channels are connected "blind" as this gives a performance
improvement in certain circumstances.

On the assumption that User-Agent should be the same for all the
requests being sent to the server in a given burst, we use the first
queued request to set the user agent for a http proxy.

Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
Reviewed-by: Martin Petersson
11 years agoDo not allow multiple threads to acquire a QMutex
Bradley T. Hughes [Thu, 5 May 2011 15:03:54 +0000 (17:03 +0200)]
Do not allow multiple threads to acquire a QMutex

After the mutex optimizations on Mac, we did not handle the case where
semaphore_wait() could return KERN_ABORTED. Under heavy contention, this
happens, and when running in release mode, the assert in qmutex.cpp is not
executed. The code silently allows multiple threads to continue as if it
had acquired the mutex exclusively.

Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the
wait. We do not handle KERN_ABORTED for timed waits, simply return false and
let the code doing the tryLock() handle it how it deems best.

Reviewed-by: joao
11 years agorebuild configure
Oswald Buddenhagen [Thu, 5 May 2011 14:48:12 +0000 (16:48 +0200)]
rebuild configure

11 years agofix tst_qnetworkreply::httpProxyCommands autotest
Shane Kearns [Thu, 5 May 2011 14:31:49 +0000 (15:31 +0100)]
fix tst_qnetworkreply::httpProxyCommands autotest

Due to architecture changes in Qt 4.8, clearing the proxy before the
request is complete causes the http connection to not use any proxy.
The issue is that the proxy isn't resolved until after the bearer has
been started (which is correct in the general case, as system proxy
is unknown until that time).

Also increased the test's timeout from 1 second to 15, as starting a
bearer can be slow.

Reviewed-by: Markus Goetz
11 years agoSend User-Agent from the network request in http proxy CONNECT command
Shane Kearns [Wed, 4 May 2011 16:27:36 +0000 (17:27 +0100)]
Send User-Agent from the network request in http proxy CONNECT command

Some proxies can discriminate based on the User-Agent when sent a
CONNECT command for establishing a HTTPS connection.
With this change, if the User-Agent header is set in the QNetworkRequest
then it will be passed to the http socket engine for use in the connect
command sent to the proxy.
As before, "Mozilla/5.0" will be used by default when no user agent
has been set.

Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 5 May 2011 13:01:42 +0000 (23:01 +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:
  Compile on Windows
  Support gamma correction of text on GL
  Remove QFontEngineFT::loadGlyphMetrics
  Make autotest more resilient against network timeout
  Do not filter adhoc clients
  Lancelot: Add configurable client filtering to baseline server
  Improve error reporting on failure to connect to baseline server
  Fixed bug in X11 backend when creating translucent windows.
  Only cleanup share widget if it has been created.
  Add required font metrics functions to QRawFont
  Fixed bug in QPdfEngine::addImage causing mono images to be made 32 bit
  Make pixel size a qreal in QRawFont
  Make sure removed QTextBlock is invalid
  Make sure QFont's resolve mask is copied on compilers with C++0x support
  Fix glyph position issue with fallback fonts

11 years agoQSslConfiguration documentation fix
Taito Silvola [Thu, 5 May 2011 09:09:32 +0000 (12:09 +0300)]
QSslConfiguration documentation fix

setPeerVerifyMode() and peerVerifyMode() comments fix

Merge-request: 1220
Reviewed-by: Peter Hartmann
11 years agoEnsure that QDateTimeEdit::calendarWidget() will always return a valid widget.
Robin Burchell [Thu, 5 May 2011 08:49:59 +0000 (10:49 +0200)]
Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.

This case may be triggered in the (admittedly slightly abnormal) case where a
user wishes to embed the calendar widget in a layout or, for whatever reason, do
something else that will change its ownership.

We work around this by detecting when it is deleted and recreating the widget.

This will also have a positive side effect if setCalendarWidget() is called with
a widget which is then subsequently deleted, returning the default widget
instead of a pointer to (now deleted) memory.

Reviewed-by: Denis Dzyubenko
Merge-request: 2568
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
11 years agoLighthouse: Fix up Xlib
Jørgen Lind [Thu, 5 May 2011 08:46:30 +0000 (10:46 +0200)]
Lighthouse: Fix up Xlib

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 5 May 2011 08:12:33 +0000 (18:12 +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:
  don't crash in QProcessEnvironment::systemEnvironment()
  qmake: Introduce new template type
  no environment on WinCE
  fix Widestring vs. Ansi mixup
  fix potential crash in QProcessEnvironment::systemEnvironment() on windows
  Fix compilation with QT_NO_*
  fix build on symbian
  skip widget when its focusPolicy is Qt::ClickFocus in TabOrderEditor
  fix build on mac
  make QProcessEnvironment on Unix cache converted values
  make QProcessEnvironment::systemEnvironment() encoding-safe
  make QProcessEnvironment on Unix cache converted variable names
  move key/value converters to the private class
  make QProcessEnvironment on Windows preserve variable name case
  split QProcessEnvironmentPrivate::Unit into Key and Value
  remove unused functions
  minor optimization: use QList::reserve()
  use the Hash typedef
  Changelog: Qt Designer 4.8

11 years agoqmake nmake generator: pass MAKEFLAGS to sub-make calls
Joerg Bornemann [Tue, 3 May 2011 07:52:30 +0000 (09:52 +0200)]
qmake nmake generator: pass MAKEFLAGS to sub-make calls

Unlike other make tools nmake doesn't do this automatically.

Reviewed-by: ossi
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 5 May 2011 04:15:13 +0000 (14:15 +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:
  Fix BlendBench::unalignedBlendArgb32 test case
  Fix memory leak in XSD component of XmlPatterns
  Added autotest for threaded text rendering.
  Implement support for enable_backup CONFIG value.
  Make text rendering working outside the gui thread on Symbian.
  Fix autotest failure in XmlPattern qxmlquery
  Fix memory leak bugs in XmlPatterns
  Symbian's QElapsedTimer::restart() fixed to return ms rather than us
  Create a cleanup stack for each new thread on Symbian.
  Do not modify window size for fullscreen windows in setGeometry_sys
  Fixed Qt UDA creation for Symbian
  Enablers for the Qt eclipsing in Symbian
  Improve logic to find default certificates in createpackage script
  Fix "make sis" for projects that have empty OBJECTS_DIR
  Add focus frame support in style sheet
  Fix OpenGL build break on Symbian

11 years agodon't crash in QProcessEnvironment::systemEnvironment()
Oswald Buddenhagen [Wed, 4 May 2011 20:06:36 +0000 (22:06 +0200)]
don't crash in QProcessEnvironment::systemEnvironment()

as the implementations moved to platform-specific files, the
QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization
needs to go to the private header.

Reviewed-by: thiago
11 years agoFixed compile on Windows
Thorbjørn Lindeijer [Wed, 4 May 2011 16:59:49 +0000 (18:59 +0200)]
Fixed compile on Windows

This compiled fine on Linux, but on Windows the project root is not
automatically included in the INCLUDEPATH. Use the correct relative path
to make the include work.

Problem introduced with 35faeb205843c4f0b921d2b878d2d24962c64664

11 years agoFix spelling mistake
Shane Kearns [Wed, 4 May 2011 16:41:22 +0000 (17:41 +0100)]
Fix spelling mistake

Reviewed-by: Trust Me
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Wed, 4 May 2011 16:11:28 +0000 (02:11 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QmlViewer: Translate UI
  Fix insert and scroll to bottom case
  QDeclarativeDebug: Fix test case
  QDeclarativeDebug: Handle case where client with ongoing queries is deleted
  Remove compile warning
  Fix QUnifiedTimer bug
  Stop the animation driver when there are no more animations.
  Optimization and benchmark for setting object properties from QML.
  Add Constant and Final flags to QMetaObjectBuilder
  Fixed QML TextEdit docs
  Make -no-opengl exist on other platforms
  Only ask for name when the user goes on the high score list.

11 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Wed, 4 May 2011 16:06:34 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

11 years agoAdded forgotten file qdeclarativeobserverinterface_p.h
Thorbjørn Lindeijer [Wed, 4 May 2011 15:29:44 +0000 (17:29 +0200)]
Added forgotten file qdeclarativeobserverinterface_p.h

This should have been part of 35faeb205843c4f0b921d2b878d2d24962c64664

11 years agoRemoved some trailing whitespace
Thorbjørn Lindeijer [Tue, 3 May 2011 12:46:43 +0000 (14:46 +0200)]
Removed some trailing whitespace

11 years agoIntroduced a CONFIG option that enables declarative debug services
Thorbjørn Lindeijer [Mon, 18 Apr 2011 15:20:49 +0000 (17:20 +0200)]
Introduced a CONFIG option that enables declarative debug services

This replaces the need for applications to explicitly make a call to
enable the debug services, and rather does it in declarative.h when the
'declarative_debug' CONFIG option is used.

Done-with: Kai Koehne
Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
11 years agoMoved the QML Observer Service and related functionality into Qt
Thorbjørn Lindeijer [Fri, 25 Mar 2011 12:36:16 +0000 (13:36 +0100)]
Moved the QML Observer Service and related functionality into Qt

This code was previously developed as part of Qt Creator in
share/qtcreator/qml/qmljsdebugger/

Moving it into Qt will allow us to simplify the setup required before
you can debug QML applications.

To avoid adding too much weight to the QtDeclarative module, a
declarativeobserver plugin was introduced that contains the
QDeclarativeViewObserver and related classes. The
QDeclarativeObserverService is just a stub service that loads this
plugin once a QML debugging client connects. The plugin implements the
QDeclarativeObserverInterface

A QJSDebugService was separated out of QJSDebuggerAgent, so
that the service can be active while the agent is instantiated lazily.
Each QDeclarativeEngine adds itself to the QJSDebugService. Currently
only the first one is used when instantiating the agent.

QDeclarativeObserverService is hooked into QDeclarativeView, with the
view registering itself to the service, allowing the
QDeclarativeViewObserver to be created for the view once somebody
connects to the service. Again, only the first view is used at the
moment.

Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
11 years agoHTTP auto tests: do not load resources from cache that must be revalidtd
Peter Hartmann [Wed, 4 May 2011 11:50:40 +0000 (13:50 +0200)]
HTTP auto tests: do not load resources from cache that must be revalidtd

The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.

Reviewed-by: Markus Goetz
Task-number: QTBUG-18983

11 years agoHTTP cache backend: do not load resources that must be revalidated
Peter Hartmann [Wed, 4 May 2011 11:49:51 +0000 (13:49 +0200)]
HTTP cache backend: do not load resources that must be revalidated

The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.

Reviewed-by: Markus Goetz
Task-number: QTBUG-18983

11 years agoHTTP backend: do not load resources from cache that must be revalidated
Peter Hartmann [Wed, 4 May 2011 11:47:06 +0000 (13:47 +0200)]
HTTP backend: do not load resources from cache that must be revalidated

The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.

Reviewed-by: Markus Goetz
Task-number: QTBUG-18983

11 years agoCompile fix for QLocale on Symbian.
Denis Dzyubenko [Wed, 4 May 2011 11:07:54 +0000 (13:07 +0200)]
Compile fix for QLocale on Symbian.

The previous change added new ELangEnglish_India that doesn't
necesserally present in all SDKs.

Reviewed-by: trustme
11 years agoMerge remote-tracking branch 'origin/4.8' into lighthouse-master
Jørgen Lind [Wed, 4 May 2011 10:41:39 +0000 (12:41 +0200)]
Merge remote-tracking branch 'origin/4.8' into lighthouse-master

11 years agoAdded Kazakh language to the QLocale mapping table on Symbian.
Denis Dzyubenko [Tue, 3 May 2011 14:22:43 +0000 (16:22 +0200)]
Added Kazakh language to the QLocale mapping table on Symbian.

Reviewed-by: trustme
11 years agoAdded support for QLocale::uiLanguages on Symbian.
Denis Dzyubenko [Tue, 3 May 2011 14:18:42 +0000 (16:18 +0200)]
Added support for QLocale::uiLanguages on Symbian.

Extended the mapping table that matches symbian device languages to a
locale name and language code.

Task-number: QTBUG-7329
Reviewed-by: trustme
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 4 May 2011 10:00:47 +0000 (20:00 +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:
  QNAM HTTP: Fix bug with explicitly zero-length compressed responses.

11 years agoQNAM HTTP: Fix bug with explicitly zero-length compressed responses.
Andreas Kling [Tue, 22 Mar 2011 13:54:33 +0000 (14:54 +0100)]
QNAM HTTP: Fix bug with explicitly zero-length compressed responses.

In the case of a response with e.g content-encoding "gzip" and
content-length "0", the HTTP backend would incorrectly fall back to
the "unspecified length" code path and wait for readyRead() forever.

Task-number: QTBUG-18232
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 4 May 2011 07:35:41 +0000 (17:35 +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:
  Do not allow fullscreen/maximized windows to expand beyond client rect

11 years agoDo not allow fullscreen/maximized windows to expand beyond client rect
Miikka Heikkinen [Tue, 3 May 2011 13:50:46 +0000 (16:50 +0300)]
Do not allow fullscreen/maximized windows to expand beyond client rect

Automatic layouting of widgets still managed to layout maximized and
fullscreen windows larger than client rect in Symbian in some cases.
Fixed by limiting window dimensions to client area boundaries in
setGeometry_sys if the window is maximized or fullscreen.

Task-number: QTBUG-5697
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 4 May 2011 07:16:31 +0000 (17:16 +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:
  Compile on Windows
  Support gamma correction of text on GL

11 years agoCompile on Windows
Eskil Abrahamsen Blomfeldt [Wed, 4 May 2011 07:10:45 +0000 (09:10 +0200)]
Compile on Windows

The SPI_FONTSMOOTHINGCONTRAST macro is not defined everywhere. When
the code was refactored, the workaround for this was lost. This
resubmits the work-around to make it compile.

Reviewed-by: Samuel
11 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, 4 May 2011 05:41:28 +0000 (15:41 +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:
  Clarified sendCustomRequest documentation to include HTTPS

11 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master...
Qt Continuous Integration System [Wed, 4 May 2011 00:49:30 +0000 (10:49 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
  Remove warnings
  Fix Wayland plugin so it works with the wayland bind api
  wayland: Track wayland changes
  Support GL ES 2 with uikit.
  Lighthouse: Fix virtual desktopwidget
  Added missing function in QWaylandWindow.
  wayland: Drop a debug qWarning()
  wayland: Discard motion and button events receive with a NULL pointer focus
  wayland: Include eglconvenience.pri instead of pulling in individual file
  wayland: Remove unused EGLConfig field
  wayland: Add native access interface for Wayland plugin
  Compile fix for QPA's session manager.
  Fixes compilation of wayland plugin after latest changes in wayland.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 3 May 2011 23:14:45 +0000 (09:14 +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:
  Add enablers for Symbian App Booster

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 3 May 2011 20:46:32 +0000 (06:46 +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:
  Fix drawing text in item view:
  Fix the tst_QPluginLoader::loadCorruptElf on 64 bit

11 years agoFix drawing text in item view:
Olivier Goffart [Tue, 3 May 2011 17:36:26 +0000 (19:36 +0200)]
Fix drawing text in item view:

Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679

Task-number: QTBUG-18998

11 years agoAdd enablers for Symbian App Booster
Simon Frost [Tue, 3 May 2011 17:29:56 +0000 (18:29 +0100)]
Add enablers for Symbian App Booster

To use the Symbian App Booster, a registration file (matching the
filename of the executable, eg helloworld.applite) must be copied to the
import folder within QtAppBooster's private directory. The appropriate
library (qdeclarativebooster) must also be linked against. With this
change, the required actions are carried out by adding
"CONFIG += symbian_appbooster" to the application's .pro file.

Task-number: QT-4892
Reviewed-by: Miikka Heikkinen
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 3 May 2011 17:38:02 +0000 (03:38 +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:
  Don't rely on uninitialized data
  Don't realloc user-provided buffer