| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I191edb211ed6cffce17b0a5b7656691ce41b754c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|
|
|
|
| |
Change-Id: I8e2e863f4a9f05b577f63a233654785a6d294387
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I59a0b27e74c2a4d9d62727e067abcdaf0fb97e8b
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
they were added without an explanation, and they can't be particularly
useful (because they contain hard-coded paths and refer to non-existing
icons).
Change-Id: I55f6786bc2463051e97ca55c81309dd2afbf7580
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
|
|/
|
|
|
| |
Change-Id: I3e66ce25ea21aa846b44b6f99b8afbe0959a6526
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I99e62a707fe649403214436a4b9aad8fd82015ee
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
|
|\
| |
| |
| | |
Change-Id: Ic32f5bd17782285305aaa01694f1a78851b882eb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
And fix the \snippet commands to use the correct paths.
Also edited dependencies qdocconf files
Task-number: QTBUG-43810
Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
|
|/
|
|
|
|
|
|
|
| |
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.
Change-Id: Iffc10aac2cdaf7c7ceba051ec447f15758c3d8e0
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|
|
|
|
|
|
|
|
| |
qsdbg and marshal examples need QtGui module. If QtGui is not installed
they fail to compile.
Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-36893
Change-Id: I4199df78e037c3959fd7d745d89b59d667010b73
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
LoadScript function should iterate over arguments and load all scripts
not only the first one.
Task-number: QTBUG-28805
Change-Id: I03c6764946cfb403ff5af818bfc45b41524ad5c6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
QtScript -> Qt Script
QtScriptTools -> Qt Script Tools
Change-Id: Icf6b2ea3829247475f8902334b615f9a9206cc51
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ic4a2739c8caf2eac95e4a72d8d38cfb912d5fe2b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I440b609d23570293f21f21a2cb31854366d06bf7
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
This follows suit with aeb036e in qtbase.
Change-Id: I695c3f7c69cfe811ffe05f7cb381e3216b76e7a8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: Id4cf97c6ca3b9d4335daf4f32842fb07f51c557e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-28128
Change-Id: Ifb57fa5e5dc2fa1959e8f04861897f59d3ce635d
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
| |
As QCoreApplication::Type is no longer public then change this to use
QCoreApplication instead as the example does not need a GUI application.
Change-Id: I24f98ec6538fc3f4bfc8612defbb6e7bb4dbf9aa
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-27977
Change-Id: I26a85995367d79c0a88f3e8a6e8a4fc15caf9094
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
| |
Change-Id: I19adcb6365cae2afa9cc994f21891bad8a26690e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Id0b72b8c895b0eab04a740bf83859c9b646dd911
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The example needs no_batch in CONFIG because examples/script/customclass
and examples/script/qscript contain a main.cpp and nmake's inference
rules get confused which one to choose.
See QTBUG-13496 for details.
Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
If QtWidgets is not available, disable a few examples which need it.
Standardize on isEmpty(QT.widgets.name) in preference to
contains(QT_CONFIG,no-widgets).
Change-Id: I00335149a75911dd4ab42a4ce659889d548a8be3
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
15 characters isn't enough to hold results like
1.1760477643322587e-7. Instead it would get chopped down to
1.1760477643322.
Task-number: QTBUG-20845
Change-Id: I9ea697ec627caa5225b84208bdf1e6ac0be59ebb
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
- qmake -project boilerplate
Change-Id: I618bc1db930a372e7f713f21f21b2cfedc839258
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Add a missing forward declaration and include.
Add a missing Q_OBJECT (mandatory since qtbase
ae85d7c965e7d50404c056a77c73bfe00267fa12)
Change-Id: I6a4e73e5eba0d02d02246c8eb9662ec04f037a6c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
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: I752b02a8155143626d22bd86082177550bd1cfb4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Replace Nokia contact email address with Qt Project website.
Change-Id: I6597406c8041227410e672b86a567e1161a0ab59
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
| |
Change-Id: I323b788326712d95f6213ab8a68c18cfe28b7c76
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
- Fix QtGui => QtWidgets
- Fix QtWidgets/qstringlistmodel.h => QtCore/qstringlistmodel.h
- Fix QtWidgets/qsortfilterproxymodel.h => QtCore/qsortfilterproxymodel.h
Change-Id: I9fb584ae07b5acc79c86e1a62f7118a634e9224e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These qtscript examples depend on uitools, which is in qttools, which
depends on qtscript - a circular dependency.
Disable the offending examples for now.
Change-Id: Icd684fde329d72fd48eb476dc9f9d0c8440a3a29
Reviewed-on: http://codereview.qt-project.org/5167
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\
| |
| |
| | |
Change-Id: I4e9fc2e2b8f53a7b20831225093126167030a382
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I1ae89728a405bcab61eaee9192def386e6cd16e6
Reviewed-on: http://codereview.qt.nokia.com/1493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
|
| |
| |
| |
| | |
Functionality has been moved into qt_example.prf
|
|/ |
|
| |
|
|
|
|
|
| |
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
|
| |
|
|
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
|