summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Implement nativeResourceFunctionForContext for xcbJorgen Lind2012-07-062-2/+12
| | | | | Change-Id: Icf6c39fb456b39fec58ac2f74c569b9d01993589 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qdoc: Removed several #if 0 blocks.Martin Smith2012-07-068-317/+0
| | | | | | | Removed a lot of dead code. Change-Id: I237521efab7dd046d3a47ab92a6a0e083c59ab55 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qt_parts.prf: fixed examples, tests, tools always disabledRohan McGovern2012-07-061-4/+4
| | | | | | | | | exists() resolves the path relative to qmake's current working directory, which is mkspecs/features. Explicitly refer to the full path. Change-Id: I04e9f377528bffc1ebeeed69c86d73b85a117423 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* fixed cursor handling on winceBjoern Breitmeyer2012-07-064-1/+68
| | | | | Change-Id: Iea91dde458b0e41a55ba6cb3e157756a1473f653 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Clean up attribute arrays flags in OpenGL glyph cacheEskil Abrahamsen Blomfeldt2012-07-061-0/+3
| | | | | | | | | When used in the SceneGraph we're expected to disable the arrays after we're done, otherwise we'll get a warning about memory corruption and crashes. Change-Id: Ie8e426309716bef4b75d79039e8ca0b4943c79e7 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* windows hosts of course also need exclusion from mkspecs_preOswald Buddenhagen2012-07-061-2/+2
| | | | | Change-Id: I90de625b1b521977a4dc1cd499eb6ece02d837f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* eglfs: Allow setting screen size through environment variables.Robin Burchell2012-07-061-0/+16
| | | | | | | | | | | | This adds: - QT_QPA_EGLFS_WIDTH - QT_QPA_EGLFS_HEIGHT If both are set, fb0 detection is completely bypassed, otherwise, the environment variables act as an override for the fb0 values. Change-Id: Iaf38c8b0d40ce0a921bb6c5dbf31af788802d3fa Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* android: work around android's linux/input.h being retarded.Robin Burchell2012-07-062-0/+35
| | | | | | | | It seemingly doesn't include many of the required defines for evdev, so do what everyone else seems to do, and work around it. Change-Id: I4a6ffb548c7370f675c736177b63220f034d06b8 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* android: Fix evdev configure test.Robin Burchell2012-07-061-7/+4
| | | | | | | | Android doesn't define a number of items in its input.h for MT, so don't test for them here. They will still work, they just need manual defines. Change-Id: I471f55b7c7f8950d2048e525119b2b36c8e9743b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* don't blow away mkspecs/modules-inst when reconfiguringOswald Buddenhagen2012-07-051-0/+9
| | | | | | | | | | | | | otherwise we get lots of nasty warning messages about missing pri files. it is arguable whether it is a good idea to do that, but we preserve mkspecs/modules, too, and the previously built libraries don't just vanish, either. Change-Id: Ieded8d8858f1b0135bc3bea894b4a676024ac8ca Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* centralize handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-052-30/+45
| | | | | | Change-Id: I33b8c3958a102d87461ad887fa5749bd9a6dc037 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* make non-bootstrapped non-installed prefix-built executables runnableOswald Buddenhagen2012-07-052-15/+93
| | | | | | | | | tools like idc and lrelease are outside qtbase/bin and depend on libraries which are not in any search path, so we need some way to let the modules announce the locations (qt_tool.prf) and use it (in qtPrepareTool()). Change-Id: I98d5109cbee5e745d86dde94e3dc791d42edc3ec Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* set DLLDESTDIR only for non-prefix buildsOswald Buddenhagen2012-07-051-1/+1
| | | | | | | a prefix build needs to be installed first anyway Change-Id: I798861fddad2be289e9e4f182d0373e389b57437 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* set DLLDESTDIR to the build dir, not the install dirOswald Buddenhagen2012-07-051-1/+1
| | | | | Change-Id: I0aa3b512e5d633c5628c4bb285f96a41cda858d9 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* don't use a different de-duplication algo for the library list in mingw prl ↵Oswald Buddenhagen2012-07-052-17/+0
| | | | | | | | | | | | | | files i have no idea why that was done (the commit message says "not sure why it works elsewhere"), but it makes no sense whatsoever, specifically doing it only on mingw. probably some workaround, as usual. the de-duplication is broken by design anyway. This reverts commit 7a6302c2baf6861fdaf65992b71a7676859860c2. Change-Id: I6edecaa062570e59eccd24d50919ba132e65a403 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Disable dedicated screen event thread by default.Rafael Roquetto2012-07-051-3/+3
| | | | | | | | Screen events should come through QEventDispatcherBlackberry by default. Change-Id: I64d17b99e9dd8edf23f68e1186e9318849f1a398 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* tst_QTcpServer::linkLocal fix for Windows XpMartin Petersson2012-07-051-0/+3
| | | | | | | | Do not try to connect to the Terdo Tunneling Pseudo-Interface as this will fail for Windows Xp. Change-Id: I6dcd8369ba1e8642224cd4ac53f4032ed46d050d Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* QHeaderView - adding an auto test with saveState and restoreStateThorbjørn Lund Martsum2012-07-051-0/+22
| | | | | | | | This test is nice to have regardless though the main reason for it is a refactor of hiddenSections in QHeaderView. Change-Id: Id41a1d5edda2ef75bf432a78cdb3e952303eae92 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView - resizeSection improvementThorbjørn Lund Martsum2012-07-054-1/+129
| | | | | | | | | | | | | | | | | This patch improves the manual resizeSection a bit. Before we didn't consider that the program could maybe resize other sections when the user was resizing one section. The main issue with that is that setOffset is so smart that it helps moving the mouse cursor - however it really shouldn't do if the program is trying to change something too. Maybe this won't solve all (possible) problems at once - but it is a fixed needed just to make something work - trying to make anything work without this fix is horrible.... Change-Id: I3cefa375a9b8ee4c1ef1e08ba0900025c671e4c6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix event loop throughput issueRafael Roquetto2012-07-051-8/+25
| | | | | | | | | | Currently, only one bps event can be handled per event loop iteration, bringing about a huge performance penalty. This patch fixes this issue by bulk processing events whenever they are available. Change-Id: Iecce1e86730bd90c3c81a7c6ebdf9ed83189e58e Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Do not delete m_blitProgram more than onceJiang Jiang2012-07-051-1/+0
| | | | | | | | | | | When m_blitProgram is created the constructor will add it to QOpenGLContext as a child of that QObject, so it will be deleted when that QOpenGLContext is deleted as QObject will delete its children in destructor. Delete it here will cause crash in thread termination. Change-Id: If9d3287d159cc3276b6a840a584a1b212b9c9fd0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix FRAMEWORK_INCLUDE for MacIikka Eklund2012-07-051-1/+1
| | | | | | | | | | | | On Mac the framework include paths were generated wrong. The $${MODULE_NAME} was missing. This patch fixes the framework include path generation. Change-Id: Ic0e8d69ac7ac63be755302dc822c28240c9bc3d2 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Support for overlay-scrollbars on MacChristoph Schleifenbaum2012-07-056-40/+449
| | | | | | | | | | | | | | | On Lion scroll bars are within the scroll area itself and are not being shown as long as the user is not scrolling. This patch draws the new scroll bars and makes them fade away. Further it introduces a pixel metric checking for this behaviour. It's used by QAbstractScrollArea to put the viewport to the correct place. Task-number: QTBUG-21673 Change-Id: Id530265043549318ac420b392de6b8642deaa4c6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Sync QWindow properties on NSWindow creation.Morten Johan Sorvig2012-07-051-0/+6
| | | | | | | Synchronize size hints, window title, flags and state. Change-Id: Ibc2358d8d4d0625aaddfbcad159e3682e3e79d3c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* qdoc: The \br macro is promoted to a qdoc commandMartin Smith2012-07-055-0/+14
| | | | | | | | | | | The \br macro, which is used to insert a line break in the output text, is now promoted to be a qdoc command. For html, it outputs a <br/>. For DITA XML it does nothing. Task Nr: QTBUG-26435 Change-Id: Ie0542c9053f68473ccaa2f50ace74baa30f78dd0 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove insignificant flag because all tests are passing.Toby Tomkins2012-07-050-0/+0
| | | | | | | | Task-number: QTBUG-26432 Task-number: QTBUG-23050 Change-Id: Iafec02ed5008fc53b32f405a431e0987322c0d3a Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Replace insignificant test with QEXPECT_FAIL.Toby Tomkins2012-07-052-2/+3
| | | | | | | Task-number: QTBUG-26430 Change-Id: I647388701b7e6a71bb011f7714ff3b96c833a837 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
* Native drag implementation on MacJames Turner2012-07-045-2/+170
| | | | | | | | | | | | | | | | Create a native implementation of QCocoaDrag, using the 10.6 (and earlier) Cocoa dragging API. This matches the implementation in Qt4 closely for the moment. In the future it may be desirable to create an alternative implementation using the new (non-blocking) drag API introduced in 10.7, but that will require deeper changes to the mime-data handling. This changes makes one more method on QPlatformDrag virtual, since the Cocoa behaviour diverges from the base version: ::defaultAction is customised. Change-Id: I1843293a62b2b4973a07b5e75ea3c312dc064018 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: Fix size hint and resize increment setting.Morten Johan Sorvig2012-07-041-4/+16
| | | | | | | | Call the corresponding NSWindow size functions. Add special cases where Qt returns null or empty sizes. Change-Id: I880c50c04e92271dc342ad587191c8cb2c006dba Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QHeaderView - prevent negative default+minimum section sizesThorbjørn Lund Martsum2012-07-042-6/+8
| | | | | | | | | In 96f1fe8855082017fbbecccdab1eb11fd8c1f870 we agreed that sections with negative sizes did not make sense. Of the same reason default section sizes and minimum section sizes should be not negative. Change-Id: I6a770e7f510d8e2bb90bfd8f38b4fa0566fc137b Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Properly detect the max texture size when using QOpenGLPaintDevice.Jocelyn Turcotte2012-07-042-1/+37
| | | | | | | | | | | The value is currently hard-coded to 1024, this is a problem since any image painted with a size higher that this will be scaled down before being uploaded. This patch copies the implementation from QGLContext which works correctly. Change-Id: Ia2bda60cf21d9adf13c91cea4854a2b20e4041f2 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* disable building uic when -no-widgets is setTasuku Suzuki2012-07-041-1/+1
| | | | | Change-Id: I86040ec086621913fefcf6d349fe603758991c4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix socket notifier registration on Blackberry.Rafael Roquetto2012-07-042-8/+52
| | | | | | | | | | This fixes a bug on QEventDispatcherBlackberry, where registerSocketNotifier() and unregisterSocketNotifier() wrongly assumed that a file descriptor was being watched exclusively by one QSocketNotifier, while in fact there can be more than one QSocketNotifier associated with a single file descriptor. Change-Id: I0ce54bf809df109ad97f4a7f170f448d5d04d453 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Skip (re-)creation of cmake files during build passes.Stephen Kelly2012-07-041-1/+1
| | | | | Change-Id: I03973220c17c065bc6ea391300b677e27f48a46f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Uppercase the CONFIG for verbatim mode.Stephen Kelly2012-07-044-4/+4
| | | | | Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a Q_PROPERTY for the sourceModel of a proxy model.Stephen Kelly2012-07-043-9/+26
| | | | | | | | | | | Now that Q_PROPERTY with a QObject derived type is more powerful. This property can be used in QML so that wrappers for proxy models do not need to be created, such as in the example at https://codereview.qt-project.org/#change,13007 Change-Id: I6ba676549d2135585d429a28e214fef0b2a6b1f9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Set the language of a STATIC library.Stephen Kelly2012-07-041-0/+1
| | | | | | | | This is used as a hint for the linker. Change-Id: I869039c1ea50f1926809ead4064317628ebbb2e7 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* tst_qwidget: remove QEXPECT_FAIL for QTBUG-8911Joerg Bornemann2012-07-041-3/+0
| | | | | | | | QTBUG-8911 has been fixed some time ago. Change-Id: I19dae0571b1829f6b3b797f7e0ec5c24a4241db8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Make QGenericPlugin and QGenericPluginFactory public APIGirish Ramakrishnan2012-07-0414-28/+25
| | | | | | | | | | These classes are not specific to QPA. Discussed in QtCS 2012. Change-Id: I32bc5fad4f0fa5e7095af86d61966fdf4d9e4ad7 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Removed private header warning from public QOpenGLPaintDevice header.Samuel Rødal2012-07-041-12/+0
| | | | | | Change-Id: I9f2068d7271778e98251d8cbcfffa3a8c3e58f3d Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* enable platformsupport for -no-widgetsTasuku Suzuki2012-07-041-4/+4
| | | | | | | qpa plugins need platformsupport Change-Id: I6ebfac327940c00e1ab591045cf1a3bb3ac689e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Replace insignificant test with QEXPECT_FAIL.Toby Tomkins2012-07-042-2/+1
| | | | | | | Task-number: QTBUG-26403 Change-Id: Id933665a35be056f2b2a6fa2152f324810a7f057 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Avoid load(testcase) for installing test helper appsRohan McGovern2012-07-0411-51/+48
| | | | | | | | | | | | Make test projects declare TEST_HELPER_INSTALLS rather than calling a function exported by testcase.prf. load(testcase) may be unsafe, as testcase.prf should be processed after default_post.prf. Fixes silent disabling of various autotests. Change-Id: I56b35ffd653a637ad5ab18d64dd1a1edadfac59f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
* Revert "Allow moc to handle symbols that have been redefined."Matthew Vogt2012-07-046-279/+12
| | | | | | | | | | | | This reverts commit 5bb1408927b4eb5a03e8ab9f7cbc68f80d8a3962. The temporary measure used to support redefinition of QtDeclarative class names during the transition period is no longer required. Task-number: QTBUG-24517 Change-Id: Ib90f08fcdfb02e004e594ac72b698eaa0325d98d Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Add some quotes to prevent damage from spaces in the pathsStephen Kelly2012-07-031-17/+17
| | | | | | | | | This is a forward-port of 0331a5adde45583e3bca351f2814aea971474671 in cmake.git. Change-Id: I8d889389a487f8b820182bd66e8a3df7aa5dc8d9 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Improve basename extraction in qt5_add_dbus_interfacesStephen Kelly2012-07-031-1/+2
| | | | | | | | | This is a forward port of f46903b4b21e5d1c8af9a60e9ea87805b170ed73 in cmake.git. Change-Id: I627b17259182497c1353ccf4cd3fa4a61546be5d Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QWidget/widgetAt() test.Friedemann Kleint2012-07-031-6/+8
| | | | | | | | Prevent a crash by giving the widget some time to show up. Task-number: QTBUG-22326 Change-Id: Idaa23b21121e7c4f7098e8d51efd313bcc467e9a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove Unicode escape sequence, which MSVC does not support.Friedemann Kleint2012-07-031-15/+1
| | | | | | | | Task-number: QTBUG-25924 Change-Id: I352bb5c674d90891df4103849bf5b5ac5778a2ee Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* export QMAKESPEC to the projectOswald Buddenhagen2012-07-033-25/+1
| | | | | | | | | | this makes it unnecessary to dump qmakespec to .qmake.cache and qmodule.pri. Task-number: QTBUG-22700 Change-Id: I678c7ee7df2512184b9cd06d7a3be8bbd0b0da15 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* store QT_BUILD_PARTS in qmodule.pri also on unixOswald Buddenhagen2012-07-031-1/+1
| | | | | | | | | modules other than qtbase also need it. the windows configure already does it that way. Change-Id: I9adb469f7a0726663b7939e80d8be1e83a6d12d3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>