Kent Hansen [Fri, 11 Nov 2011 11:45:37 +0000 (12:45 +0100)]
Update V8
Fixes a bug in one of our patches that caused
hydrogen to optimize incorrectly.
Task-number: QTBUG-22679
Change-Id: I008088cd2b878f22e6a2ba4e002aeba9a3c70a22
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Jo Asplin [Fri, 11 Nov 2011 14:24:17 +0000 (15:24 +0100)]
Re-enabled tst_qpluginloader
This test is passing in CI.
Task-number: QTBUG-21402
Change-Id: I356476e458cac1cd434959fdf801011a607c9233
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Oswald Buddenhagen [Fri, 11 Nov 2011 15:38:16 +0000 (16:38 +0100)]
fix makefiles again
Change-Id: I981a62e8884f5c68e3f6c4b7b2f142bf75007f99
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Olivier Goffart [Fri, 11 Nov 2011 15:37:23 +0000 (16:37 +0100)]
Fix warning in tst_qobject
signal4 is not used in that function
Change-Id: I69f39a4639bfae067c411fd1166fc36ca3febbc5
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jiang Jiang [Thu, 10 Nov 2011 18:04:14 +0000 (19:04 +0100)]
Fix symbol fonts support with FT engine
It appears that the symbol_map we obtained with FreeType doesn't
work for common symbol fonts like Wingdings, in previous X11 code
we use the code path with normal charmap, to enable it we need to
make sure QT_NO_FONTCONFIG is not defined. And since the FcCharset
functions doesn't really operates on the font database, we can
safely skip the mutex calls.
Change-Id: I8c484de200be1d47c053b10be2c51d2273dcd359
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jiang Jiang [Thu, 10 Nov 2011 17:01:56 +0000 (18:01 +0100)]
Fix application font loading in basic font db
We need to reregister fonts in initializeDb because basic font db
doesn't have an internal record like fontconfig does, so just
repopulating the font database won't work. db->reregisterAppFonts
is now used properly as intended (reregister application fonts
after the system font database has been cleared).
Also, static variable 'initialized' in initializeDb() is removed
since we check privateDb()->count to see if it needs to be populated
again.
Task-number: QTBUG-22063
Change-Id: Ifc66392b56b72acbe08b99256c61421c204be5d7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Harald Fernengel [Fri, 11 Nov 2011 08:57:44 +0000 (09:57 +0100)]
Replace fixqt4headers shell script
Use a perl script with a slightly better scalability. No more
quadratic behavior, takes about 10 seconds (instead of 5 hours)
on my machine to fix all QtCreator headers
Change-Id: Ic7d00c28aec390a1da27a969ece5d8102674e919
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
aavit [Fri, 11 Nov 2011 11:46:24 +0000 (12:46 +0100)]
Add Qt's debug/release mode to the lancelot autotests' client info
Change-Id: I146c035c241475e9851d11abfd3f50676c8e8bca
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Friedemann Kleint [Fri, 11 Nov 2011 13:50:20 +0000 (14:50 +0100)]
Factor out QPlatformTheme from QPlatformPlugin.
Implement QCocoaPlatformTheme. The menus and dialog
API is moved from the platform to the theme plugin.
(Both APIs contain references to QtWidget classes,
which we are working towards removing.)
The theme plugin is created after the platform
plugin, first by asking the platform plugin, then
by looking for a separate plugin if the platform
does not specify a theme.
Initial-patch-by: Morten Sorvig <msorvig@trolltech.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I2778cdd3a205c4ce35ead93e39fe6b4cd58a39f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joona Petrell [Thu, 10 Nov 2011 14:42:50 +0000 (16:42 +0200)]
Document QInputPanel API
Change-Id: Ie64215529139e18a0a575e149289b6fa9a699a69
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Harald Fernengel [Fri, 11 Nov 2011 10:21:52 +0000 (11:21 +0100)]
Add a -force-asserts option to configure
We have the following scenario: Either you build a release package
without asserts, or a debug package with asserts. However, in embedded
development, we need asserts also in release packages. This flag allows
you to build a release package, but Q_ASSERTs still fire.
Change-Id: Icd1dd4dd63c3cafecf515b40741263d902ad42d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Stephen Kelly [Thu, 10 Nov 2011 19:34:46 +0000 (20:34 +0100)]
Add API to clear the current index. Symmetric with clearing selection.
Change-Id: I08070f4fdf26898d5b6edd5259f011f9b3c75512
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Stephen Kelly [Thu, 10 Nov 2011 12:24:33 +0000 (13:24 +0100)]
Make this API virtual to make selection proxying possible.
Change-Id: Ie93c8b38c59d347026a68eae03687d9017b3d048
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Friedemann Kleint [Thu, 10 Nov 2011 12:07:01 +0000 (13:07 +0100)]
QPlatformDialogHelper: Split class hierarchy, decouple from Dialog
- Introduce hierarchy of QPlatformDialogHelper-derived classes
for font, color and file dialogs.
- Start reducing dependencies on QDialog:
* Remove QDialog-specifics from interface, introduce enumeration
for DialogCode
* Make the helpers Q_OBJECTS to be able to add the signals
passed on to the QDialogs
* Remove QDialogPrivate pointer
- Split setVisible_sys() in show_sys() (factory method for native
dialogs) and hide_sys(). Pass parent window to show_sys(),
removing the necessity to query the QDialog for it
- Introduce a styleHint() similar to QGuiApplication's for
platform-specific
- Fix compile in cocoa/windows, reduce depency on QDialog
(-private) classes.
Change-Id: Ic1cb715e1edf767f2cb18b9780341d189339ef1d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Chris Meyer [Wed, 9 Nov 2011 18:44:32 +0000 (10:44 -0800)]
Prefer organizationDomain or CFBundleIdentifier for settings file
Watch for attempts to write to "Trolltech" preferences and use
QCoreApplication::organizationDomain() instead. If that doesn't exist,
then fall back to CFBundleIdentifier if possible. If that doesn't
exist, then follow the old code path and use the hardcoded string.
This change eliminates extra files being created which helps Mac app
store acceptance.
Change-Id: I1ba3984b46cf3888f371d87f6ad8ea6c2f26d2ec
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Oliver Wolff [Thu, 10 Nov 2011 09:28:56 +0000 (10:28 +0100)]
QByteArray autotest: Check for defines inside of slot
Instead of creating slots depending on certain defines,
these defines should be checked inside the slots.
Moc may not be aware of all defines (e.g. compiler
specific ones) and thus (not) create slots according
to the condition given.
Change-Id: I50495444b8f468ec131e6a0937e18803a8077758
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Jo Asplin [Thu, 10 Nov 2011 10:00:02 +0000 (11:00 +0100)]
Added QTBUG-22296 to QEXPECT_FAILs
Change-Id: I6c619cea64a14d957077813256c7d4f7ff6a4220
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Tero Ahola [Fri, 11 Nov 2011 08:22:43 +0000 (09:22 +0100)]
Repaint QProgressBar when minimum or maximum changed
The implementation of QProgressBar::setMinimum and setMaximum did not
repaint the widget. This caused the widget to be shown incorrectly in
case you call setMinimum or setMaximum but not setValue.
Task-number: QTBUG-22121
(cherry picked from commit
b1998f4f59c3b10700963b2d13a17a0cc77ef665)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: I331d37ab4451d9e096cdf91a9e0a0286bc3cdffb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Tero Ahola [Fri, 11 Nov 2011 08:13:07 +0000 (09:13 +0100)]
Fix QProgressBar causing timer event spam
On Windows you will get a lot of timer events if you use QProgressBar
widget. This is because QWindowsStyle uses a timer to animate a
progress bar with unknown state (min and max values both zero). The
issue was fixed by starting the timer only if needed.
Task-number: QTBUG-10501
(cherry picked from commit
72e61b127470b044e370af7017fa8a5b0538244f)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Change-Id: If9ff2ab99929d9b85a7ffa8f6fd47b045b982f67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thomas Hartmann [Thu, 10 Nov 2011 11:09:29 +0000 (12:09 +0100)]
Adding test for custom bezier easing curves
I added unit tests _fast_cbrt() taken from qeasingcurve.cpp
Change-Id: Id3afd26efac92f594d6358dc2e11f94e8c524da2
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Thu, 10 Nov 2011 10:16:56 +0000 (11:16 +0100)]
avoid type aliasing
For -O2 gcc activates -fstrict-aliasing. As a result the compiler is
allowed to assume that pt[1]=px[1]/3+B1 does not affect t.
Therefore the result of _fast_cbrt() was always 0.
Using a union for casting avoids this issue.
For more details see:
http://labs.qt.nokia.com/2011/06/10/type-punning-and-strict-aliasing
Also the updated code respect endianness.
Change-Id: Id4bed16efac52e494e7357dc2f23f94e8c525df1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jason McDonald [Thu, 10 Nov 2011 03:10:40 +0000 (13:10 +1000)]
Cleanup corelib autotests
Use QVERIFY2 to provide better test diagnostics.
Change-Id: I128004f4ee133ceed4d8f373bbbe4a0eee431ebf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Thu, 10 Nov 2011 03:07:57 +0000 (13:07 +1000)]
Use qWarning() to output warnings.
Change-Id: I366f70f27de0329749e5dcbdcbec8d56bffb4255
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 7 Nov 2011 06:46:52 +0000 (16:46 +1000)]
Cleanup corelib autotests
Tidy the autotest .pro files. Most autotest .pro files should look like
this:
CONFIG += testcase
TARGET = tst_something
QT = core testlib
SOURCES = tst_something.cpp
Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Caroline Chao [Fri, 16 Sep 2011 06:14:03 +0000 (08:14 +0200)]
Add missing naming for libraries built statically.
Extension .a for Mac and Linux and .lib for Windows.
Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Caroline Chao [Tue, 5 Jul 2011 14:15:52 +0000 (16:15 +0200)]
Split TARGET_BASEPATH from breakpad.
TARGET_BASEPATH becomes QMAKE_RESOLVED_TARGET.
QMAKE_RESOLVED_TARGET will be reused for future implementation
of code coverage tool TestCocoon.
Creating of resolve_target.prf.
Clean unused "unset(SYMBOLFILENAME)" in default_post.prf.
Change-Id: I054efb0065fa06697b60ac60a9ddf364f2f40366
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Shane Kearns [Thu, 10 Nov 2011 17:16:25 +0000 (17:16 +0000)]
Fix warning when using QXmlInputSource with non opened QIODevice
Calling setTextModeEnabled on a QIODevice that is not open generates
a warning as a result of QTBUG-20905. Previously, it caused incorrect
behaviour when called with true.
Now only call it if the QIODevice passed in is already opened.
If not open, then it is opened by the xml reader without text mode,
so there is no difference in behaviour.
xml autotests still pass, although this removes several QWARN messages
from the qdom autotest.
Task-number: QTBUG-22659
Change-Id: Ie3137e44fe776bff6371ebd008428110168717ec
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Olivier Goffart [Thu, 10 Nov 2011 13:56:55 +0000 (14:56 +0100)]
Fix parsing of #if defined expression
We only need to match the closing parentheses if there was an opening one
This has caused mis-parsing of tst_qbytearray.cpp
Change-Id: I9d52916e3ed8549c5ddd968092451fef7389a952
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
David Boddie [Thu, 16 Jun 2011 18:20:50 +0000 (20:20 +0200)]
Doc: Added more appropriate links to help reduce confusion.
Task-number: QTBUG-19919
(cherry picked from commit
26c29a2dd7efa4c66063d1255e1f694462cbae85)
(cherry picked from commit
8304ca4edd7bd71dd0398451e62a281eac54d0a6)
Change-Id: Icd45465723f9077f109459df002556be81dddb33
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Olivier Goffart [Thu, 10 Nov 2011 10:50:02 +0000 (11:50 +0100)]
Removed include to qdatastream.h from qmetatype.h
Added forward reference to QDataStream instead
In the new connection syntax, I want to include qmetatype.h from qobject.h,
in order to handle metatype for queued connection.
So qdatastream cannot be included here (as it inherit qobject) else it would
lead to circular inclusion.
QDataStream is only used in templated code that is dependent on the
template parametter so it is fine to have it forward declared.
Change-Id: I08ea479f481262a80451a277ee29533c42cb9f89
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Aaron Kennedy [Tue, 11 Oct 2011 05:06:25 +0000 (15:06 +1000)]
Update V8
Change-Id: Ic239ef1e55bed06260e4a04cc2199f64c2d30059
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
João Abecasis [Thu, 10 Nov 2011 12:15:22 +0000 (13:15 +0100)]
Fix Q_STATIC_ASSERT on Mac
gcc 4.2.1 complains about the use of C++-style cast in the macro.
error: template argument 1 is invalid
. Changing the bool-cast to a C-style cast makes the test compile.
Change-Id: Ie9082a3adbfd53147bfd0bfe36dd9e7328e01ee8
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Pekka Vuorela [Thu, 10 Nov 2011 11:05:37 +0000 (13:05 +0200)]
Updated Qt::InputMethodQuery documentation
Change-Id: Ibd27231366e4af2780bfe2f8f735da74dc04a1cf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pekka Vuorela [Wed, 9 Nov 2011 15:22:40 +0000 (17:22 +0200)]
Document QInputMethodQueryEvent class
Change-Id: I6e98f9e690b733a06ee165e5b01ab6a5a784791b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pekka Vuorela [Tue, 8 Nov 2011 16:12:02 +0000 (18:12 +0200)]
QWidget text editors to commit text on their own on losing focus
Change-Id: I3b907661e8a24a6dbdaabf607c5c528b1b471c98
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pekka Vuorela [Tue, 8 Nov 2011 14:47:10 +0000 (16:47 +0200)]
QTextEdit to use tentative commit instead of QInputPanel::commit()
Latter to be deprecated.
Change-Id: I2c302c73a7ab2f4201af6a3c6fb4a64a4760263e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pekka Vuorela [Mon, 7 Nov 2011 09:52:56 +0000 (11:52 +0200)]
Implement partial tentativeCommit support in QTextEdit
Available on plain text for now, html support still pending.
Change-Id: I0818b97874e80c8c1b33a9127aa7bb3330a8761d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
aavit [Thu, 10 Nov 2011 10:05:15 +0000 (11:05 +0100)]
Add isDebugBuild() query function to QLibraryInfo
Also cleaned up the doc, removing references to the buildkey() function
that has been removed.
Change-Id: I2cb403f93d93c0b2f71c8502818d669f7bfbfbec
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Morten Sorvig [Thu, 10 Nov 2011 08:36:34 +0000 (09:36 +0100)]
Compile.
QNSPanel must be a NSPanel and not a QNSWindow
subclass.
Change-Id: I1de31e147757824610f4aabc0ef66ae3906dc0f6
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Jo Asplin [Wed, 9 Nov 2011 16:05:51 +0000 (17:05 +0100)]
Re-enabled passing tests in tst_qabstractprintdialog
To increase the effective test coverage, this patch
re-enables the tst_qabstractprintdialog test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Ic09a03ed405bf6f85917410a7a86e17f2fe22cba
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Wed, 9 Nov 2011 14:55:16 +0000 (15:55 +0100)]
Re-enabled passing tests in tst_exceptionsafety_objects
To increase the effective test coverage, this patch
re-enables the tst_exceptionsafety_objects test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: If1fbf59c9d941453b9fd7feb43c59e27e087ce50
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Mon, 7 Nov 2011 09:19:27 +0000 (19:19 +1000)]
Cleanup corelib autotests
Remove literal tabs.
Change-Id: I210a0259773cceb20d35ebc80b889e3ebb88b540
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Mon, 7 Nov 2011 06:18:17 +0000 (16:18 +1000)]
Remove redundant #define
Change-Id: I27a47653d2c41741f39ee1fea6a1fed063279994
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 06:19:54 +0000 (16:19 +1000)]
Propagate QTest::mouseEvent keyboard modifiers.
The QWindowSystemInterface mouse functions now have keyboard
modifiers parameter, make use of them.
Task-number: QTBUG-21743
Change-Id: I65ba1095825b81d575d314c1de2a45cef28e697a
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Bradley T. Hughes [Tue, 8 Nov 2011 13:08:19 +0000 (14:08 +0100)]
Remove unused MMX/3DNOW/SSE/SSE2/SSSE3/NEON custom compiler logic
The QtWidgets module doesn't contain any code that needs these custom
compilers (that code has been move to QtGui).
Change-Id: I655e478908bfa0b646e68210f6215d9ffbb1f81e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Johannes Zellner [Wed, 9 Nov 2011 16:49:54 +0000 (17:49 +0100)]
Fix build when QEGL_EXTRA_DEBUG is defined for debug output
Also shift EGL configuration plot above window surface creation
Change-Id: I2de860e087cb2648b6e8e9b75365fbe78fe7687a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Oswald Buddenhagen [Fri, 14 Oct 2011 10:55:28 +0000 (12:55 +0200)]
support the obj-c #import statement in the dependency generator
Task-number: QTBUG-21965
Reviewed-by: joerg
(cherry picked from commit
d2c7193107a170e2884db52272f4d0ee0da62856)
Change-Id: I8a5eb47bfd2c2ee9d064f054565915e64e4902f8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Johannes Zellner [Wed, 9 Nov 2011 16:39:50 +0000 (17:39 +0100)]
Adopt eglfs platform plugin to changed QEGLPlatformContext API
eglClientVersion is not used anymore
Change-Id: I8595a17386c1466d7766522adbdbd7cd5002ecf8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Bradley T. Hughes [Wed, 9 Nov 2011 15:19:11 +0000 (16:19 +0100)]
Correctly normalize timevals before calling select()
When normalizing timevals, we need to bound the tv_usec member to
0-999999 inclusive, otherwise select() may return EINVAL.
When rounding timevals to the nearest millisecond in the UNIX event
dispatcher, pass the timeval through normalizeTimeval() when returning.
As discovered on Mac OS X with tst_QFutureWatcher, starting a 10 second
timer would end up calling select() with timeval = { 9l, 1000000 },
resulting in numerous "select: Invalid argument" warnings being printed
to the console.
Change-Id: Ic539e935bf847e0d4c22a73ad203e3a7a81d0690
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Friedemann Kleint [Wed, 9 Nov 2011 14:58:27 +0000 (15:58 +0100)]
QVariant: Fix MSVC compiler warning about unused variable null.
Use static method isnull().
Introduced by
ca26fefc0624264262a2abe630568271cefa2753.
Change-Id: I752f8d8a5ec473dcc5f50fbda47d061b8d3a7e13
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Bradley T. Hughes [Tue, 8 Nov 2011 17:01:49 +0000 (18:01 +0100)]
Remove unnecessary variable self-assignment
Assigning an int variable to itself is unnecessary and pointless, remove
them.
styles/qplastiquestyle.cpp:932:23: warning: explicitly assigning a
variable of type 'int' to itself [-Wself-assign]
width = width;
~~~~~ ^ ~~~~~
styles/qplastiquestyle.cpp:939:23: warning: explicitly assigning a
variable of type 'int' to itself [-Wself-assign]
width = width;
~~~~~ ^ ~~~~~
Change-Id: I0118874028bf43992bcce07f87b46b48868436cc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Bradley T. Hughes [Tue, 8 Nov 2011 17:03:57 +0000 (18:03 +0100)]
Assign function argument to class member, not to itself
The 'worker' function argument shadows the class member of the same
name, and 'worker = worker;' assigns the function argument to itself,
not to the member as intended.
examples/tutorials/threads/movedobject/thread.cpp:69: warning:
explicitly assigning a variable of type 'QObject *' to itself [-Wself-
worker = worker;
~~~~~~ ^ ~~~~~~
Change-Id: If4adf486a86a4ba4e7f7040a7771a70b7dd9aa86
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Pekka Vuorela [Tue, 8 Nov 2011 16:34:43 +0000 (18:34 +0200)]
Un-internalized QDBusServer
Was marked internal earlier because of missing implementation. That
should be now in place.
Change-Id: I9005da4455299386556e567847474c8d8b6fd5ea
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Jo Asplin [Mon, 7 Nov 2011 12:21:52 +0000 (13:21 +0100)]
Removed obsolete host.pro from qtbase
Note that the uiloader test has been moved
from qtbase to qttools (see QTBUG-19453).
Change-Id: I326fa0da435701eeaad7026160e3203a27cb3666
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Tue, 8 Nov 2011 12:19:16 +0000 (13:19 +0100)]
Deleted qtipc autotest from qtbase
The qtipc autotest needs to live in qtscript due to dependencies
to that module. This commit is the first of two steps to move qtipc.
The second step is a commit in qtscript that adds qtipc there
(with a proper reference to the first commit, i.e. this one).
Change-Id: I233ee459be76fd1938868c05232ce732cfc913a8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Tue, 8 Nov 2011 13:04:31 +0000 (14:04 +0100)]
Fixed typo: private-tests -> private_tests
Change-Id: I8bc53061a6b7a8605290dca0d90e67d7660b4c33
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Tue, 8 Nov 2011 15:03:37 +0000 (16:03 +0100)]
Re-enabled passing tests in tst_qopengl
To increase the effective test coverage, this patch
re-enables the tst_qopengl test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Ifa9ccab81efb1577767465c150fc64a9d9e3f8e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Morten Sorvig [Wed, 9 Nov 2011 09:35:11 +0000 (10:35 +0100)]
Cocoa: Implement mouse and keyboard grab.
Change-Id: Id53ff19d43213d79aaf8f1a6617a06ef9d0cfb4b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Friedemann Kleint [Tue, 8 Nov 2011 14:08:48 +0000 (15:08 +0100)]
Widgets: Remove dialog functionality from QGuiPlatformPlugin.
(as QGuiPlatformPlugin is deprecated)
Clean up qdialog.cpp.
Acked-by: Morten Johan Sorvig <morten.sorvig@nokia.com>
Change-Id: Id49d6cfe235d5afb4c89b0697c6b3980130a5299
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jędrzej Nowacki [Mon, 31 Oct 2011 09:22:46 +0000 (10:22 +0100)]
[optimization] QVariants comparison
QMetaType::isRegistered and QMetaType::typeName are quite expensive.
To compare two custom objects we need to have their type name (for
dereferenced comparison). If the name exist we know for sure that the
type is registered and we do not have to call QMetaType::isRegistered
anymore.
Change-Id: Iba631e012504c8633868a902880fa30d38afb917
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Wed, 26 Oct 2011 11:48:40 +0000 (13:48 +0200)]
Add QPolygonF to metatype system.
That was strange that QPolygon was know to QMetaType class but QPolygonF
not.
Change-Id: I67bb99644b8b1d0fe1aec730619d8048cb78219b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Wed, 12 Oct 2011 15:32:26 +0000 (17:32 +0200)]
Make usage of internal QVariant space.
Each QVariant instance has internal storage which may be
used for well-know basic types. This patch changes the
behavior by delegating type dependent operation to QMetaType
class which knows more types than QVariant itself.
The patch significantly reduce amount of code in QVariant
implementation.
There are few side effects of this patch:
- better performance:
* for Core types when using Gui (QGuiVariant is able to
construct Core types)
* for small custom types (QVariant::Private::Data is used for all
types that has size small enough)
- comparing two QVariants can give different result for small custom
types (binary comparison instead of pointer comparison)
Change-Id: Ic17fa500d6a882110bfba896fd456c8e6c7a63a9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Wed, 26 Oct 2011 09:09:29 +0000 (11:09 +0200)]
Implement QMetaTypeSwitcher.
Currently one of the most common coding pattern, when working with
QMetaType types, is to switch over all types ids to convert a given
type id to a real c++ type. The pattern is not perfect, because of:
- code duplication - to convert type id to a real type a user has to
write own switch case
- maintenance - adding new type to QMetaType::Types doesn't propagate
to other parts of code.
Proposed type switcher can solve the issue by switching type id and
delegating found c++ type.
The class is created for internal use only and was created to simplify
common problems in QtDeclarative, QtScript and QVariant.
Change-Id: I0567ef908024b3b05ee18126f98a73a74748fbd2
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Thu, 20 Oct 2011 09:42:40 +0000 (11:42 +0200)]
Add QTypeModuleInfo template class
From time to time it is necessary to know from which module a type comes
from. This information couldn't be part of QTypeInfo as id doesn't work
for forward declared types.
QTypeModuleInfo should stay for Qt internal usage only.
Change-Id: Ia53747c88293fc0cdaffef919b94c653412779d3
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Jędrzej Nowacki [Fri, 14 Oct 2011 07:22:46 +0000 (09:22 +0200)]
Refactor QMetaType types.
QMetaType::Type enum is the main source of type ids. Currently
there are many tasks that can be replaced by a smart macro that
can iterate over all types. The patch introduces series of FOR_EACH_
macros that may be used for code generation.
As the first step the macro was used for Q_DECLARE_BUILTIN_METATYPE
to make sure that no type was forgotten.
Second step was to use created macros in autotest to improve tests
coverage.
Change-Id: I34e9ad7bacf02b44b028bc1aad20b1241aacebd3
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Bradley T. Hughes [Tue, 8 Nov 2011 10:33:14 +0000 (11:33 +0100)]
Silence warnings from clang
Many enumerator values were not handled in msbuild_objectmodel.cpp. For
each unhandled value, add a case statement that simply breaks.
Change-Id: I018fc5e641200568c88ccc6acb3f5b6ee6b3fd6f
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Jason McDonald [Mon, 7 Nov 2011 04:47:59 +0000 (14:47 +1000)]
Remove redundant copies of QTRY_COMPARE.
QTRY_COMPARE is now part of qtestlib, so there's no need for copies of
it.
Change-Id: Ied4e7d3b30c1cf16ddcbf8655e4d976e74c2bd8a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
David Faure [Mon, 7 Nov 2011 10:25:41 +0000 (11:25 +0100)]
Update .gitignore
Change-Id: Ie304ec2776d6fdef734da8bbc22e8dea77417c78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Tue, 8 Nov 2011 15:40:30 +0000 (16:40 +0100)]
Widgets: Remove remains of Windows file dialog.
Also remove Windows-specific binary compatility hack from Qt4.
Change-Id: I4b6914b357f21737e392745f907c770db9f7a641
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Aurindam Jana [Tue, 8 Nov 2011 09:45:18 +0000 (10:45 +0100)]
QGlobal: Define a default message handler
Currently, qInstallMsgHandler() does not return the
handle to the default message handler. This patch defines
a default message handler. This is returned by
qInstallMsgHandler() when called for the first time. A call
to qInstallMsgHandler(0) will restore the default message
handler as was the case previously.
Change-Id: I42f06654d45fb0e633f3c6d912fc8f05c23249aa
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Olivier Goffart [Tue, 8 Nov 2011 14:37:42 +0000 (15:37 +0100)]
QNAM: Fix authentication cache when the password is in the URL
Two problems:
- The signal cacheCredidentials was not connected in the synchronous
case while it must be connected. (Regression when the threaded http
was merged)
- We cannot cache the credidentials when we proceed the url because
at that point, we do not know the realm (this basically reverts
9bc5a32b875b812c3a706034c8c27614f86bd138)
Task-number: QTBUG-18411
Change-Id: I8ea11fa23db4314c3f17ed06d2d7f9ee934ccdba
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Jiang Jiang [Tue, 8 Nov 2011 14:17:18 +0000 (15:17 +0100)]
Avoid double initialize of platform font database
Since platform font database will be populated in QFontDatabase::load,
no need to do it here in QFont::initialize.
The change was in
cd781b732ed29b41b5ac18e39cbbba2815fc8f8b but lost
in previous merge.
Change-Id: Iaa56fea5765d94e4f7b58409654bc218808086cd
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Peter Hartmann [Fri, 4 Nov 2011 15:56:12 +0000 (16:56 +0100)]
SSL: blacklist intermediate certificates that issued weak certs
... as did browser vendors.
Tested manually with affected CA certificates.
Reviewed-by: Richard J. Moore <rich@kde.org>
(cherry picked from commit
e1d6df4e5931ee49b4b68dd5a33146f5639268b7)
Change-Id: I5bf6c147abf6d2de0f313d65faa2d9a1e9684cea
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Morten Sorvig [Thu, 3 Nov 2011 11:58:53 +0000 (12:58 +0100)]
Cocoa cursor support: Add QCocoaCursor.
Port the Qt 4 mac implementation.
Change-Id: I3bc6fd0b5a0398dcf43a5aaa3b498bb74b42c105
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Friedemann Kleint [Fri, 4 Nov 2011 13:45:42 +0000 (14:45 +0100)]
Widgets: Use QPlatformDialogHelper in QColorDialog/QFontDialog.
Change-Id: Ib9a2f19679c2d4c8583742a918d61c1a98403843
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
David Faure [Sat, 5 Nov 2011 11:09:54 +0000 (12:09 +0100)]
Add Q_DECLARE_PRIVATE equivalent for QDir, to be able to subclass it
Apply the same solution to QFileInfo (no public detach(), but a
non-inline d_func instead).
Change-Id: I31c4c759f44a0649b97f7884b078b174c9c00f22
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Kevin Simons [Mon, 7 Nov 2011 15:37:36 +0000 (16:37 +0100)]
The value of the -sysroot option of configure was not getting set correctly
Change-Id: I35f7b87e1fa176358b85bca646fbf1a388cb77a5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jo Asplin [Mon, 7 Nov 2011 13:11:03 +0000 (14:11 +0100)]
Completed change to eliminate v8.pro
The initial change to eliminate v8.pro was
incomplete - see
803b7d651cc5593ef4512d707c9d05c64478b7d6.
Change-Id: Ia2c996d247f8b19380363f3e0409d38d3b839fdb
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Mon, 7 Nov 2011 12:45:12 +0000 (13:45 +0100)]
Moved utf8/ and deleted corelib.pro
This change moves utf8/ into corelib, thus
allowing corelib.pro to be deleted.
Change-Id: Ib1b4e0930ac0e116d9bbc242a6dfb63ae5785d19
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Mon, 7 Nov 2011 11:19:52 +0000 (12:19 +0100)]
Re-enabled tst_qdialog
Commit
0fd8514a57ec8c6bd824e3c30a559988c53b95c8 ensured that
the showAsTool test function is now properly QSKIP'ed for
platforms where it is always known to fail.
This change re-enables the test case as a whole so that
the passing test function may actually catch real Qt bugs again
(without being ignored by CI).
Task-number: QTBUG-22453
Change-Id: Icfe56558f8c0f4b50dbbc21d9748df6d81fea4fe
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Thu, 3 Nov 2011 12:33:32 +0000 (13:33 +0100)]
Deleted QWS tests
QWS is not supported for Qt 5, so the QWS tests are deleted.
Change-Id: I08837fbd879915bbca9f821fad3551450eb3a1c6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Charles Yin [Tue, 8 Nov 2011 04:42:08 +0000 (14:42 +1000)]
QPainterPath: Fix copy constructor again.
The previous fix
a05270f435483937e76d18fa6e512dc0394507d1 is not correct,
QPainterPathPrivate(other) should be QPainterPathPrivate(), as there
is only a default ctor for QPainterPathPrivate and ref is initialized there,
use copy ctor just copies the ref value which makes all detach() calls broken.
Add an unit test for this as well.
Change-Id: I658f0a977664d5ec523af3f8a48c1a866eda6ab0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jiang Jiang [Fri, 4 Nov 2011 13:47:31 +0000 (14:47 +0100)]
Fix subpixel positioning support
Move subpixelPositionForX from QTextureGlyphCache to QFontEngine,
since some font engines like QFontEngineFT may need a custom
implementation or tweak it a little bit.
In QRasterPaintEngine::drawCachedGlyphs, do not add aliasedCoodinate
to x offset as that will break subpixel positioning.
Change-Id: Idbcec617509459b80965220ceb07b17737649bbf
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jędrzej Nowacki [Tue, 25 Oct 2011 12:52:21 +0000 (14:52 +0200)]
Implement QRegion::isNull
The method was missing from QVariant perspective (QVariant::isNull
supposed to call isNull not isEmpty).
Change-Id: Ic1ac9f662e275ac73908809f2c4ac59679b40b00
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
Chris Meyer [Mon, 7 Nov 2011 21:15:14 +0000 (13:15 -0800)]
Added '-' parameter to fix strings command using gcc-llvm on Mac OS 10.6 w/ Xcode 4.2.
Change-Id: Ib44c17c92fd67e8ffe3f34fa9c6014d8f0d861a8
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Friedemann Kleint [Mon, 7 Nov 2011 14:38:35 +0000 (15:38 +0100)]
QPainterPath: Fix copy constructor.
Re-add base class initialization accidentally removed by
e277575987657aa07444eea9bee99769f039d3b0.
Fix warning: 'base class 'class QPainterPathPrivate' should be
explicitly initialized in the copy constructor.
Change-Id: Ie94fa82eeeb3a8ddc69aef447f73ce36da616916
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Bradley T. Hughes [Wed, 2 Nov 2011 14:23:50 +0000 (15:23 +0100)]
Bump QCoreApplicationPrivate::app_compile_version to 0x050000
The minimum compile version is 0x050000 now, it cannot be less. Remove
checks for 0x040200 in the widget code, which provided compatibility in
the 4.x series for binaries compiled with 4.0 and 4.1.
Change-Id: Ia01da90de26dca6aeeb79d29c754cbeeecf809af
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Jason McDonald [Mon, 7 Nov 2011 05:33:49 +0000 (15:33 +1000)]
Cleanup corelib autotests
Remove redundant empty constructors, destructors and test functions.
Change-Id: Idb51368895e67ec3fc0345a9a5d33d77730c051b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jo Asplin [Fri, 4 Nov 2011 15:43:53 +0000 (16:43 +0100)]
Moved qobjectperformance into other/
The qobjectperformance test is a kind
of performance test that asserts that the
time it takes to emit a signal to a certain
number of receivers does not exceed a certain
time.
other/ currently seems to be a sensible place for
such a test. Alternatively, it could have been put
next to corelib/kernel/qobject/.
Change-Id: I5c9461b62984f5806d1f6940123d30ef9f9f5a37
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Thu, 3 Nov 2011 13:03:18 +0000 (14:03 +0100)]
Refer to v8 directly as a subdirectory.
v8 may be specified directly as a subdirectory in
tests/auto/auto.pro instead of indirecly referring to v8.pro.
Change-Id: I95d8c788fa67958372795519036cd8aec835b324
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Friedemann Kleint [Fri, 4 Nov 2011 08:05:50 +0000 (09:05 +0100)]
qtbase/examples: Add options to standarddialogs example.
Categorize dialogs using a toolbox and add an
options groupbox for dialogs that have options flags.
Besides example usage, this allows people implementing
platform native dialogs to play around with the options.
Change-Id: Icc0fd00382332b11783271ef15a0583c18758784
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Joerg Bornemann [Fri, 4 Nov 2011 13:59:38 +0000 (14:59 +0100)]
symbian epoc root code removed
Change-Id: Ibc9f5e42c534a09a8a44a0c95789f467970d38a2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Joerg Bornemann [Fri, 4 Nov 2011 12:51:20 +0000 (13:51 +0100)]
qmake: remove symbian support
Change-Id: I1db834500921681676a6f46e7750bdd81bf0093d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jo Asplin [Fri, 4 Nov 2011 13:41:04 +0000 (14:41 +0100)]
Re-enabled passing tests in tst_qmenu
To increase the effective test coverage, this patch
re-enables the tst_qmenu test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: I62cc1a2a9b0206595808deafb5fc137888ec97b3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Joerg Bornemann [Mon, 7 Nov 2011 09:16:21 +0000 (10:16 +0100)]
remove symbian support from configure
Change-Id: Ib37defb1a69b3f8e5e5c6698f022291849f52716
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jo Asplin [Fri, 4 Nov 2011 13:20:31 +0000 (14:20 +0100)]
Re-enabled passing tests in tst_qinputcontext
To increase the effective test coverage, this patch
re-enables the tst_qinputcontext test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: Ib1d4946ab29e67e0e72f4f9c6a7bf39b65d0f6be
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jo Asplin [Fri, 4 Nov 2011 12:55:08 +0000 (13:55 +0100)]
Re-enabled passing tests in tst_qprinter
To increase the effective test coverage, this patch
re-enables the tst_qprinter test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: I74cc30dc26b8b83852b3516f8def995eab19cf0f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Andrew den Exter [Fri, 4 Nov 2011 08:07:04 +0000 (18:07 +1000)]
Fix QQuickTextInput implicit width.
QQuickTextInput tries to set the UseDesignMetrics text option on its
QLineControl but this is overridden by the options set in
updateDisplayText(). Apply the new options in updateDisplayText to
the existing options.
Change-Id: I6789c3c2d6e496c1594d586bd075473983978f77
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Richard Moore [Wed, 2 Nov 2011 14:25:03 +0000 (14:25 +0000)]
SSL certificate extensions: add unit tests
Added tests for each of the supported extensions, and also for the
handling of unknown ones.
Change-Id: I29e0a5c1a411f41c2a554293662a33b56f205c00
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Richard Moore [Wed, 2 Nov 2011 14:07:43 +0000 (15:07 +0100)]
SSL certificates: add functionality to read extensions
... by adding a new class QSslCertificateExtension and methods in
QSslCertificate to support extensions. This is needed e.g. for OCSP
(checking revocation status of a certificate) or Extended Validation
certificates.
Change-Id: I5c5d9513fa640cd487786bb9a5af734afebd0828
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>