Commit Graph

1946 Commits

Author SHA1 Message Date
Konstantin Ritt
c6bdbf34eb QGlyphRun: make operator != inlined
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit 145de5acb68f320125b7566a7d726a5a7786a5f8)

Change-Id: I9d868d2258b222890c29eb26e8cd79d9fa3c7f71
Reviewed-on: http://codereview.qt.nokia.com/4139
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-09-02 13:38:56 +02:00
Konstantin Ritt
154f6a2e73 QGlyphRun: don't detach if the decoration wasn't actually changed
Merge-request: 2652
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit f550d219378e5669601de416254b3585fe3f5708)

Change-Id: Ib74ae82fbeaf2b0f5eabad9568cfa9fcea09053b
Reviewed-on: http://codereview.qt.nokia.com/4138
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
2011-09-02 13:38:38 +02:00
Samuel Rødal
61fa9ec8a1 Fix the \since 4.x tags in gui/opengl.
All this API is "new" since 5.0.

Change-Id: I7ba1718a4a24eac00ccc4db1646200e9544ee5a4
Reviewed-on: http://codereview.qt.nokia.com/4131
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-09-02 12:47:58 +02:00
Shane Kearns
e8192883b2 Fix comparison of absolute, unclean paths in QDir
QDir::operator== was creating a clean absolute path for comparison
purposes if the original path was relative.
However original absolute paths were trusted, even though they could
be unclean. Now they are checked for cleanliness first.

Task-Number: QTBUG-19995
Task-Number: QTBUG-20495
Change-Id: I047a1a40ae5151e4604085e4ac87f30a4e4979c4
Reviewed-on: http://codereview.qt.nokia.com/4099
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
2011-09-02 10:01:20 +02:00
Corentin Chary
254d7189d8 qssl: add auto test to QSsl::Opaque QSslKeys
Also export two symbols for auto tests since opaque keys
need EVP_PKEY * created by openssl.

Change-Id: Ib7801ddfceb259de7291bfaa5940df87f68af97d
Merge-request: 48
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4011
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-02 09:44:32 +02:00
Jason McDonald
f1af291d49 Remove circular dependency in testlib logging
Remove one of the circular dependencies between QPlainTestLogger and
QTestLog by directly checking whether we're writing to stdout rather
than inferring the same by examining whether the output file name is
null.

Change-Id: I798288482c9e2e071e17a8622e8a8f8d5016dc7e
Reviewed-on: http://codereview.qt.nokia.com/4052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-02 06:16:11 +02:00
Rohan McGovern
592d53a17c test: removed bogus CONFIG+=debug in qdiriterator benchmark
This doesn't make sense, none of the other benchmarks do it, and it
breaks compilation for a release-only mac build.

Change-Id: I3bc73f670688d413afcae7fa88bab19f7b3dac33
Reviewed-on: http://codereview.qt.nokia.com/4017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 23:55:44 +02:00
Rohan McGovern
fad997b4ee test: removed bogus CONFIG+=debug for badxml selftest
This appears to serve no purpose.
It was probably copy-pasted from assert.pro.

Change-Id: Ie3d9605b969ee11f2d64c1ac3e480e9efb862a3c
Reviewed-on: http://codereview.qt.nokia.com/4016
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 23:55:41 +02:00
Rohan McGovern
949be8cbdd test: fixed `assert' selftest for release-only mac builds
This test intentionally crashes itself by using Q_ASSERT.

Since Q_ASSERT is a no-op in release builds, the .pro file was
attempting to always force debug mode for this project.

However, on platforms where debug vs release affect linkage (e.g. mac
and windows), this is invalid.  On these platforms, debug mode can't be
enabled unless debug versions of the Qt libraries are available, which
they are not if Qt is configured with `-no-debug-and-release -release'.

Use a different method to ensure that Q_ASSERT really asserts, for both
debug and release builds.

Change-Id: I13eea2c72c77a0a981850dbcaa77f65f147c8490
Reviewed-on: http://codereview.qt.nokia.com/4015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 23:55:39 +02:00
Kent Hansen
2438a5ad48 Try to ensure that QT_ARCH is always set when configuring v8
This is a workaround for QTBUG-21224.

For v8 we want to use QT_ARCH as the primary variable for
detecting the target platform. Unfortunately, QT_ARCH isn't
set when v8.pro is parsed using fromfile() from within
another .pro file (namely src/src.pro).

qt_config seems to be the bare minimum that's needed to get
qconfig.pri (which sets QT_ARCH and friends) loaded.

Change-Id: Ideb713724b98dd100560eaf6d7be39df9a22a71e
Reviewed-on: http://codereview.qt.nokia.com/4094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-09-01 19:16:01 +02:00
Ritt Konstantin
7a0a9bd5c4 omit unassigned (and too recent) codepoints from the text Normalization process
http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability:
> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.

since QChar::Unicode_Unassigned value is 0, it's less than any other
QChar::UnicodeVersion value and must ba handled explicitly

Change-Id: I6df025b4173d407660adae77ec5eeb98d15cb8ce
Reviewed-on: http://codereview.qt.nokia.com/4084
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-09-01 16:14:18 +02:00
aavit
74cadacdd5 Add option to compare to different platform in lancelot autotest
(cherry picked from commit b6b160d9ba1e0a5f1fbd67112f8c78ba48e7cad7)

Conflicts:

	tests/baselineserver/src/baselineserver.cpp

Change-Id: Ie8bdff26b8394bb6a5b6b48225b20833dbee0637
Reviewed-on: http://codereview.qt.nokia.com/4082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
2011-09-01 16:14:18 +02:00
Kent Hansen
9bb0cc30ee Check for V8 when auto-enabling Declarative module
Declarative no longer used QtScript, it uses V8.
This check in the configure script was stale.

Change-Id: I3c598c0343fc421fdd191a256e07eaa6f4e80058
Reviewed-on: http://codereview.qt.nokia.com/4077
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-01 16:14:18 +02:00
Kent Hansen
c34b51eb52 Don't build v8 when -no-v8 is passed to configure
When v8 is enabled, QT_CONFIG contains "v8".
There is no "no-v8", meaning that v8 was built
regardless.

Change-Id: I66740b23e5f7cae80740576ea0f13c3ad2f9ad40
Reviewed-on: http://codereview.qt.nokia.com/4073
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-09-01 16:14:18 +02:00
Bradley T. Hughes
2c8a4fae84 Rename the private helper function QList::free() to QList::dealloc()
As the comment suggests, renaming this function avoids confusion with
libc's free().

Change-Id: Ia077b92c947d81ef9d78de940a1cd8ed022edb3c
Reviewed-on: http://codereview.qt.nokia.com/4063
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-09-01 13:52:33 +02:00
Bradley T. Hughes
80559d6cd3 Remove declarations for QListData functions removed by 36c29ab
This commit removed the function implementations, but not the
declarations.

This removes QListData::append2(T) but moves the optimized
QListData::append2(T) implementation to QListData::append(T)

Change-Id: I39b6dea31420a7cefe079b94a91a96eb16000d2a
Reviewed-on: http://codereview.qt.nokia.com/4062
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-09-01 13:52:33 +02:00
Lars Knoll
c2aea75c22 Refactor QMouseEvent to contain the position inside the window
Rename the default accessors for positions to localPos, windowPos
and screenPos, to be explicit about their use.
Introduce a QT_NO_INTEGER_EVENT_COORDINATES define so one can make sure
to always use the float based coordinates.
Fixup all Qt code to use the correct constructor that specifies all
three coordinates.

Change-Id: If4bb93b8d1e2eb2440260d99680c468706cfe68f
Reviewed-on: http://codereview.qt.nokia.com/4058
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-09-01 13:27:37 +02:00
Holger Ihrig
cf5e669a06 Moving relevant tests to corelib/xml
Task-number: QTBUG-21066

Change-Id: I2fb68c35c7abc830ba426b0aab892332b0ca00fb
Reviewed-on: http://codereview.qt.nokia.com/3734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 13:08:32 +02:00
Holger Ihrig
5c27f0a2fb Moving relevant tests to corelib/tools
Task-number: QTBUG-21066

Change-Id: I650f8f7826b9feea7c1484f06e03e10c68ec2b65
Reviewed-on: http://codereview.qt.nokia.com/3712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-09-01 13:07:23 +02:00
Morten Sorvig
ceed409b40 Mac: make platformsupport a static lib
The "force framework/no-framework" logic does not
really work, since Qt is now a mix of frameworks
and statics libs. Remove this code path and use
the "detection" path instead.

Also remove the exports from platformsupport.

Change-Id: I0a308666480445eb47c4f443ff7529addecad10d
Reviewed-on: http://codereview.qt.nokia.com/3464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-09-01 13:04:11 +02:00
Holger Ihrig
82e715b277 Moving relevant tests to corelib/thread
Task-number: QTBUG-21066

Change-Id: Ia16fa8961f1a73f4da6709197b5dd9929c16583f
Reviewed-on: http://codereview.qt.nokia.com/3663
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 12:54:58 +02:00
Holger Ihrig
c9a5ccb268 Moving relevant tests to corelib/statemachine
Task-number: QTBUG-21066

Change-Id: I6dfff1c3b3ad2119a588dc52eb5a2e67255284c1
Reviewed-on: http://codereview.qt.nokia.com/3658
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-09-01 12:54:42 +02:00
Holger Ihrig
2efc6f787c Moving relevant tests to corelib/plugin
Task-number: QTBUG-21066

Change-Id: I918f6ef6fb825d7cf94d6b42322b2c2eb5c52aaa
Reviewed-on: http://codereview.qt.nokia.com/3604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-01 12:42:51 +02:00
Holger Ihrig
3a7e6157d1 Moving relevant tests to corelib/kernel
Added Test for qmetaproperty

Marked QSocketNotifier Autotest as insignificant. See QTBUG-21204

Marked qtranslator Autotest as insignificant. See QTBUG-21125

Marked corelib/io/qfile/largefile as insignificant. See QTBUG-21175

Task-number: QTBUG-21066
Change-Id: I2a7f6587845c355091bb07c8dd3d1557d16db0be
Reviewed-on: http://codereview.qt.nokia.com/3598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-09-01 12:42:14 +02:00
Gabriel de Dietrich
35bd983e0d Update license headers
This ammends commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f

Reviewed-by: Frederik Gladhorn
Merge-request: 1254
(cherry picked from commit eee351a2af7e34dfc851a95820075842f856a8f2)

Change-Id: Idd83457f87fea063843f8eaa47287531de7eb854
Reviewed-on: http://codereview.qt.nokia.com/4057
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-09-01 11:05:14 +02:00
Jo Asplin
a90f50942e Moved gui autotests into new directory structure
Task-number: QTBUG-21133

Change-Id: I83b8f652935cf92151265ca2530a3cf81c31fdef
Reviewed-on: http://codereview.qt.nokia.com/3996
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
2011-09-01 10:59:49 +02:00
Samuel Rødal
a863eb1c7b Compile fix.
uilib includes QtGui and QtWidgets headers, so should explicitly add gui
and widgets in the .pri file.

Change-Id: I5f1e80d1379cb5389287df73d6070fd8ff712a3b
Reviewed-on: http://codereview.qt.nokia.com/4055
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-09-01 10:55:44 +02:00
Jo Asplin
daf24b1b64 Moved dbus autotests into new directory structure
Task-number: QTBUG-21108

Change-Id: I8cdd4af59db3716921e7392379584f349ed29136
Reviewed-on: http://codereview.qt.nokia.com/3602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 09:37:08 +02:00
Jason McDonald
9c51bd4fc8 Fix various trivial formatting issues.
Change-Id: Ifa2a2dd2aa26dab178ec1334376db42fc3ebb355
Reviewed-on: http://codereview.qt.nokia.com/4029
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 08:39:37 +02:00
Jason McDonald
d90da5d991 Remove QXmlTestLogger constructor default param
This class is never constructed with the parameter defaulted.

Change-Id: If9c3f6562da1e48635a9cf5332bee7e9641255fa
Reviewed-on: http://codereview.qt.nokia.com/4021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 08:39:27 +02:00
Laszlo Agocs
fad773ba9f Make xcb plugin compile again.
The name of function handleExposeEvent has not changed.

Change-Id: Ida4621bbf988088c0a75f1c93a3332702f0d92b7
Reviewed-on: http://codereview.qt.nokia.com/4037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-09-01 08:27:42 +02:00
Samuel Rødal
a3b0264754 Clean up shared resources immediately as the last context is destroyed.
By not waiting until deleteLater() kicks in it's easier to auto-test. We
can now add a test case for what happens when a shared resource is still
valid while the last context is destroyed.

Change-Id: I72963928e6a921e49ed59a79e2579b497ba37ccf
Reviewed-on: http://codereview.qt.nokia.com/3732
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-09-01 07:44:01 +02:00
Aaron McCarthy
25a0cf881e Fix inclusion of .qmake.cache for modules with config tests.
Qt modules with config tests generate a module level .qmake.cache with
the results of the config tests.  The existance of this file prevents
qmake from walking up the directory tree and finding the Qt global
cache file.  This results in the system build not working as expected.
For example running 'make' in the module would only build the contents
of src and skip tests and examples.

Fixed by adding a include statement to the end of the config test
generated .qmake.cache.

Change-Id: I68a5f2a96f4ee02076b6457ae085f45d894cd4ed
Reviewed-on: http://codereview.qt.nokia.com/3830
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-09-01 05:36:26 +02:00
Jason McDonald
964793718f Simplify qtestlib logging code, part 3
Collapse the QTestBasicStreamer class into QTestXunitStreamer.

Change-Id: I349b8db432fd45f9352084f60b36b460f3b61f6a
Reviewed-on: http://codereview.qt.nokia.com/3925
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 03:10:58 +02:00
Jason McDonald
d88b335d08 Simplify qtestlib logging code, part 2
Rename the QTestLogger class to QXunitTestLogger.

Change-Id: I7b93f9de4f4744e53997ccc001a745c36f375599
Reviewed-on: http://codereview.qt.nokia.com/3924
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 03:10:51 +02:00
Jason McDonald
b17e9b3d94 Simplify qtestlib logging code, part 1
Both the old and new XML loggers produce the Complete and Light XML log
formats, while only the new logger produces Xunit XML logs.  The
disadvantage of the new logger is that it is more complex and doesn't
produce a partial log if the test fails to terminate gracefully.  This
behaviour arises because Xunit format output cannot be written correctly
until all tests have been executed.

This commit removes the Complete and Light XML formats from the new
logger, using the old logger to produce those formats and the new logger
to produce only Xunit XML.  Prior to this commit, the qtestlib selftests
demonstrate that the old and new loggers produce identical output for
Complete and Light XML.

This commit also removes the undocumented -flush command-line option,
which was used rather obscurely to select between the old and new
loggers.

The newer logger will be renamed to QXunitTestLogger in a subsequent
commit.

Change-Id: Id304f5b411bdd520409ee233f6bc34e8917942ab
Reviewed-on: http://codereview.qt.nokia.com/3923
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-09-01 03:10:39 +02:00
Corentin Chary
a4878db8df qssl: add support for QSsl::Opaque key
This allow to use directly EVP_PKEY * with QSslKey (for
example comming from a PKCS#11 dongle).

Change-Id: Icb1ba5081506a831ec3d8cfffe13ce70939608ea
Merge-request: 48
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4010
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-31 21:06:53 +02:00
Bradley T. Hughes
a3e8f1ab0c Add src/v8/qtv8version.h to .gitignore
Change-Id: I3e63a3b7cfc06ea4b71c55c1530433438c902aa7
Reviewed-on: http://codereview.qt.nokia.com/3979
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-31 18:43:28 +02:00
Gunnar Sletta
9cdf9973c6 The XCB plugin should not rely on QT_CONFIG=opengl anymore
Change-Id: Ieeedb7eb68704df811c613873bd2fc4b77e2aa04
Reviewed-on: http://codereview.qt.nokia.com/3966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kevin Simons <kevin.simons@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-08-31 16:32:52 +02:00
Tor Arne Vestbø
4a0bab33d6 Fix build with Clang for libpng versions 1.4.0 to 1.5.2
Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to
have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED
is enabled, but most declarations of longjmp in the wild do
not add this attribute. This causes problems when the png_jmpbuf
macro expands to calling png_set_longjmp_fn with a mismatched
longjmp, as compilers such as Clang will treat this as an error.

To work around this we override the png_jmpbuf macro to cast
longjmp to a png_longjmp_ptr.

See also http://llvm.org/bugs/show_bug.cgi?id=10338

Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Change-Id: I197cfa12af76410310e409bc0fce7d4332ee66a6
Reviewed-on: http://codereview.qt.nokia.com/3929
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-08-31 16:25:34 +02:00
Morten Sorvig
0719142321 Cocoa: Fix qmlscene flicker on startup.
The SG render thread was racing window creation in
the GUI thread, which would cause flicker if the
window won the race and was shown before the SG
thread had a frame ready.

Send a synchronous expose event before showing the
window - this will wait for the SG render thread.

In addition, don't defer NSwindow creation. The GL
context setup is done before the window is shown
and needs a fully created window.

New API: QWindowSystemInterface::handleSynchronousExposeEvent
Retire: QWindowSystemInterface::handleExposeEvent

Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531
Reviewed-on: http://codereview.qt.nokia.com/3399
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-31 16:16:03 +02:00
Friedemann Kleint
090ee21eac Introduce Q_QTQUICK1_EXPORT fixing exports in declarative.
Change-Id: Id70c6792b5342074ef78944e7e28bd9c9b83c107
Reviewed-on: http://codereview.qt.nokia.com/3983
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-31 16:06:12 +02:00
Lars Knoll
2c6eae4bca Initialize member variable
Change-Id: I165c267b87dc201ed4970d50e39ff7421cbef35f
Reviewed-on: http://codereview.qt.nokia.com/3981
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-08-31 15:45:50 +02:00
Friedemann Kleint
50eb9120ce Fix further test builds on Windows.
Change-Id: I9846d19c5975f4d17bed46c59272a0fa428fd0d1
Reviewed-on: http://codereview.qt.nokia.com/3980
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-31 15:22:35 +02:00
Eskil Abrahamsen Blomfeldt
e6324af817 Compile with host architecture armv5tel
Change-Id: Ied7ef4052e192d1585d7eed7a100b01f79f9773d
Reviewed-on: http://codereview.qt.nokia.com/3962
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
2011-08-31 14:05:33 +02:00
Friedemann Kleint
547deef149 Fix compile on Windows.
Change-Id: I72b1c35c3f92e1198a8c888f9d732b202d84047c
Reviewed-on: http://codereview.qt.nokia.com/3953
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-31 13:34:59 +02:00
Friedemann Kleint
c5ea7fd39a Fix autotests to build on Windows.
Basically breakage by <windows.h> being included from the OpenGL
parts of <QtGui/QtGui> included from <QtTest/QtTest>.

Change-Id: Id285fb89c64bf77e2408faac5688acd085579351
Reviewed-on: http://codereview.qt.nokia.com/3952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-31 13:26:27 +02:00
Aurélien Gâteau
baeed7c6c3 Introduce menubar plugin system
Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 31ff55bbeb84f10e75e997c75a63deda83e62507)

Change-Id: I0644514299c16cabe19d1e6d024dd652b2d7bc4e
Reviewed-on: http://codereview.qt.nokia.com/3933
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
2011-08-31 13:12:43 +02:00
Aurélien Gâteau
6c97b066a9 Introduce QAbstractPlatformMenuBar
Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 9aeadca09ab4e27ebf299873f90490d585b4fb7f)

Change-Id: Ib0f035ac15ad0cc6be52807e8101f5dcfb5b041b
Reviewed-on: http://codereview.qt.nokia.com/3932
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
2011-08-31 13:12:43 +02:00
Aurelien Gateau
b7832ce2f8 Hide Q<Platform>MenuAction
This will help abstracting the platform specific parts of QMenuBarPrivate in a
common interface.

Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 68d633cc840c5526a0ad77985404f53ada6ba91a)

Change-Id: I733b8dfb71ae0dc78536cfe48b466394206d1de3
Reviewed-on: http://codereview.qt.nokia.com/3931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
2011-08-31 13:12:43 +02:00