diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:44 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:51:44 +0200 |
| commit | 12450d0eca12cdefa668e068817286f5983aa96d (patch) | |
| tree | 2d0127d05babbdca3570303897327408602485a7 | |
| parent | e44e545ccfc6e6ed2847497bc09c6497e364cc98 (diff) | |
| parent | cb98d9513e9612ce9af846e625caedfe6af9cc9c (diff) | |
| download | qtscript-12450d0eca12cdefa668e068817286f5983aa96d.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I0c7564e03a51df9aba7dd53640802e318417bd0e
| -rw-r--r-- | src/script/doc/src/qtscript-index.qdoc | 1 | ||||
| -rw-r--r-- | sync.profile | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/doc/src/qtscript-index.qdoc b/src/script/doc/src/qtscript-index.qdoc index ff4013b..a3fd908 100644 --- a/src/script/doc/src/qtscript-index.qdoc +++ b/src/script/doc/src/qtscript-index.qdoc @@ -28,7 +28,6 @@ /*! \page qtscript-index.html \title Qt Script - \ingroup technology-apis Qt provides support for application scripting with ECMAScript. The following guides and references cover aspects of programming with diff --git a/sync.profile b/sync.profile index bb6601f..7a267d4 100644 --- a/sync.profile +++ b/sync.profile @@ -9,8 +9,9 @@ # Each of the module version specifiers can take one of the following values: # - A specific Git revision. # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/dev", + "qtbase" => "", ); |