qt:digia-qt.git
7 years agoUpdate def files for latest QtDeclarative API v4.7.0-tp1
Shane Kearns [Wed, 10 Mar 2010 12:17:32 +0000 (13:17 +0100)]
Update def files for latest QtDeclarative API

The QDeclarativeBinding API is new since last week's freeze.
Froze the def files again, so that applications that use this API will be
able to link.

Task-number: QTBUG-8909
Reviewed-by: Trust Me
(cherry picked from commit c0eeb2af8f6a023ac1c67f3cf955be3e4b13f998)

7 years agoChange WINSCW include paths to use same rules as ARMCC
Shane Kearns [Thu, 4 Mar 2010 17:27:46 +0000 (18:27 +0100)]
Change WINSCW include paths to use same rules as ARMCC

The default rules applied by symbian cause problems with headers included
from within other headers.
This only affects WINSCW builds, so the headers always need to be specially
fixed up to be compatible, which is wrong.
Instead, use CXXFLAGS to change the include path rules to be the same as

Reviewed-by: Iain
(cherry picked from commit 778b9dcb5ad6aba8b0548719c2674e3e6ad66c58)

7 years agoCreate 4.7 def files for Symbian
Shane Kearns [Thu, 4 Mar 2010 16:11:25 +0000 (17:11 +0100)]
Create 4.7 def files for Symbian

New QtDeclarative module
New APIs in existing modules

Reviewed-by: Trust Me
(cherry picked from commit bd1325b892be6c8a57044268fd7b6a66a01e4bf7)

7 years agoIntroduces a crash on start-up regression for several apps (designer, etc) on MinGW...
Jesper Thomschutz [Tue, 9 Mar 2010 15:31:13 +0000 (16:31 +0100)]
Introduces a crash on start-up regression for several apps (designer, etc) on MinGW. Reverted for the alpha.
Revert "Implement the blend functions with SSE2"

This reverts commit f25099f400e7379f0a6e00500e990948b9785e63.

7 years agoRevert "Replace the inline blend function by #define"
Jesper Thomschutz [Tue, 9 Mar 2010 15:30:14 +0000 (16:30 +0100)]
Revert "Replace the inline blend function by #define"

This reverts commit c1fe9ae25aebc8d1b9c4a7f3e67fa25ecdcbadc8.

7 years agodoc: Fixed building documentation
Thorbjørn Lindeijer [Mon, 1 Mar 2010 12:35:50 +0000 (13:35 +0100)]
doc: Fixed building documentation

qml.qdocconf wasn't renamed yet.
(cherry picked from commit c14e9bb7d8bb86129983df96dc5f8926190f5b06)

7 years agoFixed declarative examples not being installed.
Rohan McGovern [Mon, 8 Mar 2010 02:36:12 +0000 (12:36 +1000)]
Fixed declarative examples not being installed.
(cherry picked from commit 69a3c7fc51fcab07a6a0a18a753546b45cf522c3)

7 years agoAdapted example to use the import mechanism
mae [Tue, 2 Mar 2010 14:00:23 +0000 (15:00 +0100)]
Adapted example to use the import mechanism
(cherry picked from commit 7fd5ade07bd05ff6cb6f4e7cfa7a74081b803809)

7 years agoUse a better method for installing declarative demos.
Rohan McGovern [Mon, 8 Mar 2010 02:52:11 +0000 (12:52 +1000)]
Use a better method for installing declarative demos.

Simply copy the demo directories, instead of writing a stub .pro file.
(cherry picked from commit c97e1e29aedaceead92cd231b3a77d60bab2af50)

7 years agoMake compile following QDeclarativeMetaProperty renaming
Bea Lam [Mon, 8 Mar 2010 02:30:34 +0000 (12:30 +1000)]
Make compile following QDeclarativeMetaProperty renaming
(cherry picked from commit a7856e3a5f6b9e5e2fd10690574b5f44ca50ba73)

7 years agoFixed declarative demos not being installed.
Rohan McGovern [Mon, 8 Mar 2010 01:52:26 +0000 (11:52 +1000)]
Fixed declarative demos not being installed.
(cherry picked from commit 23440d84ddf78755e77cea75956cd7445647230a)

7 years agoRewrite Minehunt demo to use the runtime.
Jesper Thomschutz [Mon, 8 Mar 2010 12:30:58 +0000 (13:30 +0100)]
Rewrite Minehunt demo to use the runtime.
(cherry picked from commit f56893bbffd5eb26dd77e56707615cbb11a26c9b)

Conflicts:

demos/declarative/minehunt/minehunt.cpp

7 years agoUpdated URLs.
Robert Loehning [Thu, 4 Mar 2010 17:40:22 +0000 (18:40 +0100)]
Updated URLs.

Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
(cherry picked from commit 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd)

7 years agoqmake/MinGw: Link statically for Qt Creator to be able to detect it.
Friedemann Kleint [Thu, 4 Mar 2010 10:47:36 +0000 (11:47 +0100)]
qmake/MinGw: Link statically for Qt Creator to be able to detect it.

Qt Creator detects Qt versions by running qmake. This fails if no
MinGw setup is in the path as is usually the case when starting it
from the menu. Make it possible to run qmake without setup. Strip
executable.
Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
Reviewed-by: mariusSO <qt-info@nokia.com>
(cherry picked from commit 52da988db3a03bce5513bc5e2efa3d69f3664f24)

7 years agofix qmake -project mode
Oswald Buddenhagen [Wed, 3 Mar 2010 13:48:27 +0000 (14:48 +0100)]
fix qmake -project mode

the mode is a big hack, and consequently needs hacks to get started
as well ...

Reviewed-by: mariusSO
(cherry picked from commit a1b0dba9971ef88dc1e079d1ea49230a4dd3c514)

7 years agodon't have every generator duplicate the QMAKE_QMAKE logic
Oswald Buddenhagen [Tue, 2 Mar 2010 16:10:46 +0000 (17:10 +0100)]
don't have every generator duplicate the QMAKE_QMAKE logic

Reviewed-by: mariusSO
(cherry picked from commit 375edf788be3f51d6bebc438142642ce53004170)

7 years agomake the fallback value of QMAKE_QMAKE absolute
Oswald Buddenhagen [Tue, 2 Mar 2010 16:18:26 +0000 (17:18 +0100)]
make the fallback value of QMAKE_QMAKE absolute

inspired by the pbx generator.
currently this has no effect, as all generators build their own
fallbacks anyway.

Reviewed-by: mariusSO
(cherry picked from commit f006691acc45a57e011e5827163c0b3759864bf7)

7 years agomake the value of QMAKE_QMAKE somewhat less magic
Oswald Buddenhagen [Tue, 2 Mar 2010 16:15:32 +0000 (17:15 +0100)]
make the value of QMAKE_QMAKE somewhat less magic

the generators change the value of QMAKE_QMAKE, so it is unwise to
"redirect" it to a hidden builtin which is reset each time.

in particular, this fixes qmake generating makefiles without an absolute
path to qmake itself - the initial quoting of the filename will make the
variable "real", so contains() will start working for it.
(cherry picked from commit 31e1fb9103e6d6657c1153f5c30e149087568042)

7 years agoFix visibility of classes in private headers upon which Bauhaus/Creator relies.
Warwick Allison [Wed, 3 Mar 2010 23:54:42 +0000 (09:54 +1000)]
Fix visibility of classes in private headers upon which Bauhaus/Creator relies.

Author: Erik Verbruggen
(cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)

7 years agoDon't return QDeclarativeDeclarativeData for a deleting object
Aaron Kennedy [Tue, 2 Mar 2010 09:35:30 +0000 (19:35 +1000)]
Don't return QDeclarativeDeclarativeData for a deleting object

This was causing crashes in the qmldesigner.
(cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)

7 years agoAdd config.test for multimedia/qml
Jørgen Lind [Wed, 3 Mar 2010 09:34:44 +0000 (10:34 +0100)]
Add config.test for multimedia/qml

using pkg-config from pri file is not good for cross-compiling

Reviewed-by: paul
(cherry picked from commit 9957e85e37345e946ecc67196d65fbca867a2001)

7 years agoQDeclarativeView: Add a Designer plugin.
Friedemann Kleint [Tue, 2 Mar 2010 10:25:16 +0000 (11:25 +0100)]
QDeclarativeView: Add a Designer plugin.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Acked-by: akennedy <qt-info@nokia.com>
(cherry picked from commit 13f23b71cee682ccaaec455d72b1578afc2800ee)

7 years agoQDeclarativeView: Make usable in Designer
Friedemann Kleint [Tue, 2 Mar 2010 10:23:45 +0000 (11:23 +0100)]
QDeclarativeView: Make usable in Designer

Make source a designable property, add missing declarations for
enumerations.
Reviewed-by: akennedy <qt-info@nokia.com>
(cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)

7 years agotypo for windows ce exclusion rule
Maurice Kalinowski [Mon, 1 Mar 2010 16:03:00 +0000 (17:03 +0100)]
typo for windows ce exclusion rule

Reviewed-by: Paul Olav Tvete
(cherry picked from commit a7196feb11d701dd486e66fd06cbc50d84c9b1bb)

7 years agobuild fix for WinCE
Maurice Kalinowski [Mon, 1 Mar 2010 13:01:51 +0000 (14:01 +0100)]
build fix for WinCE

only use xmlpatterns if Qt is configured to build it

Reviewed-by: Paul Olav Tvete
(cherry picked from commit 454d4fa2fbefabb54f7f567aaf01f2c1faa165f4)

7 years agocompile fix for WinCE
Maurice Kalinowski [Mon, 1 Mar 2010 12:53:29 +0000 (13:53 +0100)]
compile fix for WinCE

do not include headers of disabled modules

Reviewed-by: Paul Olav Tvete
(cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)

7 years agocompile fix for WinCE
Maurice Kalinowski [Mon, 1 Mar 2010 09:18:09 +0000 (10:18 +0100)]
compile fix for WinCE

need to add the win32 file to get copy and friends included

Reviewed-by: Simon Hausmann
(cherry picked from commit 57686d28fed85c9f8fbb340cd05f3fb6322332f7)

7 years agoAdded static method isValidColor to QColor.
Erik Verbruggen [Mon, 1 Mar 2010 14:17:42 +0000 (15:17 +0100)]
Added static method isValidColor to QColor.

Reviewed-by: Gunnar Sletta
(cherry picked from commit 72da039e54a62bf3a481fefc753e0e50ba75df57)

7 years agoDoc: brief Qt Quick introduction on "What's New" page.
Volker Hilsheimer [Mon, 1 Mar 2010 15:30:33 +0000 (16:30 +0100)]
Doc: brief Qt Quick introduction on "What's New" page.
(cherry picked from commit 45d91603e65f78cb749bcc2c8949ef24048761df)

7 years agoFix minehunt demo
Alan Alpert [Mon, 1 Mar 2010 12:02:13 +0000 (13:02 +0100)]
Fix minehunt demo

Game works again, and the issue with X11 native rendering being
abysmally slow has been 'fixed'.
(cherry picked from commit bcb2ed5667bd957476e3b62ef3a479a26f1252f3)

7 years agoMake Minehunt demo compile.
Alan Alpert [Mon, 1 Mar 2010 11:23:15 +0000 (12:23 +0100)]
Make Minehunt demo compile.

It still isn't working though. Investigations continue.

Task-number: QTBUG-8549
(cherry picked from commit 3a4dc08d08ce0388dd183a24923871e3e03ba531)

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sun, 28 Feb 2010 10:03:04 +0000 (11:03 +0100)]
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 use SSE2 if the emmintrin.h header wasn't found.

7 years agoDon't use SSE2 if the emmintrin.h header wasn't found.
Thiago Macieira [Sun, 28 Feb 2010 09:42:00 +0000 (10:42 +0100)]
Don't use SSE2 if the emmintrin.h header wasn't found.

If you build on Solaris, the header isn't available, but SSE2
instructions are available on x86-64. So either we use inline
assembly, or we disable the new code.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Sun, 28 Feb 2010 01:15:24 +0000 (02:15 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoMerge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 27 Feb 2010 22:48:55 +0000 (23:48 +0100)]
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Sat, 27 Feb 2010 20:30:18 +0000 (21:30 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 27 Feb 2010 18:08:24 +0000 (19:08 +0100)]
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:
  Autotest: no need to call exitLoop twice, from two threads.
  Fix compilation with Sun CC: __FUNCTION__ is not valid
  Fix compilation with Sun CC: const in POD parameters makes a difference
  Fix compilation on solaris-g++-x86-64: emmintrin.h is not available.
  Unbreak compilation of bootstrapped Qt tools after f3eab3d.
  QUrl: document adding of hash function
  Bump iteration count to make QMetaType::type() benchmark results more stable
  Don't lock the QMetaType custom types mutex unnecessarily
  Fix deadlock in QFSEventsFileSystemWatcherEngine.
  Improve lookup speed of QMetaType::type() for normalized types
  Add benchmarks for QMetaType type introspection functions
  Modified configure script not to override $XPLATFORM in case of CYGWIN
  Doc: summarize new QtMultimedia functionality in What's New page.
  doc: Added \since 4.7 to several \qmlclass elements.
  check that wifi is powered on before trying to scan.

7 years agoAutotest: no need to call exitLoop twice, from two threads.
Thiago Macieira [Sat, 27 Feb 2010 16:07:14 +0000 (17:07 +0100)]
Autotest: no need to call exitLoop twice, from two threads.

This caused the test to be unreliable -- the event loop in the main
thread would exit before the thread finished running. Now we're sure
that it's only exiting becuase the thread finished running.

7 years agoMerge remote branch 'origin/master' into 4.7
Thiago Macieira [Sat, 27 Feb 2010 14:22:55 +0000 (15:22 +0100)]
Merge remote branch 'origin/master' into 4.7

Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp

7 years agoFix compilation with Sun CC: __FUNCTION__ is not valid
Thiago Macieira [Sat, 27 Feb 2010 13:54:17 +0000 (14:54 +0100)]
Fix compilation with Sun CC: __FUNCTION__ is not valid

Use the alternative from qglobal.h, that exists for this reason.

Reviewed-by: Trust Me
7 years agoFix compilation with Sun CC: const in POD parameters makes a difference
Thiago Macieira [Sat, 27 Feb 2010 13:52:11 +0000 (14:52 +0100)]
Fix compilation with Sun CC: const in POD parameters makes a difference

The compiler should have caught this error, but instead it accepted
the QDisableNetworkReply constructor without the const. And that led
to a linker error.

Reviewed-by: Trust Me
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Sat, 27 Feb 2010 13:06:40 +0000 (14:06 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoMerge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 27 Feb 2010 10:34:04 +0000 (11:34 +0100)]
Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:

7 years agoMerge remote branch 'origin/master' into qt-master-from-4.6
Thiago Macieira [Sat, 27 Feb 2010 10:21:23 +0000 (11:21 +0100)]
Merge remote branch 'origin/master' into qt-master-from-4.6

Conflicts:
mkspecs/common/symbian/symbian.conf

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 27 Feb 2010 08:11:41 +0000 (09:11 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QMainWindow would show hidden QDockwidget when calling rstoreDockWidget
  Compile on WinCE

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Sat, 27 Feb 2010 05:50:32 +0000 (06:50 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Sat, 27 Feb 2010 03:26:19 +0000 (04:26 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
  fix "configure -fast" on Windows for other maketools than nmake
  Get qmake to add pdb files to install target in debug configuration.
  add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
  give symbian an own platform mode
  deprecate -win32/-unix/-macx which set both host and target mode
  decouple host platform mode from target platform mode
  factor out applyHostMode()
  make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
  use QDir::separator() instead of Option::dir_sep where appropriate
  simplify string ops
  sanitize evaluation of OS scopes
  instead of hard-coding recursion for symbian, add it to the specs
  add possibility to request project recursion from within a pro file
  fix ts-assistant target
  use QList::reserve() as appropriate
  optimize appending of (empty) lists to (empty) lists
  suppress pointer aliasing warnings
  Fix compilation with namespace.
  Assistant: Make ~AbstractHelpViewer() virtual.
  Prepare German translations for 4.7 (except Quick).
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Sat, 27 Feb 2010 00:54:17 +0000 (01:54 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QMainWindow would show hidden QDockwidget when calling rstoreDockWidget
  Compile on WinCE

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Fri, 26 Feb 2010 19:59:33 +0000 (20:59 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integ...
Qt Continuous Integration System [Fri, 26 Feb 2010 17:42:20 +0000 (18:42 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
  fix "configure -fast" on Windows for other maketools than nmake
  Get qmake to add pdb files to install target in debug configuration.
  add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
  give symbian an own platform mode
  deprecate -win32/-unix/-macx which set both host and target mode
  decouple host platform mode from target platform mode
  factor out applyHostMode()
  make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
  use QDir::separator() instead of Option::dir_sep where appropriate
  simplify string ops
  sanitize evaluation of OS scopes
  instead of hard-coding recursion for symbian, add it to the specs
  add possibility to request project recursion from within a pro file
  fix ts-assistant target
  use QList::reserve() as appropriate
  optimize appending of (empty) lists to (empty) lists
  suppress pointer aliasing warnings
  Fix compilation with namespace.
  Assistant: Make ~AbstractHelpViewer() virtual.
  Prepare German translations for 4.7 (except Quick).
  ...

7 years agoFix compilation on solaris-g++-x86-64: emmintrin.h is not available.
Thiago Macieira [Fri, 26 Feb 2010 17:17:02 +0000 (18:17 +0100)]
Fix compilation on solaris-g++-x86-64: emmintrin.h is not available.

We have a test to verify if this file is available, but the test
requires qmake to be built first. So don't enable the SSE2 intrinsics
for the Latin-1 transformations in the bootstrapped tools.

Reviewed-by: Trust Me
7 years agoUnbreak compilation of bootstrapped Qt tools after f3eab3d.
Thiago Macieira [Fri, 26 Feb 2010 17:15:05 +0000 (18:15 +0100)]
Unbreak compilation of bootstrapped Qt tools after f3eab3d.

Bad brace positioning related to #ifdef QT_NO_QOBJECT

Reviewed-by: Trust Me
7 years agoMerge remote branch 'origin/4.6' into qt-master-from-4.6
Thiago Macieira [Fri, 26 Feb 2010 16:49:58 +0000 (17:49 +0100)]
Merge remote branch 'origin/4.6' into qt-master-from-4.6

Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h

7 years agoMerge branch 'master' of git:qt/qt-multimedia-staging into qml
Thiago Macieira [Fri, 26 Feb 2010 16:04:47 +0000 (17:04 +0100)]
Merge branch 'master' of git:qt/qt-multimedia-staging into qml

Conflicts:
configure.exe

7 years agoMerge remote branch 'origin/master' into berlin-master
Joerg Bornemann [Fri, 26 Feb 2010 15:19:54 +0000 (16:19 +0100)]
Merge remote branch 'origin/master' into berlin-master

Conflicts:
configure.exe

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Fri, 26 Feb 2010 15:04:38 +0000 (16:04 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits)
  Added addMMPRules for adding conditional MMP_RULES
  Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
  Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
  Fix for cetest.
  Speed up compilation of this test with MSVC.
  New benchmark for QDirIterator
  Backporting auto-test utility header from master.
  Fix a signed/unsigned comparison compiler warning
  Removed an export that shouldn't be exported.
  Reduced the code and memory footprint of the keymap.
  Enabled Qt key events to work also when native key code is missing.
  Cleaning of the patch to QTBUG-3168
  Patch to QTBUG-3168
  Crash in QGraphicsScenePrivate::setFocusItemHelper
  Pass the right arguments to QApplication in GraphicsView benchmark.
  Improvements to itemview keypad navigation in S60.
  Revert changes made in scroll_sys().
  Fix SymbianMakefileGenerator::absolutizePath for clean builds
  Set the roleNames of proxy models to the roleNames of the source model.
  Add benchmarks for accessing meta-object properties via QScriptValue
  ...

7 years agoQUrl: document adding of hash function
Peter Hartmann [Wed, 24 Feb 2010 15:48:51 +0000 (16:48 +0100)]
QUrl: document adding of hash function

Reviewed-by: TrustMe
7 years agoBump iteration count to make QMetaType::type() benchmark results more stable
Kent Hansen [Fri, 26 Feb 2010 14:49:51 +0000 (15:49 +0100)]
Bump iteration count to make QMetaType::type() benchmark results more stable

With the recent optimizations it's just too fast now. ;)

7 years agoDon't lock the QMetaType custom types mutex unnecessarily
Kent Hansen [Fri, 26 Feb 2010 14:21:35 +0000 (15:21 +0100)]
Don't lock the QMetaType custom types mutex unnecessarily

Check the built-in types first, and only lock the mutex if
the type is not found there.

This makes the QMetaType::typeBuiltin benchmark ~5x faster.

Reviewed-by: Harald Fernengel
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 26 Feb 2010 14:15:38 +0000 (15:15 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added addMMPRules for adding conditional MMP_RULES
  Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES

7 years agofix "configure -fast" on Windows for other maketools than nmake
Joerg Bornemann [Fri, 26 Feb 2010 13:45:55 +0000 (14:45 +0100)]
fix "configure -fast" on Windows for other maketools than nmake

Task-number: QTBUG-8562
Reviewed-by: ossi
7 years agoGet qmake to add pdb files to install target in debug configuration.
Sean Harmer [Fri, 26 Feb 2010 13:39:53 +0000 (14:39 +0100)]
Get qmake to add pdb files to install target in debug configuration.

Merge-request: 2105
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoadd TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
Oswald Buddenhagen [Wed, 16 Dec 2009 15:19:23 +0000 (16:19 +0100)]
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX

the unix makefile generator can make files for "regular" unixes and
macos (the difference being the framework handling). so far, the output
choice was hard-wired to the host platform. the previous commit made
that soft-configurable, and this one exploits this capability to enable
limited cross-building.

Reviewed-by: mariusSO
7 years agoFix deadlock in QFSEventsFileSystemWatcherEngine.
Morten Johan Sørvig [Fri, 26 Feb 2010 07:20:58 +0000 (08:20 +0100)]
Fix deadlock in QFSEventsFileSystemWatcherEngine.

Task: QTBUG-8522

6130b2137 makes stop() synchronize and wait for
the worker thread to reach the end of run().

stop() was however called from the worker thread
itself in updateFiles(), leading to a deadlock.

Add the stopFSStream and CFRunLoopStop calls
directly to updateFiles(), don't wait on waitForStop.

7 years agogive symbian an own platform mode
Oswald Buddenhagen [Mon, 22 Feb 2010 18:06:07 +0000 (19:06 +0100)]
give symbian an own platform mode

... instead of using the gross isForSymbian() magic

Reviewed-by: mariusSO
7 years agodeprecate -win32/-unix/-macx which set both host and target mode
Oswald Buddenhagen [Mon, 22 Feb 2010 18:04:17 +0000 (19:04 +0100)]
deprecate -win32/-unix/-macx which set both host and target mode

Reviewed-by: mariusSO
7 years agodecouple host platform mode from target platform mode
Oswald Buddenhagen [Mon, 22 Feb 2010 17:59:00 +0000 (18:59 +0100)]
decouple host platform mode from target platform mode

derive the host mode from the generator - this doesn't work *too* well
if the mode is different from the real host platform, so it's only for
testing.

get the target platform mode from the qmakespec, falling back to the
host platform mode.

Reviewed-by: mariusSO
7 years agofactor out applyHostMode()
Oswald Buddenhagen [Mon, 15 Feb 2010 20:18:11 +0000 (21:18 +0100)]
factor out applyHostMode()

more preparation work for delayed mode determination ...

Reviewed-by: mariusSO
7 years agomake QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
Oswald Buddenhagen [Mon, 15 Feb 2010 18:32:08 +0000 (19:32 +0100)]
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins

this will allow setting their actual value depending on a delayed
determination of the platform.

Reviewed-by: mariusSO
7 years agouse QDir::separator() instead of Option::dir_sep where appropriate
Oswald Buddenhagen [Mon, 15 Feb 2010 18:26:07 +0000 (19:26 +0100)]
use QDir::separator() instead of Option::dir_sep where appropriate

in these cases, the separator depends on the *real* host platform, not
on the one that will host the build.

there are many more cases like that, but that's for (much) later ...

Reviewed-by: mariusSO
7 years agosimplify string ops
Oswald Buddenhagen [Mon, 14 Dec 2009 11:01:07 +0000 (12:01 +0100)]
simplify string ops

Reviewed-by: mariusSO
7 years agosanitize evaluation of OS scopes
Oswald Buddenhagen [Thu, 10 Dec 2009 17:53:25 +0000 (18:53 +0100)]
sanitize evaluation of OS scopes

this is marginally behavior-incompatible in that adding the name of an
OS scope to CONFIG will not make it true any longer.
the cleaned up semantics (besides having merit by themselves) will
enable optimizations.

Reviewed-by: mariusSO
7 years agoinstead of hard-coding recursion for symbian, add it to the specs
Oswald Buddenhagen [Wed, 9 Dec 2009 18:05:26 +0000 (19:05 +0100)]
instead of hard-coding recursion for symbian, add it to the specs

Reviewed-by: mariusSO
7 years agoadd possibility to request project recursion from within a pro file
Oswald Buddenhagen [Mon, 22 Feb 2010 15:41:35 +0000 (16:41 +0100)]
add possibility to request project recursion from within a pro file

this is the same as specifying -r on the command line, but it can be set
in pro and spec files for cases where no recursion would plain not work.

the implementation is via a new option() instruction which at some point
will be used to set other "modes of operation" as well. for now, only
the "recursive" option is recognized.

Reviewed-by: mariusSO
7 years agoMerge branch '4.6'
Miikka Heikkinen [Fri, 26 Feb 2010 13:24:11 +0000 (15:24 +0200)]
Merge branch '4.6'

Conflicts:
mkspecs/common/symbian/symbian.conf

7 years agoImprove lookup speed of QMetaType::type() for normalized types
Kent Hansen [Fri, 26 Feb 2010 13:13:41 +0000 (14:13 +0100)]
Improve lookup speed of QMetaType::type() for normalized types

Two improvements are made:
1) Store the length of the built-in types to avoid calling
strcmp() when there's no way the types will match; and
2) Speculate on the input already being normalized.

When the type name is already in normalized form (which we
believe to be the common case), normalizing is wasteful
(allocating a bytearray that's going to contain exactly the
same string as the original input).

Use the same pattern as used in QObject::connect(), which
speculates on the signature already being normalized; only
if the lookup fails, the signature is normalized and looked
up again.

For the QMetaType::builtinTypes benchmark, this improves
performance by roughly 4x.

For the QMetaType::builtinTypesNotNormalized benchmark, the
performance is half of that before, because the lookup is
done twice. But we choose to optimize for the already-normalized
case. This makes a big difference in the QtScript QObject
bindings, for example.

Reviewed-by: Harald Fernengel
7 years agoAdd benchmarks for QMetaType type introspection functions
Kent Hansen [Fri, 26 Feb 2010 13:07:54 +0000 (14:07 +0100)]
Add benchmarks for QMetaType type introspection functions

Reviewed-by: Harald Fernengel
7 years agoQMainWindow would show hidden QDockwidget when calling rstoreDockWidget
Thierry Bastian [Fri, 26 Feb 2010 12:43:04 +0000 (13:43 +0100)]
QMainWindow would show hidden QDockwidget when calling rstoreDockWidget

Task-number: QTBUG-7785
Reviewed-by: ogoffart
7 years agoModified configure script not to override $XPLATFORM in case of CYGWIN
Zeno Albisser [Fri, 26 Feb 2010 12:26:18 +0000 (13:26 +0100)]
Modified configure script not to override $XPLATFORM in case of CYGWIN

Reviewed-by: Thiago Macieira
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
Qt Continuous Integration System [Fri, 26 Feb 2010 12:18:02 +0000 (13:18 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (139 commits)
  Fixed qdeclarativeconnection test.
  missed rename
  Revert "Some animation cleanup/refactoring."
  Rename files to follow class name.
  Change Connection syntax as per QT-2822.
  Doc
  update painted geometry on pixmapChanged rather than sourceChanged
  Make Flickable overshoot behavior nicer.
  Polish QDeclarativeProperty API
  Test, demo, and work-around bug QTBUG-8535
  Fix ParentAnimation crash.
  Tiny doc tweak.
  Work around requires() bug in qmake
  Make sure that QEasingCurve::type when streamed is a quint8, as documented
  Add QEasingCurve to datastream format docs
  Move QEasingCurve datastream autotest to qdatastream for more comprehensive tests
  Some animation cleanup/refactoring.
  Fix Flickable.overShoot doc - it is a bool not a real
  Rebuild since -declarative auto detection changed.
  Renamed Flickable viewportXXX properties contentXXX
  ...

7 years agoFixed qdeclarativeconnection test.
Rohan McGovern [Fri, 26 Feb 2010 12:07:17 +0000 (22:07 +1000)]
Fixed qdeclarativeconnection test.

.pro file name must match directory name.

7 years agoAdded addMMPRules for adding conditional MMP_RULES
Miikka Heikkinen [Fri, 26 Feb 2010 10:49:45 +0000 (12:49 +0200)]
Added addMMPRules for adding conditional MMP_RULES

Usage:

    # Set conditional libraries
    LIB.MARM = "LIBRARY myarm.lib"
    LIB.WINSCW = "LIBRARY mywinscw.lib"
    LIB.default = "LIBRARY mydefault.lib"

    # Set conditional Epoc Heap Size
    EHZ.WINSCW = "EPOCHEAPSIZE 0x2000 0x2000000"
    EHZ.default = "EPOCHEAPSIZE 0x40000 0x400000"

    # Add the conditional MMP rules
    MYCONDITIONS = MARM WINSCW
    MYVARIABLES = LIB EHZ

    addMMPRules(MYCONDITIONS, MYVARIABLES)

This will generate the following in the mmp file:

    #if defined(MARM)

    LIBRARY myarm.lib

    EPOCHEAPSIZE 0x40000 0x400000

    #elif defined(WINSCW)

    LIBRARY mywinscw.lib

    EPOCHEAPSIZE 0x2000 0x2000000

    #else

    LIBRARY mydefault.lib

    EPOCHEAPSIZE 0x40000 0x400000

    #endif

Task-number: QT-2909
Reviewed-by: axis
7 years agoAllow overriding TARGET.EPOCHEAPSIZE with MMP_RULES
Miikka Heikkinen [Fri, 26 Feb 2010 09:34:23 +0000 (11:34 +0200)]
Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES

It is necessary to specify this variable conditionally sometimes,
which requires use of MMP_RULES, so allowed overriding it without
warning.

Task-number: QT-2909
Reviewed-by: Janne Koskinen
7 years agoDoc: summarize new QtMultimedia functionality in What's New page.
Volker Hilsheimer [Fri, 26 Feb 2010 12:03:57 +0000 (13:03 +0100)]
Doc: summarize new QtMultimedia functionality in What's New page.

7 years agoMerge remote branch 'qt/master' into qml-master
Qt Continuous Integration System [Fri, 26 Feb 2010 09:40:11 +0000 (10:40 +0100)]
Merge remote branch 'qt/master' into qml-master

Conflicts:
tools/qdoc3/cppcodeparser.cpp
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 26 Feb 2010 09:19:00 +0000 (10:19 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
  Removed an export that shouldn't be exported.
  Reduced the code and memory footprint of the keymap.
  Enabled Qt key events to work also when native key code is missing.
  Crash in QGraphicsScenePrivate::setFocusItemHelper
  Improvements to itemview keypad navigation in S60.
  Fix SymbianMakefileGenerator::absolutizePath for clean builds
  Misc fixes to FLM files

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
axis [Fri, 26 Feb 2010 09:05:39 +0000 (10:05 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60

Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h

7 years agoMerge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
Martin Smith [Fri, 26 Feb 2010 08:44:33 +0000 (09:44 +0100)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1

7 years agodoc: Added \since 4.7 to several \qmlclass elements.
Martin Smith [Fri, 26 Feb 2010 08:43:43 +0000 (09:43 +0100)]
doc: Added \since 4.7 to several \qmlclass elements.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master...
Qt Continuous Integration System [Fri, 26 Feb 2010 08:31:37 +0000 (09:31 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Rebuild configure.exe
  Make the Direct Show media service compile with a Qt namespace.
  Make the Direct Show media service compile with mingw.
  QT7; Fix warnings.
  Qt namespace fixes.
  Fixed QTMoview object leak.
  QMediaContent: Add a convenience method to retrieve the QNetworkRequest.
  Use the monitor color space for video output.
  Test for the existance of the Windows Media SDK in configure.
  Try to start media playback on all load state changes.
  Remove all uses of __uuidof from the Direct Show media service.
  QT7; Add support for setting cookies when loading a movie.

7 years agoBuild break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.
Janne Anttila [Fri, 26 Feb 2010 08:14:53 +0000 (10:14 +0200)]
Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.

RVCT does not like static inline, and variables should not be defined
in case statement without braces. In this case the temp variable was
actually unnecessary.

Reviewed-By: TrustMe
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Warwick Allison [Fri, 26 Feb 2010 07:44:46 +0000 (17:44 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

7 years agomissed rename
Warwick Allison [Fri, 26 Feb 2010 07:44:18 +0000 (17:44 +1000)]
missed rename

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Martin Jones [Fri, 26 Feb 2010 07:35:14 +0000 (17:35 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

7 years agoRevert "Some animation cleanup/refactoring."
Leonardo Sobral Cunha [Fri, 26 Feb 2010 07:02:43 +0000 (17:02 +1000)]
Revert "Some animation cleanup/refactoring."

This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Warwick Allison [Fri, 26 Feb 2010 07:09:23 +0000 (17:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

7 years agoRename files to follow class name.
Warwick Allison [Fri, 26 Feb 2010 07:08:30 +0000 (17:08 +1000)]
Rename files to follow class name.

Task-number: QT-2822

7 years agoChange Connection syntax as per QT-2822.
Warwick Allison [Fri, 26 Feb 2010 07:04:38 +0000 (17:04 +1000)]
Change Connection syntax as per QT-2822.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 26 Feb 2010 06:49:12 +0000 (07:49 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix for cetest.

7 years agoDoc
Aaron Kennedy [Fri, 26 Feb 2010 06:47:50 +0000 (16:47 +1000)]
Doc