summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove WA_PaintOutsidePaintEventDebao Zhang2012-03-287-73/+3
| | | | | | | | | WA_PaintOutsidePaintEvent is only suggested to be used when porting Qt3 code to Qt 4 under X11 platform. and it has been broken now. Change-Id: Ie4297b2a449f1055ca10ada9efb930e6018b1efb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove AutoCompatConnectionDebao Zhang2012-03-283-35/+4
| | | | | | | | | | | The default type when Qt 3 support is enabled. Same as AutoConnection but will also cause warnings to be output in certain situations. Change-Id: I64bf3c39a740afb716820bfd3173936fda213f4a Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Allow auto tests to stay away from the user's configuration.David Faure2012-03-287-10/+186
| | | | | | | | | | | | | | | QStandardPaths now knows a "test mode" which changes writable locations to point to test directories, in order to prevent auto tests from reading from or writing to the current user's configuration. This affects the locations into which test programs might write files: GenericDataLocation, DataLocation, ConfigLocation, GenericCacheLocation, CacheLocation. Other locations are not affected. Change-Id: I29606c2e74714360edd871a8c387a5c1ef7d1f54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Ensure QTypedArrayData is just a shim over QArrayDataJoão Abecasis2012-03-281-0/+4
| | | | | Change-Id: I6f41ca054d0e0a0c4642f0b841b3b3df9559f818 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Improve output on test failuresJoão Abecasis2012-03-281-16/+14
| | | | | | | | | | | | | | | | | | | | This adds checks to ensure Q_ALIGNOF is returning the desired alignment for explicitly-aligned types. The alignment check is now inlined in the test inside QCOMPARE so we get slightly more informative errors: FAIL! : tst_Collections::alignment() Compared values are not the same Actual (quintptr(&it.value()) % Value::PreferredAlignment): 64 Expected (quintptr(0)): 0 Loc: [tst_collections.cpp(3384)] In this case, this is enough to notice "non-native" alignments are being requested. Having test parameters otherwise hidden in template arguments doesn't help the situation. Change-Id: I05267fd25b71f183cfb98fb5b0a7dfd6c28da816 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Silence unused comparison result warnings (clang)João Abecasis2012-03-281-4/+4
| | | | | | | | | | | | | The intent is to force instantiation of template container classes and semantics or behaviour are otherwise irrelevant in this context. tst_collections.cpp:3036:15: warning: inequality comparison result unused tst_collections.cpp:3037:15: warning: equality comparison result unused tst_collections.cpp:3100:15: warning: inequality comparison result unused tst_collections.cpp:3101:15: warning: equality comparison result unused Change-Id: I70ad38b18dcbc43879e36a34b1da460aee5f7b07 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix loop conditions, after warnings from clangJoão Abecasis2012-03-281-2/+4
| | | | | | | | tst_qmap.cpp:697:43: warning: inequality comparison result unused tst_qmap.cpp:717:50: warning: inequality comparison result unused Change-Id: I300f9e10b7748306b99c3c8c38f3cc2661a569ad Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Don't hardcode the order of elements in QHashesThiago Macieira2012-03-282-32/+15
| | | | | | | | | Instead use QMap if we want a stable order. Task-number: QTBUG-24995 Change-Id: I93f643df236f5078768f539615fa47163e5262e8 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Unit-test the additional QBasicAtomicXXX expansionsThiago Macieira2012-03-282-6/+114
| | | | | | | | | | | Test that they do expand properly and don't produce errors. This is templated code, so it doesn't get tested fully unless we instantiate them. Also check that the alignments are correct. Change-Id: I2a8ee2165167f54b652b4227411e209850974b8e Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove workaround for QComboBox not having a USER property.Stephen Kelly2012-03-283-8/+31
| | | | | | | | | | QComboBox does in fact have a user property since b1b87a73012342dc1619a8e907ea9954d59ca564. Change-Id: I24eb2ef267cec5d8a9f7348954b703fa6df04fa5 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> Reviewed-by: David Faure <faure@kde.org>
* Add USER properties to QDateEdit and QTimeEdit.Stephen Kelly2012-03-286-24/+43
| | | | | | | | | | | | Both classes had such components before, but there were issues with the NOTIFY signal not being in the same class as the Q_PROPERTY. This patch solves that problem by using a signal of a different name. Task-number: QTBUG-15731 Change-Id: Ibc7ce4dba8a6b88c05d62a90e14d0101c5cd3082 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
* Unify the atomic implementation for x86 architecturesThiago Macieira2012-03-284-394/+96
| | | | | | | | | | | It's almost exactly the same code in both files, so let's have one file only. That means we need an #ifdef for the special case of 64-bit types on i386. Also take the opportunity to add a comment explaining how this works. Change-Id: I50d274fa026806ae511b1045aa8a5c25daaa0edc Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Rename qatomic_x86_64.h to qatomic_x86.hThiago Macieira2012-03-283-3/+3
| | | | | | | | | This is the first step in merging the i386 and x86-64 architectures. The next commit will bring i386 support into qatomic_x86.h. Change-Id: I24105ea70f3fc29b3fb779a70053f99117440573 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fail when no translations found, reset pointers on failureJoão Abecasis2012-03-281-0/+14
| | | | | | | We don't want to be using or trusting partial loads. Change-Id: I3934d6cf54cd99eaab2fa7aee9a0e9968d9f3c13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use Big-Endian conversion functions from qendian.hJoão Abecasis2012-03-281-6/+4
| | | | | | | | These avoids repeating code and documents that the underlying format is compacted big-endian. Change-Id: I5a2dc0084945d99368183203a0a9b7c116874620 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove unused argumentJoão Abecasis2012-03-281-7/+1
| | | | | | | | | The mode argument (third argument to (_)open) is only used when (_)O_CREAT is also specified. As we're opening the file read-only it is unused and unnecessary. Change-Id: Icc16edec5a7d44c57ad02865048c56114c39d4bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* There's no need to check pre-validated inputJoão Abecasis2012-03-281-8/+6
| | | | | | | | elfHash and friends are used solely from do_translate, which already checks for null strings. There's no need to do it again here. Change-Id: I90a16d2623ca753a444e53952539001988568bdb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use accumulating hash, instead of allocating intermediate stringJoão Abecasis2012-03-281-4/+17
| | | | | Change-Id: Ie93ac8df3066159ad11ff7f68c7ba85e7f5aa8bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make QTranslator testcase independent of WidgetsJoão Abecasis2012-03-282-9/+7
| | | | | | | | There isn't really a need for the dependency as LanguageChange events can be caught in QObject::eventFilter, directly. Change-Id: I39778fbe1663924d97705b514ae399cfd3749776 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Avoid overflow in boundary checkJoão Abecasis2012-03-271-1/+1
| | | | | Change-Id: I4f397795a65d5d6ea237a6751588a8dc6be15bdc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge master into api_changesKent Hansen2012-03-27128-2042/+1803
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d
| * Disable ICC diagnostic 2261 about __assume with side-effectsThiago Macieira2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The warning is presented now that we use __assume in every Q_ASSERT. It presents itself in code that calls functions, like: tools/qbitarray.h(128): warning #2261: __assume expression with side effects discarded { Q_ASSERT(i >= 0 && i < size()); ^ Change-Id: I5851b3c35b56c00b9c541c2489233121ef621e04 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * device: Add -device and -device-option to configureGirish Ramakrishnan2012-03-275-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reference platforms and SDKs we will need to pass in extra paths. Currently users have to modify the mkspec to adjust paths or set environment variables that will be picked up. This change introduces the -device <name> and -device-option <key=value> option. The key value pairs will be written to a qdevice.pri and can be used by the qmake.conf of the device spec. The reason to not save the key value pairs in qconfig.pri is becase of the fact that the device spec loads the qdevice.pri earlier than the qconfig.pri. qdevice.pri allows the mkspec to set the compiler flags and qconfig.pri allows configure to add to those compiler flags. Done-with: Holger Freyther Change-Id: I931a197b8be72397e1eedfee09502eefc01c9d4f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com>
| * Mark tst_qdialog as insignificant on mac.Rohan McGovern2012-03-271-0/+1
| | | | | | | | | | | | | | | | | | This autotest gives different results on consecutive runs, and is therefore insignificant for the purpose of detecting regressions. Task-number: QTBUG-24977 Change-Id: I5c4dfd663ce5df6b60ae47a29d332c06e3c0585f Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
| * Sync configure with Unix version (-make/-nomake)Marius Storm-Olsen2012-03-272-9/+25
| | | | | | | | | | | | | | Move previous -make <exe> feature to -make-tool <exe> Change-Id: I1cbc87e60e2588fd8b2a11c11178988003cac7c1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Cocoa: initialize QCocoaEventDispacherPrivate::lastSerialBradley T. Hughes2012-03-261-0/+1
| | | | | | | | | | | | | | | | This silences warnings from valgrind about a conditional depending on an uninitialized value. Change-Id: I819a44ed5dc02e163c00849811870c94f66b6651 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Remove old code that was for the MIPSpro compilerThiago Macieira2012-03-261-14/+1
| | | | | | | | | | | | | | That compiler is no longer supported Change-Id: I6ff9003a8b986478850ad2e6e6662a44264236d7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix annoying deprecation warning about QImageTextKeyLangThiago Macieira2012-03-261-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we deprecate the entire class, then we get the warning for every use of it with GCC, including the three operators defined inside the class. So instead, mark as only the constructors as deprecated, which should reduce the warnings to the places where the class was instantiated. That should be enough to poison the code enough: to fix the warning, you need to stop using the class there and/or stop calling one of the deprecated functions that deal with it. Unfortunately, we still get one more warning inside the inline code, in QImage::textList. To remove that warning, we disable all deprecation warnings around that code block. Change-Id: If3c11647a9d2cab055e15810d7cfe0d8f5e7042f Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * let qtPrepareTool give right path for app_bundleBai Jing2012-03-261-0/+6
| | | | | | | | | | Change-Id: Ieb4979244d741c9d9d0c11a035c18ced87ea28f5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Blackberry mkspecsRafael Roquetto2012-03-264-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | Unlike QNX mkspecs, these mkspecs target more specific, BlackBerry-only devices. So far, the only difference is the definition of Q_OS_BLACKBERRY and linking with -lbps, but this will likely change with time. It will also allow conditional compilation to distinguish between qnx and blackberry devices. Change-Id: Ia44e9b4059f720c308240e9dac7e90f7ae7920d0 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Cocoa: Remove unused qt_mac_is_sheet() functionBradley T. Hughes2012-03-261-11/+0
| | | | | | | | | | | | | | | | The static qt_mac_is_sheet() function in qcocoafiledialoghelper.mm was not called anywhere, remove it. Change-Id: I88785e15aa17ae9c9ffbc33eba30433c8834b798 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Cocoa: silence warnings about unused variablesBradley T. Hughes2012-03-266-3/+6
| | | | | | | | | | | | | | | | Silence warnings about unused function parameters and local variables while building the Cocoa platform plugin. Change-Id: I6aedc4cb21c5fb48d2d6e501561473d3f7112aed Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Cocoa: silence warnings from QCocoaBackingStoreBradley T. Hughes2012-03-261-16/+1
| | | | | | | | | | | | | | | | Remove unused (and misspelled) flipedRect() function, as well as several unused variables. Change-Id: I48a5bf2eaad67686f60523a5c22262cad5314128 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Cocoa: QCocoaWindow::clearNSWindow() needs to cleanup properlyBradley T. Hughes2012-03-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | clearNSWindow() should also clear the delegate and remove the contentView from the window, since we are no longer using that window. Make sure the QCocoaWindow::~QCocoaWindow() doesn't release the m_contentView until after clearNSWindow(), to avoid crashes while trying to cleanup the window and view. Change-Id: Ia081488f629a4fd4cf10fb1053fb8183b1914d35 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Reunite NAS support in configure with QSoundDonald Carr2012-03-261-10/+0
| | | | | | | | | | | | | | RIP Change-Id: I7c47052ce4962f10dbcbbb8d48f05b3158d4a69a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Cocoa: don't show window when calling raise()Bradley T. Hughes2012-03-262-5/+6
| | | | | | | | | | | | | | | | | | | | | | Calling raise() on a hidden window should not show it. The setVisible() function will ensure that the window is raised (since we use orderFront or makeKeyAndOrderFront). This fixes the failing tst_QDockWidget::task169808_setFloating() test as well. Task-number: QTBUG-24774 Change-Id: If34472ebbcd615c10654efafd54c84c03d10bc8c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix measurement system for the UKLars Knoll2012-03-265-9/+35
| | | | | | | | | | | | | | | | THe UK still uses the Imperial system at least for distances and many other things. Change-Id: I99379de35620114328ad6a7fc9b226a46692bedd Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| * Password editor mask delay stylable by platform pluginPekka Vuorela2012-03-267-37/+19
| | | | | | | | | | | | | | | | | | Replaced hard coding as QT_GUI_PASSWORD_ECHO_DELAY with a style hint. Change-Id: I0b78ebad723dbe19d9b9496583203e31545874e2 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Test mouse events more thoroughly in QWindow autotestLaszlo Agocs2012-03-261-5/+118
| | | | | | | | | | | | | | | | | | | | Apparently there are still issues here and there (e.g. in declarative) with properly recognizing more complex event sequences (like triple clicks). The behavior of qtbase is correct but we need a test case that makes sure the functionality will not regress. Change-Id: I08c558fcfdde0dd06e194b4f0affc6f6896573bf Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Cocoa: reimplement QPlatformWindow::setOpacity()Bradley T. Hughes2012-03-262-0/+7
| | | | | | | | | | | | | | | | Qt and Cocoa opacity levels are compatible, so we just need to forward the setOpacity() argument to [NSWindow setAlphaValue] Change-Id: I5fd5678894fd6949811ad1c4b493e592561f01f6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix for fontconfig 2.9 behavior changeJiang Jiang2012-03-261-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start from 2.9, fontconfig will reset the result to FcResultNoMatch at the beginning of FcFontSort(). According to http://lists.freedesktop.org/archives/fontconfig/2012-March/003857.html the result value of FcFontSort() can be ignored, checking the nfont value of the fontset returned is sufficient. The fix works for pre-2.9 versions as well, since those versions don't touch the result at all. Change-Id: Iba6c1157e314088a90867292a4bd970bb873e284 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Remove dummy impl. of shared graphics cache in XCB pluginEskil Abrahamsen Blomfeldt2012-03-267-1279/+2
| | | | | | | | | | | | | | | | | | This implementation was disabled and didn't really work properly, so it doesn't make sense to update or do bug fixes to it. Removing it completely instead. Change-Id: I62abe35f0f9a91bb207b87296d25c3c62d58228e Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * Cocoa: reimplement QPlatformBackingStore::scroll()Bradley T. Hughes2012-03-262-0/+13
| | | | | | | | | | | | | | | | Use qt_scrollImageInRect() from QtGui to accelerate scrolling in the Cocoa plugin. Change-Id: I8ad1377ed3307345f72d17c72049cec5472c97d3 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix QGuiApplication::keyboardModifiers()Bradley T. Hughes2012-03-264-21/+84
| | | | | | | | | | | | | | | | | | Make sure that the keybaord modifiers are maintained properly when handling window system events. Change-Id: Ie75cbe5eb509c29e3d2291694f2de509fbf3098a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Cocoa: send key events for modifier keysBradley T. Hughes2012-03-261-0/+37
| | | | | | | | | | | | | | | | Implement -flagsChanged: in QNSView so that we can calculate the necessary modifier key events to send. Change-Id: I3de89537d6e22b4a6d69ae646a71d9722dd9f82a Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Cocoa: keep a NSWindow pointer in QCocoaWindowBradley T. Hughes2012-03-261-1/+1
| | | | | | | | | | | | | | | | The NSWindow we create could either be a QNSWindow (our NSWindow subclass) or a QNSPanel (our NSPanel subclass). Change-Id: I6e5c18328bf0fd1786a042d1fddc5b3e8be17f89 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| * Fix qtnamespace compile break on Mac.Sarah Smith2012-03-267-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appears as though the QT_NAMESPACE macros are incorrect here. In fact in qisenum.h because the #define is no respecter of a namespace in most of these conditional compile cases they will be ignored effectively. The QT_HEADER also - if qtypetraits.h conditional compile occurs then it will result in adding extern "C" { twice. For the macros invoking them will not cause the extern "C" { to be used anyway, so just remove this altogether. Task-number: QTBUG-24903 Change-Id: I710dc330f58357f395241a0cf3172e41a5864576 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Glenn Watson <glenn.watson@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * Fixed qthreadstorage unittest to work from install directoryKurt Korbatits2012-03-261-0/+4
| | | | | | | | | | | | | | - Added install of crashonexit sub program Change-Id: I2cc3043d5c1b879665930552487b4fe54407fd25 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * Remove the Q_STATIC_TEMPLATE_SPECIALIZATION macroThiago Macieira2012-03-263-9/+0
| | | | | | | | | | | | | | | | This was necessary only for older MS Visual Studio versions, which are no longer supported anyway. Change-Id: I6c96fb2340296c34b480716303c93b892419229b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Remove the use of a template qUnused function for ICCThiago Macieira2012-03-251-1/+1
| | | | | | | | | | | | | | | | ICC 12 does not seem to need this. Change-Id: I98e9d530e767c4d24424f0c2b5d763f863e85fe4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 11:19:48 +0000