summaryrefslogtreecommitdiffstats
path: root/examples/widgets/graphicsview
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devLars Knoll2020-03-042-0/+6
|\
| * Examples: enable HighDPI scaling for examples on AndroidAssam Boudjelthia2020-03-032-0/+6
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-031-1/+1
|\ \ | |/
| * Docs: Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-02-281-1/+1
* | Move QOpenGLWidget from QtOpenGL to its own moduleJohan Klokkhammer Helsing2020-02-183-1/+3
* | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-02-131-1/+1
|\ \ | |/
| * Remove unused variableJan Arve Sæther2020-02-101-1/+0
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-041-1/+1
| |\
| | * Examples: fix compile without printsupportChristian Ehrlicher2020-01-311-1/+1
* | | Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"Alexandru Croitor2020-02-1115-68/+357
|\ \ \
| * | | Regenerate examplesAlexandru Croitor2020-02-0415-68/+357
* | | | QComboBox: remove deprecated signalsVitaly Fanaskov2020-02-101-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-293-12/+13
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-01-283-12/+13
| |\ \ \ | | |/ /
| | * | QButtonGroup: deprecate overloaded signalsChristian Ehrlicher2020-01-282-8/+9
| | * | Deprecate all methods that use QMatrixJarek Kobus2020-01-282-4/+4
* | | | Post Merge FixesLeander Beernaert2020-01-242-43/+0
* | | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2445-4836/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-191-8/+0
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-181-8/+0
| | |\ \ | | | |/
| | | * Pad Navigator example: Remove duplicated property animationsTopi Reinio2020-01-161-8/+0
| * | | Remove deprecated QGL* classesJohan Klokkhammer Helsing2019-12-1143-4827/+0
| |/ /
| * | Deprecate constructing QFlags from a pointerAllan Sandfeld Jensen2019-11-201-1/+1
| |/
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1457-416/+285
|\ \ | |/
| * Cleanup QtWidgets examplesChristian Ehrlicher2019-10-111-2/+3
| * Widgets flowlayout example: Fix crash on startupChristian Ehrlicher2019-10-031-1/+1
| * Widgets/GraphicsView examples: cleanupChristian Ehrlicher2019-09-0557-415/+283
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-113-6/+2
|\ \ | |/
| * Merge remote-tracking branch 'origin/dev' into 5.14Liang Qi2019-08-272-2/+2
| |\
| | * Remove usages of deprecated APIs of QWheelEventSona Kurazyan2019-08-232-2/+2
| * | Remove dead code from Qt 4 timesTor Arne Vestbø2019-08-201-4/+0
| |/
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-112-3/+1
|\ \ | |/
| * Convert uses of QTime as a timer to QElapsedTimerEdward Welbourne2019-06-142-3/+1
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-1413-17/+17
|\ \ | |/
* | Fix compiling of examples on AndroidSimon Hausmann2019-06-1213-12/+25
* | Fix linking of examplesSimon Hausmann2019-06-1212-12/+12
* | Allow to build examples as standalone projectKevin Funk2019-06-0514-299/+370
* | Fix OpenGL vs. GLESv2 linkage, attempt number threeSimon Hausmann2019-06-051-2/+0
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-031-7/+5
|\ \ | |/
| * QLineF: add intersects() as a replacement for intersect()Christian Ehrlicher2019-04-251-7/+5
* | Rerun pro2cmake on projects that use .ui filesAlexandru Croitor2019-05-222-5/+9
* | Write find_dependency() calls in Qt Module config filesAlexandru Croitor2019-05-021-2/+1
* | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1621-187/+169
|\ \ | |/
| * Examples: replace deprecated QComboBox functionsChristian Ehrlicher2019-03-042-3/+3
| * Fix some deprecation warnings in examplesFriedemann Kleint2019-02-065-12/+12
| * Cleanup Widgets examples - foreachChristian Ehrlicher2019-01-2313-94/+74
| * Cleanup Widgets examples - nullptrChristian Ehrlicher2019-01-232-3/+3
| * Cleanup Widgets examples - new signal/slot syntaxChristian Ehrlicher2019-01-066-77/+79
* | CMake: Add widgets examplesTobias Hunger2019-03-2614-0/+387
|/
* Merge remote-tracking branch 'origin/5.11' into devLiang Qi2018-06-071-1/+1
|\