summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QPlatformDialogHelper: Split class hierarchy, decouple from DialogFriedemann Kleint2011-11-1115-199/+366
| | | | | | | | | | | | | | | | | | | | | - 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>
* Prefer organizationDomain or CFBundleIdentifier for settings fileChris Meyer2011-11-111-0/+44
| | | | | | | | | | | | | 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>
* QByteArray autotest: Check for defines inside of slotOliver Wolff2011-11-111-4/+8
| | | | | | | | | | | 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>
* Added QTBUG-22296 to QEXPECT_FAILsJo Asplin2011-11-111-5/+5
| | | | | Change-Id: I6c619cea64a14d957077813256c7d4f7ff6a4220 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Repaint QProgressBar when minimum or maximum changedTero Ahola2011-11-112-4/+49
| | | | | | | | | | | | | | 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>
* Fix QProgressBar causing timer event spamTero Ahola2011-11-112-23/+37
| | | | | | | | | | | | | | | 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>
* Adding test for custom bezier easing curvesThomas Hartmann2011-11-111-0/+222
| | | | | | | I added unit tests _fast_cbrt() taken from qeasingcurve.cpp Change-Id: Id3afd26efac92f594d6358dc2e11f94e8c524da2 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* avoid type aliasingThomas Hartmann2011-11-111-9/+30
| | | | | | | | | | | | | | | | | 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>
* Cleanup corelib autotestsJason McDonald2011-11-112-8/+6
| | | | | | | Use QVERIFY2 to provide better test diagnostics. Change-Id: I128004f4ee133ceed4d8f373bbbe4a0eee431ebf Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use qWarning() to output warnings.Jason McDonald2011-11-111-2/+2
| | | | | Change-Id: I366f70f27de0329749e5dcbdcbec8d56bffb4255 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Cleanup corelib autotestsJason McDonald2011-11-11126-709/+435
| | | | | | | | | | | | | 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>
* Add missing naming for libraries built statically.Caroline Chao2011-11-111-3/+7
| | | | | | | Extension .a for Mac and Linux and .lib for Windows. Change-Id: I1e979b2a6b29eeab35620aa0bbabb27f10cdda68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Split TARGET_BASEPATH from breakpad.Caroline Chao2011-11-112-59/+62
| | | | | | | | | | | | | | 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>
* Fix warning when using QXmlInputSource with non opened QIODeviceShane Kearns2011-11-111-1/+2
| | | | | | | | | | | | | | | | 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>
* Fix parsing of #if defined expressionOlivier Goffart2011-11-112-3/+25
| | | | | | | | | 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>
* Doc: Added more appropriate links to help reduce confusion.David Boddie2011-11-111-0/+2
| | | | | | | | | 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>
* Removed include to qdatastream.h from qmetatype.hOlivier Goffart2011-11-101-4/+2
| | | | | | | | | | | | | | | 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>
* Update V8Aaron Kennedy2011-11-1024-2809/+1901
| | | | | Change-Id: Ic239ef1e55bed06260e4a04cc2199f64c2d30059 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fix Q_STATIC_ASSERT on MacJoão Abecasis2011-11-101-1/+1
| | | | | | | | | | | 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>
* Updated Qt::InputMethodQuery documentationPekka Vuorela2011-11-101-7/+22
| | | | | Change-Id: Ibd27231366e4af2780bfe2f8f735da74dc04a1cf Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Document QInputMethodQueryEvent classPekka Vuorela2011-11-102-10/+28
| | | | | Change-Id: I6e98f9e690b733a06ee165e5b01ab6a5a784791b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QWidget text editors to commit text on their own on losing focusPekka Vuorela2011-11-107-8/+15
| | | | | Change-Id: I3b907661e8a24a6dbdaabf607c5c528b1b471c98 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QTextEdit to use tentative commit instead of QInputPanel::commit()Pekka Vuorela2011-11-102-5/+25
| | | | | | | Latter to be deprecated. Change-Id: I2c302c73a7ab2f4201af6a3c6fb4a64a4760263e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Implement partial tentativeCommit support in QTextEditPekka Vuorela2011-11-106-10/+56
| | | | | | | Available on plain text for now, html support still pending. Change-Id: I0818b97874e80c8c1b33a9127aa7bb3330a8761d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add isDebugBuild() query function to QLibraryInfoaavit2011-11-102-16/+21
| | | | | | | | 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>
* Compile.Morten Sorvig2011-11-102-2/+7
| | | | | | | | QNSPanel must be a NSPanel and not a QNSWindow subclass. Change-Id: I1de31e147757824610f4aabc0ef66ae3906dc0f6 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Re-enabled passing tests in tst_qabstractprintdialogJo Asplin2011-11-102-2/+1
| | | | | | | | | | | 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>
* Re-enabled passing tests in tst_exceptionsafety_objectsJo Asplin2011-11-102-2/+3
| | | | | | | | | | | 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>
* Cleanup corelib autotestsJason McDonald2011-11-1030-3815/+3790
| | | | | | | Remove literal tabs. Change-Id: I210a0259773cceb20d35ebc80b889e3ebb88b540 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove redundant #defineJason McDonald2011-11-101-7/+4
| | | | | Change-Id: I27a47653d2c41741f39ee1fea6a1fed063279994 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Propagate QTest::mouseEvent keyboard modifiers.Andrew den Exter2011-11-101-7/+7
| | | | | | | | | 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>
* Remove unused MMX/3DNOW/SSE/SSE2/SSSE3/NEON custom compiler logicBradley T. Hughes2011-11-101-158/+0
| | | | | | | | 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>
* Fix build when QEGL_EXTRA_DEBUG is defined for debug outputJohannes Zellner2011-11-091-11/+11
| | | | | | | Also shift EGL configuration plot above window surface creation Change-Id: I2de860e087cb2648b6e8e9b75365fbe78fe7687a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* support the obj-c #import statement in the dependency generatorOswald Buddenhagen2011-11-091-1/+2
| | | | | | | | Task-number: QTBUG-21965 Reviewed-by: joerg (cherry picked from commit d2c7193107a170e2884db52272f4d0ee0da62856) Change-Id: I8a5eb47bfd2c2ee9d064f054565915e64e4902f8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Adopt eglfs platform plugin to changed QEGLPlatformContext APIJohannes Zellner2011-11-091-2/+2
| | | | | | | eglClientVersion is not used anymore Change-Id: I8595a17386c1466d7766522adbdbd7cd5002ecf8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Correctly normalize timevals before calling select()Bradley T. Hughes2011-11-092-9/+5
| | | | | | | | | | | | | | | | 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>
* QVariant: Fix MSVC compiler warning about unused variable null.Friedemann Kleint2011-11-091-2/+1
| | | | | | | | | 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>
* Remove unnecessary variable self-assignmentBradley T. Hughes2011-11-091-2/+0
| | | | | | | | | | | | | | | | | 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>
* Assign function argument to class member, not to itselfBradley T. Hughes2011-11-091-1/+1
| | | | | | | | | | | | | | 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>
* Un-internalized QDBusServerPekka Vuorela2011-11-091-1/+0
| | | | | | | | 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>
* Removed obsolete host.pro from qtbaseJo Asplin2011-11-092-6/+0
| | | | | | | | 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>
* Deleted qtipc autotest from qtbaseJo Asplin2011-11-0928-2886/+0
| | | | | | | | | | 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>
* Fixed typo: private-tests -> private_testsJo Asplin2011-11-091-1/+1
| | | | | Change-Id: I8bc53061a6b7a8605290dca0d90e67d7660b4c33 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Re-enabled passing tests in tst_qopenglJo Asplin2011-11-092-2/+8
| | | | | | | | | | | 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>
* Cocoa: Implement mouse and keyboard grab.Morten Sorvig2011-11-092-3/+53
| | | | | Change-Id: Id53ff19d43213d79aaf8f1a6617a06ef9d0cfb4b Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Widgets: Remove dialog functionality from QGuiPlatformPlugin.Friedemann Kleint2011-11-094-129/+10
| | | | | | | | | | (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>
* [optimization] QVariants comparisonJędrzej Nowacki2011-11-091-2/+2
| | | | | | | | | | | 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>
* Add QPolygonF to metatype system.Jędrzej Nowacki2011-11-095-5/+13
| | | | | | | | That was strange that QPolygon was know to QMetaType class but QPolygonF not. Change-Id: I67bb99644b8b1d0fe1aec730619d8048cb78219b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Make usage of internal QVariant space.Jędrzej Nowacki2011-11-097-728/+521
| | | | | | | | | | | | | | | | | | | | | | 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>
* Implement QMetaTypeSwitcher.Jędrzej Nowacki2011-11-092-1/+103
| | | | | | | | | | | | | | | | | | | 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>