summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | remove now unused QMakeProject c'torsOswald Buddenhagen2012-03-022-9/+5
| | | | | | | | | | | | | | | | | | Change-Id: Ia65d49df50a5610bbd88417ca90ac348a774a1e1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | make evaluation of spec+cache independent of build pass contextOswald Buddenhagen2012-03-024-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't inject the build pass specific variables into the project even before evaluating the .spec file and the .qmake.cache. they are not supposed to base configuration on that - feature files should do that later. the immediate advantage of this is that base_vars is never manipulated upfront any more, which allows for cleaner setup paths. also, we can do more caching of the spec+cache contents. Change-Id: I19d7f8bec1fb7c3b54121e26794340b287055ebf Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | Remove the LIBS from platformsupportJørgen Lind2012-03-022-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The application / library that uses this should know it needs to link to ie. udev, xrendr etc. Change-Id: I9e3ffd4d98b3bd66abb8e621378b010da7feda7a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* | | Fix get_accFocus() to return CHILDID_SELF when it returns itself.Jan-Arve Saether2012-03-021-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means that the AT client knows it should not have to ask for the focus child anymore. Previously, some clients (NVDA) kept on asking infinitely because of this. Change-Id: Ia2bd2e1088a899f7d1a0c9189024accdacfd693b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | | Improve debugging in the windows accessibility bridge.Jan-Arve Saether2012-03-022-33/+59
| | | | | | | | | | | | | | | | | | | | | | | | set QT_DEBUG_ACCESSIBILITY=(1|0) to turn logging on or off Change-Id: Ibd5b77699decf0cf02bc6b6cc656fa237de29124 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | | Fix QWizard autotest for Windows 7 Classic themeMiikka Heikkinen2012-03-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | QWizard always forced Aero style even if Classic theme was used. Added a check for Classic theme into initialization. Task-number: QTBUG-24618 Change-Id: I0793df62e022037835e1c1a311143f06cc4382b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Use correct types in QResource.Robin Burchell2012-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qHash() returns uint, not int, so change all interactions with hashing to use uint to match. This blocks the introduction of a new (better) hashing algorithm because it currently breaks numerous tests: rcc would (correctly) write a uint hash value to the qrc files, but QResource would attempt to mangle it around as an int. This wasn't a problem with the old hash, because it deliberately threw away data (h &= 0x0fffffff), possibly because of someone not being able to diagnose precisly this problem. Change-Id: I46fb42acc100fdd3bedd714f6dc91aeca91d0351 Reviewed-by: hjk <qthjk@ovi.com>
* | | don't announce a dynamic .qmake.cache if we don't actually create oneOswald Buddenhagen2012-03-021-3/+4
| | | | | | | | | | | | | | | | | | | | | otherwise we are breaking the "less hacky" configurations. whoops. Change-Id: Ibb037753fbaf30beae3d30173be77d48b978b60b Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
* | | Improving clipboard integrationKevin Krammer2012-03-022-39/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Derive a data accessor class from QMimeData so application level code can query MIME type availability through it or directly attempt to fetch data by MIME type even if the type is not yet known to QBBClipboard. Also make sure any MIME type used by the application in setMimeData operations is checked for availability when being queried for formats. Change-Id: If8174adf3f3383496a354d291ef7d36b9732be1d Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* | | Fixing z-ordering of windowsKevin Krammer2012-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The application root window is at z-order == 0, all platform windows created for Qt windows are its descendants, so their base value for z-order needs to be 1. Change-Id: I7c9615ffac6757c31900a7640eb0ffdd6065b722 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Nick Ratelle <nratelle@qnx.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
* | | Make the CONFIG and QT_CONFIG contents available downstream.Stephen Kelly2012-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | Change-Id: I62dbc5a695e41179de9f6acd11aa7bc592cac6f3 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Fix sizing in QGraphicsView itemsAtPosition auto testJonathan Liu2012-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The auto test may fail incorrectly depending on the width of the QGraphicsView frame. To ensure more consistent test results, the frame is disabled. Change-Id: I8d70fb07e45803230954f776947d525e4cf9050f Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Add additional QGraphicsView tests for regressionJonathan Liu2012-03-021-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional tests for graphics view tooltip regression introduced by 7c0d15a22266a425c9e9ac0120d6774e120fe01e. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: I5e0d0e19504730a3e14ac84712a366dbebe688e6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> (cherry picked from commit aaa46755dcc15b8baaa0d1b928828eb60e0babbc)
* | | Revert "Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition."Jonathan Liu2012-03-021-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7c0d15a22266a425c9e9ac0120d6774e120fe01e. The commit caused a regression whereby tooltips may be shown even if the mouse is not over the item if it has the Qt::ItemIgnoresTransformations flag and the QGraphicsView had been scaled. Task-number: QTBUG-17517 Task-number: QTBUG-22663 Change-Id: Ib7fd788d9712c5e659fe07182f9505a4eb135ab2 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> (cherry picked from commit 15c14584199dc43e4a309fc331f3144009008128)
* | | Export QPaintEnginePrivate from QtGuiBradley T. Hughes2012-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows the QCoreGraphicsPaintEngine to use QPaintEnginePrivate members (e.g. pdev and drawBoxTextItem()). Change-Id: I5bed3cb007ae469816afce619edd55f155b04fa9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Remove Q_BYTE_ORDER and -*-endian arguments from configuresBradley T. Hughes2012-03-027-241/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not write Q_BYTE_ORDER to qconfig.h in the configures. Instead, we #define Q_BYTE_ORDER in qprocessordetection.h, since many CPUs only support a single endian format. For bi-endian processors, we set Q_BYTE_ORDER depending on how the preprocessor sets __BYTE_ORDER__, __BIG_ENDIAN__, or __LITTLE_ENDIAN__ (instead of using a compile test to do so). For operating systems that only support a single byte order, we can check for Q_OS_* in addition to the preprocessor macros above. This is possible because qprocessordetection.h is included by qglobal.h after Q_OS_* and Q_CC_* detection has been done. Do this for Windows CE, which is always little- endian according to MSDN. Change-Id: I019a95e05252ef69895c4b38fbfa6ebfb6a943cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Fix QApplication autotest crash when running on multiple screensMiikka Heikkinen2012-03-025-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Screens need to be destroyed in reverse order to ensure the primary screen stays valid when other screens are destroyed. Task-number: QTBUG-24300 Change-Id: I9d9d710aa67ec045baa8bf292833ffe7d9eea935 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | | Add note about failing test when using shared-mime-info < 1.0David Faure2012-03-021-0/+3
| | | | | | | | | | | | | | | Change-Id: I3ba9d14d915a579b9e102114866f6c9e0344ba16 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Link against the precompiled header.Andreas Holzammer2012-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | This fixes the build for Visual Studio 2011. Change-Id: I8c43eef851d76f8cdde13a57ea3dcd9cf32df0ab Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Fix QPixmap::grabWidget() on Windows.Friedemann Kleint2012-03-022-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not draw on the backingstore DC when drawing to a pixmap. Access the paintdevice for checking via the QPaintEngine since QPainter returns the clipdevice, which is a widget. Fix warning about accessing handle of 0-window in the test. Task-number: QTBUG-24183 Change-Id: Ie91ea6ab9d09528c7ec1d35633f9a0ee667719b1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Support 16+4 mouse buttons within the generic/evdevmouse plugin.Rick Stockton2012-03-021-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Kernel's evdev module is capable of presenting up to 16 mouse buttons, plus wheel events (UP, DOWN, LEFT, and RIGHT). This patch updates our Plugin, so that it tranlates all of those button numbers into corresponding MouseEvent Qt::MouseButton values. Task-number: QTBUG-24590 Change-Id: Ib8cbb9500280c76f06a51ce95095e22ae84de1c6 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* | | clean up build pass project initializationOswald Buddenhagen2012-03-025-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | instead of messing with the Option singleton, add a way to inject extra config values into QMakeProject. Change-Id: Ia347dcc38af2c72913e30ebf5c2b4044f93b4f5f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | move finding the makespec to OptionOswald Buddenhagen2012-03-024-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | this is a one-time operation which depends only on the invocation, so this new home is much more appropriate. Change-Id: I07c66d95a9ae01a664cec17564995311fb78ec9b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | testlib: Add selftests for -v1 and -v2 command-line switches.Jason McDonald2012-03-0213-5/+1060
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests don't have their own source code but rather reuse the counting selftest with additional command-line options. Note that currently the -v1 switch only changes the plain text output, and the expected xml output is identical to that of the counting test. This may change in the future however. This commit also restores a couple of lists to alphabetical order, where the findtestdata selftest was not sorted into the list correctly. Change-Id: Ie38e255f8029157b34162b3864b5fa66e137d74a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | testlib: Improve documentation of verbose test logging options.Jason McDonald2012-03-021-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Change the help output to show which options only work for plain text logging. Change-Id: I39eb7cd0793cdbe553c230334c6cd532b4929f61 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | Add protocol type B support to the evdevtouch pluginLaszlo Agocs2012-03-024-11/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds optional support for libmtdev (a helper library which translates transparently from type A to B when using type A kernel drivers). Change-Id: Ic9c065b2fd130e9db2dd07e7dc103e9d45c08c99 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | search for default spec just like for other onesOswald Buddenhagen2012-03-021-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that way qtbase will find its spec without hacking .qmake.cache. note that passing "-spec default" on the command line would have already triggered the normal path, so artificial limitation did not even provide safety against abuse (it is arguably pointless/counterproductive for other projects than qtbase to have a default spec). Change-Id: Ib0c3e6498fd70cd6f9561951d72a47165878bb33 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | remove some bogus include locationsOswald Buddenhagen2012-03-013-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | nothing to be found in <sourcedir>/include. neither in <builddir>/src/corelib/xml. Change-Id: I381391a64542dc2ac7b421b6646c60a1b7a14639 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | use VPATH to locate sourcesOswald Buddenhagen2012-03-011-223/+11
| | | | | | | | | | | | | | | | | | | | | makes the file a "tad" more concise Change-Id: I81d9721942890659ac93b32f5988f9c005c88e87 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | merge Makefile.win32-g++{,-sh}Oswald Buddenhagen2012-03-013-353/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | the only difference is in the copy & del commands. the msys tools are tolerant about windows paths, so this just works. the in-makefile variant detection is stolen from tools/configure/. Change-Id: Ia283c1fe2e2aaa8cd5b1dfd7ae29244115f07d65 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | fix configure -redoOswald Buddenhagen2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | -redo must be the first argument (except -srcdir, which we treat differently), so let's pass the user arguments first. Change-Id: I5da37d1a6e1aec67449daf64b8bd2ffcc0b075a4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | cosmetics: remove redundant conditional, add a comment & reshuffle codeOswald Buddenhagen2012-03-011-4/+6
| | | | | | | | | | | | | | | | | | Change-Id: I71c7e18db63f3581b8c818ad178aeb4f6ccf9446 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | look for features relative to spec only in advertized placeOswald Buddenhagen2012-03-011-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | that is, spec/../features/ (i.e., mkspecs/features/) - and not any directory up to the root. Change-Id: Ie5fdf2898fba5ac93583571edc24629471604798 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Unset _NET_WM_USER_TIME_WINDOW before destroying the windowJan Arne Petersen2012-03-012-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise metacity was crashing when a QWindow was destroyed immediately after being activated, because metacity was trying to select events (XSelectInput) for the already destroyed m_netWmUserTimeWindow. Task-number: QTBUG-24492 Change-Id: Iedbe7bdd6b26110ca8bec6f33525209ae551ffd5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | Take into account input shaping in findRealWindowAlbert Astals Cid2012-03-013-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In previous commits we took into account bound shaping, but X also supports input shaping, so make sure it's inside both input and bounding shaping to consider the position as inside a window My tests show that when unset Bound Shaping and Input Shaping return the rectangle of the window itself, so we need to be inside both of the rectangle sets to consider the position as a dragabble position for the window Change-Id: I77973e51168d2a6d274d166f29f32e1bc02c32c3 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | make default_pro.prf advertize dynamically created .qmake.cacheOswald Buddenhagen2012-03-012-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moving the detection of .qmake.cache to the qmake startup had the side effect that a suddenly popping up cache would not be picked up by nested projects any more. this is not supposed to work in the first place, but the syncqt hack for building against non-installed modules relies on it. until we have cleaned that up properly, we need a way to notify qmake about the appearance of the cache file. Change-Id: I450646b936e3bb2ef2ed3aba05df58e521ccdc61 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* | | Fix tst_qregexp with QStringBuilderOlivier Goffart2012-03-011-133/+133
| | | | | | | | | | | | | | | | | | Change-Id: I1ac2a5c9ea5657ad2916465b77271e3d53c67cde Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | | Revert "Don't render glyph with FT with fetchMetricsOnly"Jiang Jiang2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report https://bugs.webkit.org/show_bug.cgi?id=79561 shows that this commit will cause significant slow down in text handling operations. Though the exact reason is unknown we should revert it first and find out the reason later. This reverts commit 692064bcfd116c2f3a2b30572e511ee68c6a0531. Change-Id: I16a56c3093bdfa2119ab6a6e9049ef2925468e29 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | Remove ARMFPA support and Q_DOUBLE_FORMAT detectionBradley T. Hughes2012-03-0111-395/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the -armfpa option the config.tests/unix/doubleformat* detection. The places where we used QT_ARMFPA and Q_DOUBLE_FORMAT has been removed as well. Rationale: ARM FPA with GCC does not work with EABI. Qt currently does not support compiling without EABI, making ARM FPA an impossibility. It is unknown whether other compilers provide ARM FPA support with EABI. Support for ARM FPA can be re-added in the future should the need arise, but since ARM VFP is available for ARMv5 and up, we should encourage implementors to instead use soft-floats or VFP. Change-Id: I3671aba575118ae3e3e6d769759301c8f2f496f5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Allow using multi fontengine in QTextLayout with QRawFont.Pierre Rossi2012-03-017-22/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables us to instantiate a QFontEngineMulti that takes the raw font's font engine as its primary engine but can use fallback engines based on the platform. Since this can be quite expensive, we defer the query for fallback families' names until it's needed and we cache the resulting multi font engine. Change-Id: I390dbc1cb2fe61d56867f29a03f313eb3eb49dc3 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | Add support for QRawFont in QTextLayout.Pierre Rossi2012-03-016-64/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this change is to allow shaping complex text while using QRawFont. This is needed for WebKit so that we can switch to using QRawFont everywhere and be more in line with what other WebKit ports do. Since this change slightly bends the aim of QRawFont, let's reserve this for internal use for now. Change-Id: I5ec0881f50ce288350bd277570cb5f1fb70c355c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | | Windows: Use correct drop data in processDrop().Friedemann Kleint2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix Qt Designer Drag & Drop. Change-Id: Iabed622efc5e23080f7a91b8d9e433e2c0cee063 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Cocoa: Implement QPlatformTheme:palette()Morten Johan Sorvig2012-03-016-3/+223
| | | | | | | | | | | | | | | | | | | | | | | | Causes a new test failure in QGraphicsProxyWidget::updateAndDelete, expand the EXPECT_FAIL to cover that one as well. Change-Id: If9da757206445d17510c4fac82a559de7b8c0563 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | Use QSystemError for QDnsLookup windows backendShane Kearns2012-03-012-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OS provides the error string in this case. This gives more information to the developer seeing a generic error. Change-Id: Ia03642982f3513ee5a8a9fa98d918e948f8d97a5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* | | Fix buffer overrun crash running MSVC2010 win32 Qt on win64Shane Kearns2012-03-012-32/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading dnsapi.dll as a plugin, we experience crashes because the calling convention is not specified. The default is _cdecl, but __stdcall (via the WINAPI macro) should be used for windows APIs. Mismatched calling convention results in corruption of local variables, probably because the stack pointer is incorrect and SP offsets are used in optimised builds rather than frame pointer offsets. Since the library has been available since Windows 2000, I don't think that we need to load it dynamically. (Unlike the unix version where it isn't part of the LSB) Also checked that the current release of mingw works. Task-number: QTBUG-24227 Change-Id: I37c0a6aa0c133799c2a6dd9391ca1435ba2539ea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | | QBoolBlocker: make constructor explicit and disable copyingMarc Mutz2012-03-011-1/+2
| | | | | | | | | | | | | | | Change-Id: If294eff3f84f837ed554c572527d46a89660de9c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Set texture parameters before allocating the texture.Gunnar Sletta2012-03-011-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Some drivers use this as a hint to decide on weither to preallocate mipmap memory or not. Change-Id: I2fd438a9625b658c7f30fe39a9d63ba5396f9679 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* | | qmake-test: Fix jom/nmake handling on Windows.Friedemann Kleint2012-03-011-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test fails if MAKEFLAGS is set up for jom since the test always uses nmake. Remove MAKEFLAGS from the process environment. Change-Id: Idaed3cc964832b83c282a59fc5257572c520b882 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* | | Add support for _NET_ACTIVE_WINDOW on xcbJan Arne Petersen2012-03-011-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a _NET_ACTIVE_WINDOW client message instead of xcb_set_input_focus for activating toplevel windows on xcb. According to the Extended Window Manager Hints the right way to activate a top-level window is using _NET_ACTIVE_WINDOW (when it is supported by the WM). Other approaches like calling xcb_set_input_focus should be avoided when possible, since the WM cannot intercept them. Change-Id: I9be4901f56cbcfb563baf73ccd71ff17a9bdc1d2 Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Skip the network SSL test on Windows.Friedemann Kleint2012-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For SSL, this would require an OpenSSL library to be installed. Change-Id: I2a320e7faf40ef925c90dbe539f912e4a8fc13fc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>