aboutsummaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* qmlplugindump: Add comment to file that it was auto-generatedThomas McGuire2012-07-041-2/+4
| | | | | | | | | This prevents people who do not know about this tool from accidentally changing these files by hand. Change-Id: I8ff889b953f7c637f914f8b5b8b07a36f3cdf58f Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge branch 'buildsystem'Oswald Buddenhagen2012-06-264-9/+11
|\ | | | | | | Change-Id: I230e776290761be7c811c3aec4d915367012fc99
| * build system cleanupsOswald Buddenhagen2012-06-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless and commented out include and depend paths - qmake -project boilerplate Change-Id: Ib2d80a375e88bae1b50a22a274374b7e2cc2a86c Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * remove pointless qmltest conditionalsOswald Buddenhagen2012-06-261-2/+8
| | | | | | | | | | | | | | | | it is a module within this repository, and consequently the flag is always set. Change-Id: I8ffdd6903b1b0835725b824a9deb961d0124ce11 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * fix include styleOswald Buddenhagen2012-06-262-3/+3
| | | | | | | | | | | | | | | | so it builds without . in includepath Change-Id: I5815c636dfcc3d45fad70321a0aab09f5295ca8d Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Remove some unnecessary indirection.Robin Burchell2012-06-251-17/+14
|/ | | | | | | | There's no need to heap allocate our QQuickView, and there's no need to have a seperate pointer to QWindow when we can just use the QQuickView directly. Change-Id: Ia2bc83c9dc83d1df1ec793836793f752d67e9415 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* qmlscene: add --transparent argumentGirish Ramakrishnan2012-06-191-0/+14
| | | | | | | The option makes qmlscene request a format with alpha for the QQuickView. Change-Id: I6490e606dd0af534147de95783f3a2ddfa8c52c8 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Small cleanup: remove braces from single line conditionals.Robin Burchell2012-06-191-9/+5
| | | | | Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix compilation for QT_NO_FILEDIALOGTasuku Suzuki2012-06-091-1/+1
| | | | | Change-Id: I2112bc8c9fe58cda84f498f9062b4b32b9ef0c24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add --resize-to-root option, sets ResizeViewToRootObject on the qmlscene view.Robin Burchell2012-05-281-10/+11
| | | | | | | | Sometimes it is useful to be able to resize a view from within QML, for example, when writing QML which must operate in both portrait and landscape conditions. Change-Id: I10564bb3c8661fae6c1d175985268a409dc3dafd Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-111-1/+1
| | | | | | | Use QtQml instead. Change-Id: If899ebc1e0b4ea86f0f8d4369fbd3eb5cbb2181c Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* QmlProfiler: storing binding typeChristiaan Janssen2012-05-045-10/+32
| | | | | Change-Id: If1f02e1e6f6ce6aba9874a63d01a08d57571f991 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Initial bundle supportAaron Kennedy2012-05-044-2/+243
| | | | | Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-041-2/+2
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: I03084595ddc425a988374b8352fd23e9504ffba6 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Do not use deprecated APIOlivier Goffart2012-04-241-1/+1
| | | | | | | Change-Id: I0c61f9cb4abe926d5f1e0a3acda7117d8d54efb6 Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Enabled widget free compilation of QtQuickDonald Carr2012-04-185-31/+7
| | | | | | | | | | There is no hard dependency of QtQuick on QWidget. This change makes the minor adjustments required to remove the build dependency altogether. This patch follows the path of least resistance bypassing any elements with a dependency on the legacy QWidget functionality. Change-Id: Ie3f47d3b4f60a1460dbb5d76a494a2c329469cc0 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-04-171-10/+5
|\ | | | | | | Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-112-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlprofilerservice_p.h src/qml/qml/qqmlboundsignal.cpp src/qml/qml/v4/qv4bindings.cpp src/quick/items/qquickshadereffect.cpp src/quick/particles/qquickcustomparticle.cpp src/quick/qtquick2.cpp Change-Id: Ia9c6517035ae912fa75e77473a452bd3383def56
| * \ Merge master into api_changesKent Hansen2012-03-271-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlenginedebugservice.cpp src/qml/debugger/qqmlprofilerservice_p.h src/qml/qml/qqmlboundsignal.cpp src/qml/qml/qqmlpropertycache.cpp src/quick/util/qquickimageprovider.cpp Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c
| * \ \ Merge master into api_changesKent Hansen2012-03-237-10/+681
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlboundsignal.cpp src/qml/qml/qqmlpropertycache.cpp Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
| * \ \ \ Merge master into api_changesKent Hansen2012-03-1925-2225/+2781
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/debugger/qqmlenginedebugservice.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/quick/util/qquickimageprovider.cpp tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
| * | | | | Adapt to Qt5 meta-object changesKent Hansen2012-03-131-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. Also, the new function QMetaMethod::isValid() should be used to determine whether a method is valid, instead of relying on signature() returning a 0 pointer. Where it makes sense, the existing code that was using signature() and parameterTypes() has been changed to use the new API QMetaMethod::name(), parameterCount(), and parameterType(int). Also, in the new meta-object revision (7), the QMetaObject stringdata member is now of type QByteArrayData*. QFastMetaBuilder will be ported to generate the new format, but for now it's sufficient to reinterpret_cast the stringdata assignment to keep it compiling. Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* | | | | | Don't use QWindow::moveGirish Ramakrishnan2012-04-131-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's deprecated. Use QWindow::setPos instead. Change-Id: I16694d27eb583d18c9dca3ee066dbfddab1efe69 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | Debugger: Use "QML" also in macro namesKai Koehne2012-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_DECLARATIVE_DEBUG will be removed as soon as qtbase is updated. Change-Id: I9dbfe95b8bcb3bf1502319a040a758389b6977a2 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | | | | Use minimal javascript expression for bound signalsChris Adams2012-03-291-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, QQmlBoundSignal used QQmlExpression internally. This commit adds a new, more optimal QQmlJavaScriptExpression subclass specifically designed for QQmlBoundSignal, and converts the code to use it instead of QQmlExpression where appropriate. Task-number: QTBUG-24460 Change-Id: I2865a119ce840235e27a7722d8052ca61c265f69 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | | | Debugger: Allow enabling of qml debugger without startup warningKai Koehne2012-03-271-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QT_DECLARATIVE_DEBUG_NO_WARNING define to support enabling the qml debugger without printing the usual startup warning. This should be used with care, but e.g. for qmlscene the warning probably confuses more than it helps. Change-Id: I33704857baebfc8bca60abbff09138e259390b49 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | | Allow qmlscene to quit immediately after startingMatthew Vogt2012-03-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for running tests that have no interactive element, where all computation is performed in the initialization phase of processing the QML source. Change-Id: Id3f87fc504a30eb4e351804a98fe265db8fe93c9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | | Debugger: Disable debugging for qmlprofiler, qmltestKai Koehne2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QmlProfiler uses the debugging API as a client, but doesn't have to be debugged itself. I don't think there's a use case to debug qmltest either. Change-Id: Ibc8849c77d807f96c6abec5cebc3581ab023d5ae Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* | | EasingCurveEditor: Remove generated headers from .pro fileKai Koehne2012-03-191-2/+0
| | | | | | | | | | | | | | | Change-Id: I21800e2839b70d6678c4958ae9c7b23a4c95f153 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* | | QmlDebuggingTests: Separate out public and private testsAurindam Jana2012-03-194-4/+668
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* | | Don't change the executable name if only build in debug mode on WindowsCharles Yin2012-03-191-3/+3
| |/ |/| | | | | | | Change-Id: I298c14d6ea5829d23a4f8b57b9c2f30546e12e80 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Adding a custom easing curve editor to declarative toolsThomas Hartmann2012-03-1314-1/+1947
| | | | | | | | | | | | Change-Id: Ic8ef77792d74ec99b23d85cd8888e0190acc3e10 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | QmlProfiler: updated standalone appChristiaan Janssen2012-03-1311-2224/+834
|/ | | | | | | Using a stripped-down version of the profiler data structure. Change-Id: I93a0b12462edea0ca8a1d0db42aa892aa2afc919 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlDebugging: Remove QQmlDebugClientAurindam Jana2012-03-094-4/+525
| | | | | | | | Remove QQmlDebugClient and relevant classes from the library and move to client code. Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-057-154/+154
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
* | Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2420-140/+140
|/ | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* clean up qmake-generated projectOswald Buddenhagen2012-02-221-6/+0
| | | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I1d777f5418b0f353bf276a979c6300a941927e7e Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QmlProfilerTool: add tool to QDeclarativeAurindam Jana2012-02-2012-1/+3426
| | | | | | | | | | qmlprofiler is a standalone tool used to record profiling data of QML apps. The data is stored in a file which can be loaded in QtCreator for investigation. Change-Id: I308f4c40bc3876933bd0d32c336cef6cd6f5fb4a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Add slow animations mode to qmlsceneAaron Kennedy2012-02-142-1/+10
| | | | | Change-Id: I0f850258e2cf5363bca2fa1c8b098aa5982eb232 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Remove QtQuick1 elements from qtdeclarativeMatthew Vogt2012-02-0340-5180/+51
| | | | | | | | QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3024-24/+24
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2324-24/+24
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-172-2/+2
| | | | | | | | Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix build break in qmlviewer.Xizhi Zhu (Steven)2012-01-141-0/+1
| | | | | | | It's introduced by commit 14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase. Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6 Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0522-22/+22
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Support opening filedialog again in qmlsceneGunnar Sletta2011-12-141-0/+5
| | | | | Change-Id: If6d7dded83a4bbb5d68b74741fc7a531165b7fef Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Link against widgets only when availableGunnar Sletta2011-12-122-1/+5
| | | | | Change-Id: Id7c474fe48bfa99d765267c0e3be1cbf80597548 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* qmlplugindump: Don't depend on qtquick1 and widgets.Christian Kamm2011-12-092-4/+28
| | | | | Change-Id: I38baaf2d8d02c3f35d2dece9fc580c6e1fee872d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* qmlplugindump: Fix dumping of extended QGraphicsWidget.Christian Kamm2011-12-081-4/+5
| | | | | Change-Id: Id574b4ee98f7d985ef06619956b2c02cac68b553 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Implemented multiple windows and GL context sharingGunnar Sletta2011-12-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | What was traditionally the QQuickRenderLoop which was used to support one QQuickCanvas instance has now grown to support multiple QQuickCanvas instances and is now called QQuickWindowManager, of which there are two implementations. QQuickRenderThreadSingleContextWindowManager: One QSGContext and one OpenGL context is being used to draw all the windows and we alternate between which surface the gl context is bound to. This implementation relies on that swap does not block, but that the graphics pipeline is vsynced and will eventually block as the buffer queue is filled up. This is the behavior we get on Mac OS X and Wayland. The benefit of this implementation is that we have vsync'ed animations, and the synchronizaiton between GUI and render thread is simple. (well, simple relative to the alternative, that is). QQuickTrivialWindowManager: One QSGContext and one OpenGL context is being used on the GUI thread. Animations are ticked from a timer. Performance of this implementation will deteriorate if the driver is using blocking swap. Task-number: QTBUG-19455 Change-Id: Ib961ac7d71eb49c70a057872b7cac020c4d19f3d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 00:19:35 +0000