summaryrefslogtreecommitdiffstats
path: root/tests/manual
Commit message (Collapse)AuthorAgeFilesLines
* Manual dialog test: Build also when QtPrintSupport is not available.Friedemann Kleint2015-12-031-4/+13
| | | | | | | Fixes the build on WinRT. Change-Id: I68510b70b61433ceed6bf06a31424f93a02230dc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Add a manual test for cursors in multi-screen/High DPI setups.Friedemann Kleint2015-11-253-1/+328
| | | | | | Change-Id: I4c0baeaf01f0b3d6162a16ef7fda822f5a4cb1db Task-number: QTBUG-49511 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Support mixing native child widgets with texture-based onesLaszlo Agocs2015-11-193-19/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QOpenGLWidget and QQuickWidget do not support having native child widgets inside the same top-level window. In some cases this is inevitable, f.ex. multimedia may require native windows when used from widget apps. winId() calls made for various (valid or invalid) reasons are also problematic. There are no blockers for supporting this setup, however. By storing multiple texture lists (one for each subtree where the root is a native widget), adding the missing markDirtyOnScreen calls, letting each native widget access the correct texture list (i.e. the one corresponding to its children) when they are (separately) flushed, and fixing composeAndFlush() to take the update region and the (native child) offset into account, it can all be made functional. The change also fixes the issue of keeping GL-based compositing enabled even after all render-to-texture widgets in the window become hidden. Due to the changes of how such widgets are gathered, composeAndFlush() is not invoked anymore when no such widgets are discovered for a given native parent. This is great since having compositing enabled infinitely is an issue for applications like Qt Creator that implement certain views with QQuickWidgets but cannot afford the cost of texture uploads in other places (e.g. for the text editor) on slower machines. The openglwidget manual test is greatly enhanced to test various situations (MDI, scroll areas, tab widgets, QOpenGLWidget as native child, QOpenGLWidget with non-tlw native parent, etc.) Task-number: QTBUG-48130 Task-number: QTBUG-49172 Change-Id: Iad098359c8bcf749f01c050da0853415e1550eda Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Update Unicode data & algorithms up to v8.0Konstantin Ritt2015-11-051-0/+12
| | | | | | | | | | | | | | | | | | | * Georgian lari currency symbol * A large collection of CJK unified ideographs * Emoji symbols and symbol modifiers * Letters to support the Ik language in Uganda, Kulango in the Côte d’Ivoire, and other languages of Africa * A set of lowercase Cherokee syllables, forming case pairs with the existing Cherokee characters * The Ahom script for support of the Tai Ahom language in India * Arabic letters to support Arwi—the Tamil language written in the Arabic script For more details, see http://www.unicode.org/versions/Unicode8.0.0/ [ChangeLog][QtCore] Unicode data updated to v.8.0 Change-Id: If255f95c9c45655b721369a116299da3cabbba0a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Add support for TEXTURE_EXTERNAL_OES in the internal texture blitterLaszlo Agocs2015-10-211-0/+7
| | | | | | | | | | Assuming that the target is always GL_TEXTURE_2D is not going to be sufficient when working with EGLStreams for example where GL_TEXTURE_EXTERNAL_OES is a must. The blitter is now changed to support multiple programs so other targets can easily be added as well in the future, if necessary. Change-Id: I247d30600222fb5af6305ed5d9740baa5e43e83e Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* Add support for "@3x" image loading.Morten Johan Sørvig2015-10-162-0/+1
| | | | | | | | | | | | | | | | Implement as generic "@Nx" support in an exported qt_findAtNxFile function. 3x devices now get one extra file existence test in cases where @3x versions are not present. 1x devices are still on the fast path where there are no extra file system accesses. Add an @3x image to the highdpi manual test. Change-Id: I4ce3fc245ada01ea410abe1443ceb1e3abf7c17f Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* QScreen manual test: don't crash when a QScreen is nullShawn Rutledge2015-09-241-4/+13
| | | | | | | | Need to survive having screens detached/reattached on X11. Task-number: QTBUG-42985 Change-Id: I81cf9721f0cb61a29180c60d44d588063266e651 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Diaglib: Output QGuiApplication::focusObject() in focus changes, too.Friedemann Kleint2015-09-151-2/+7
| | | | | | | | This is useful for diagnosing QML focus issues. Task-number: QTBUG-48199 Change-Id: Iff2cc35850e7020a9198b38256d1331587d0eefb Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* QTabletEvent manual test: show events/sec and frames/sec, proximityShawn Rutledge2015-08-241-1/+23
| | | | | | Task-number: QTBUG-47464 Change-Id: I476586bb15dd5113cf6463b1dc6f05e5bb26127a Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* QTabletEvent manual test: show event timestampShawn Rutledge2015-08-242-0/+4
| | | | | | Task-number: QTBUG-39459 Change-Id: Ieac0d7b28a3ca651681d286d4700ef7b9b1675b5 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Merge the multiple implementations of getting the local hostnameThiago Macieira2015-08-131-0/+1
| | | | | | | | | | | | | | | | This commit moves the functionality from QtNetwork's QHostInfo to QtCore. Note that due to Windows ws2_32.dll's quirky behavior of requiring WSAStartup before calling gethostname, this change required moving the initialization to QtCore too. On Linux systems, gethostname() gets the name from uname(), so we bypass the middle man and save one memcpy. Change-Id: I27eaacb532114dd188c4ffff13d32655a6301346 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Extend high-DPI manual testPaul Olav Tvete2015-07-304-75/+954
| | | | | | | | | | | | | Add several new tests to verify that Qt behaves properly when high-DPI scaling is enabled. Add a generic framework for manual tests for good measure. This could be refactored and used for other manual tests later. Includes tests written by Morten and Friedemann. Task-number: QTBUG-46615 Change-Id: Ib6762ec1454711e71f0c094b19015932b99e8d6d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-07-014-2/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
| * QHeaderView - fix a logical / visual index mismatchThorbjørn Martsum2015-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | f9408317e70bc2e635a2f9baeff35d1c06227734 was unfortunately approved though it had an annoying bug. The patch had an assign of a visual index into a logical index. This patch fixes that issue. Change-Id: I9cc75e4e9701858c92e2c3e5817415041b42f8e8 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Diaglib: Output window/widget state(s).Friedemann Kleint2015-06-112-0/+4
| | | | | | | | | | | | Change-Id: I0f27027c95ed70a0b2992c58df7e12eddfad17e3 Task-number: QTBUG-46416 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * fix usage of wince scopeOswald Buddenhagen2015-06-051-1/+1
| | | | | | | | | | | | | | Fix style issues along the way. Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Manual touch test: Add gestures.Friedemann Kleint2015-06-061-13/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add command line options for - Grabbing gestures - Suppressing mouse and touch events Add gesture events to the log. Add a hierarchy of gesture classes storing the parameters of finished gestures with drawing functionality and implement for pan and swipe. Task-number: QTBUG-46195 Change-Id: I019fe5b60116316a54e11b2c30e1d34f5e72bcf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-032-20/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| * Add debug operator for QTouchDevice.Friedemann Kleint2015-05-221-18/+0
| | | | | | | | | | | | | | | | | | | | Produces: QTouchDevice("", type=TouchScreen, capabilities=Position|Area|NormalizedPosition|MouseEmulation, maximumTouchPoints=10) Remove operator from manual test. Change-Id: I6b792665031902d5f822c80807a400a334c27526 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Fix the qscreen manual test for separate X screensLaszlo Agocs2015-05-122-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is fully possible to show a window on all the connected screens even when the screens are not virtual siblings, i.e. they do not form one big desktop. When X is configured to use a separate screen for each physical screen, it becomes essential to do setScreen() either directly or via QDesktopWidget in case of widgets. The original code attempting to call QWindow::setScreen() cannot succeed since there is no QWindow available before the widget is shown. This is easy to work around. The app now works identically in all cases. Change-Id: I519ca0c0109c68aac2f2d4e6972d14b55767b403 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | Android: generate QTabletEvents for stylus devices such as the S PenShawn Rutledge2015-05-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example the Galaxy Note series of devices. This makes possible drawing applications which handle stylus events differently from touch or mouse. As on any other platform, if the application does not accept the QTabletEvent, a QMouseEvent will be synthesized. Also fix the tablet manual test to show larger circles on hidpi devices. [ChangeLog][Android] stylus devices such as the S Pen generate QTabletEvents Task-number: QTBUG-38379 Change-Id: Ib594f453b8403cc06aa4e440a76f07afa3bac38c Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* | Manual touch test: Draw touch points.Friedemann Kleint2015-05-191-25/+159
| | | | | | | | | | | | | | | | | | Draw touch points as dots and mouse points as circles to be able to verify High DPI scaling. Change-Id: I2293adbcc726391f0d9e156935d609b957432029 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Manual QScreen test: capture screen changes.Friedemann Kleint2015-05-074-47/+188
| | | | | | | | | | | | | | | | | | | | | | | | - Make the subject of the Property watcher settable. - Embed it into a QMainWindow with menu and listen to the screen changed event, setting the new screen with a message about the position. - Remove hash, close obsolete windows by iterating over the top levels looking for the screen. Change-Id: I4ed1122bab7c0cd9676d63995ce85a44719f4ba6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into HEADSimon Hausmann2015-05-041-0/+29
|\| | | | | | | Change-Id: I487a4b7c05687a10c498ac219c31367d4db6fbc0
| * [DiagLib] Sync QChar enumsKonstantin Ritt2015-05-011-0/+29
| | | | | | | | | | | | | | These values were added as part of upgrading to Unicode 7.0 Change-Id: Ib208828a7685ba4f89f0e2f06033f74c8ff13532 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* | Clean up qt_on_cocoa manual test.Morten Johan Sørvig2015-04-304-169/+53
| | | | | | | | | | | | | | | | | | | | | | Focus the test on embedding QWindow: Remove the NSToolBar code. Use standard NSApplication startup code. Use winId() to access the NSView instead of QPlatformNativeInterface (which is gui-private). Rename Window -> RasterWindow. Change-Id: Ie98cb73020d2721743bb665b89b17f07f2bf984b Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-223-0/+75
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/gui/painting/qdrawhelper.cpp src/plugins/platforms/xcb/qxcbnativeinterface.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/plugins/platforms/xcb/qxcbwindow.h src/testlib/qtestblacklist.cpp src/tools/qdoc/node.cpp src/tools/qdoc/node.h tests/auto/gui/painting/qcolor/tst_qcolor.cpp Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
| * Add a means to set the application icon where supportedAndy Shaw2015-04-103-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | On OS X the application icon can be changed at runtime, so this adds a way to set this via the QPlatformIntegration. [ChangeLog][OS X] QApplication::setWindowIcon now changes the icon for the application in the dock. Task-number: QTBUG-43999 Change-Id: Ice298c0bd52f10f4866f37c6d3f20cf5419b7a1b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-04-011-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/testlib/qtestblacklist.cpp src/widgets/accessible/qaccessiblewidgets.cpp Change-Id: If032adb9296428f62384ed835dbf41ee7a0b886c
| * Fix build of the manual dialog test with Qt 4.Friedemann Kleint2015-03-251-0/+1
| | | | | | | | | | Change-Id: If2b0ae9842ebc2795168d2c50934b8a87006544b Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-242-0/+7
|\| | | | | | | Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
| * Diaglib: Add gesture events to event filter.Friedemann Kleint2015-03-202-0/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-45134 Task-number: QTBUG-45120 Change-Id: I9b2420ec302dfff173fbc8e3173d6ef0fcf095e0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-03-162-0/+156
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/xcb/qxcbnativeinterface.cpp src/plugins/platforms/xcb/qxcbnativeinterface.h Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076
| * Cocoa: Correct mouse event forwarding for popupsMorten Johan Sørvig2015-03-122-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to track the active popup globally, having parent windows track child popups is not sufficient since there may be one or more intermediate windows in between the event receiving window and popup window. Add API to QOCocoaIntegration for tracking the global popup window and use it instead of the per-window tracking. Make sure to only close popups on clicks outside the popup only. Add code to QNSView::handleMouseEvent that redirects mouse events to the active popup. Add manual test. Change-Id: Ia3e3fd42d8fddf5c69f0c6879b333ca544521f61 Task-number: QTBUG-43464 Task-number: QTBUG-31937 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-091-8/+41
|\| | | | | | | Change-Id: I9d10911c51700965f2cf0e3173b88fd9116bd3ee
| * Manual dialog test: Add a message box for printer errors.Friedemann Kleint2015-03-051-8/+41
| | | | | | | | | | | | Task-number: QTCREATORBUG-13742 Change-Id: I137854eee589cde7a6cf3b841b0b63311e031517 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | xcb: implement and deprecate QWidget::setWindowIconText()Shawn Rutledge2015-03-061-0/+2
|/ | | | | | | | | | This is a little-used feature which only affects how minimized icons are displayed on certain older window managers, and is not necessary even then. It has not been implemented in Qt 5 until now. Task-number: QTBUG-44659 Change-Id: Ie6ead7a6f922878b349a096d905bf7f675dc2f31 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* QTabletEvent manual test: use built-in QDebug operatorShawn Rutledge2015-03-031-77/+11
| | | | | | | | There's no need to decode the event details here anymore, and anyway this had a bug: it always said the device is unknown. Change-Id: If99dddbe2136d95e818f4fe526f62650cbd7c1ca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QSysInfo: expand Linux distribution detection to /etc/lsb-releaseThiago Macieira2015-02-253-0/+147
| | | | | | | | | | | | | | | | Some older (or weird) Linux distributions don't have /etc/os-release, so let's try to read /etc/lsb-release instead. If we find a file called /etc/<distronamelowercase>-release and it's bigger than the pretty name we read from /etc/lsb-release, use that. Because the order of the keys changes between the two *-release files, we can't do a sorted search anymore. Change-Id: I1a800c709d3543699131ffff13c48532d5074f3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Dirk Hohndel <dirk@hohndel.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add manual test for QMimeDatabase.Friedemann Kleint2015-02-253-1/+147
| | | | | | | | | | Add command line test application that can print the mime type of a file or dump all mime types. Task-number: QTCREATORBUG-13996 Task-number: QTCREATORBUG-14005 Change-Id: I5ef2fa4b9fbab986b1db4fc0bd8abaacdf4f8fa0 Reviewed-by: David Faure <david.faure@kdab.com>
* Fixed license headersJani Heikkinen2015-02-177-7/+7
| | | | | Change-Id: Ibebe1318d1c2de97601aa07269705c87737083ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Updated BSD licensed file headersJani Heikkinen2015-02-1524-72/+72
| | | | | Change-Id: I6441ff931dbd33b698d762e6f6784898f3f60fe7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-11222-1613/+1541
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-104-2/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro src/gui/image/qimage_conversions.cpp src/gui/opengl/qopenglextensions_p.h src/gui/text/qtextengine.cpp src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/eglfs/qeglfshooks_stub.cpp src/plugins/platforms/eglfs/qeglfsscreen.cpp src/plugins/platforms/eglfs/qeglfswindow.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp src/plugins/platforms/windows/qwindowsnativeinterface.cpp src/plugins/platforms/windows/qwindowsscreen.cpp src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/windows/qwindowswindow.h src/plugins/platforms/xcb/qxcbdrag.h src/widgets/itemviews/qabstractitemview.cpp src/widgets/kernel/qwidget.cpp src/widgets/util/qsystemtrayicon_p.h tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp conflicts. Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
| * SSL NPN negotiation: Do not abort on unmatched protocolsPeter Hartmann2015-02-051-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... but choose HTTP/1.1 and continue connecting anyhow. According to the NPN spec, actually we should choose SPDY: "In the event that the client doesn't support any of server's protocols, or the server doesn't advertise any, it SHOULD select the first protocol that it supports." However, some tested servers did not advertise anything and did not support SPDY, so blindly trying the newest protocol would fail. We are conservative in that case and choose HTTP. Task-number: QTBUG-40714 Change-Id: Ia8aaf01fea74e13d9e4416306f85f1890b25559e Reviewed-by: Richard J. Moore <rich@kde.org>
| * Diaglib: Fix compilation with Qt 5.3.Friedemann Kleint2015-01-233-2/+6
| | | | | | | | | | | | | | | | QDebug does not have noquote() in Qt 5.3. Task-number: QTBUG-44021 Change-Id: If35b926d6b1e5bb9ad3534357630533dfcecd076 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Diaglib: Fix compilation with MSVC 2010 / SDK 7.X.Friedemann Kleint2015-02-051-0/+4
| | | | | | | | | | Change-Id: Idf6adc6d3788c3ac6fda770c4cf42bceb530cd48 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Remove traces of the Maemo platformTor Arne Vestbø2015-02-042-14/+3
| | | | | | | | | | | | | | Change-Id: I6b551de331aa0386ea53d8e96f50b669777d2d69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | Make it more obvious that Q_WS_ is dead code, and should perhaps be portedTor Arne Vestbø2015-02-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | We still have a bunch of Q_WS_ ifdefs in our code, which are easy to mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming the ifdefs we make it clear that the code in question is dead. In incremental follow-ups, we can then selectively either remove, or port, the pieces that are dead code. Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-215-9/+83
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 16:23:08 +0000