diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:53:52 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:53:52 +0200 |
| commit | 29528c5545a74780c5911127e272e594d01b81c0 (patch) | |
| tree | ccf7e906077ed5692b414eb9d4a935312c663746 | |
| parent | be0436b2c728e84cd574a9819872336a7fc04121 (diff) | |
| parent | 30fd950a6540cc1a357ebd85919d84fa2651576c (diff) | |
| download | qtx11extras-29528c5545a74780c5911127e272e594d01b81c0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I5738cd6ace4c7896fae45d1922c9a6b44a8eac78
| -rw-r--r-- | src/x11extras/doc/src/qtx11extras-index.qdoc | 4 | ||||
| -rw-r--r-- | src/x11extras/doc/src/qtx11extras-module.qdoc | 6 | ||||
| -rw-r--r-- | sync.profile | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/x11extras/doc/src/qtx11extras-index.qdoc b/src/x11extras/doc/src/qtx11extras-index.qdoc index 050c37f..416df18 100644 --- a/src/x11extras/doc/src/qtx11extras-index.qdoc +++ b/src/x11extras/doc/src/qtx11extras-index.qdoc @@ -40,14 +40,14 @@ following directive: \code - #include <qx11info_x11.h> + #include <QX11Info> \endcode To link against the module, add this line to your \l qmake \c .pro file: \code - QT+=qtx11extras + QT += x11extras \endcode Requirements for using X11 with Qt: \l{Qt for X11 Requirements} diff --git a/src/x11extras/doc/src/qtx11extras-module.qdoc b/src/x11extras/doc/src/qtx11extras-module.qdoc index 3b38b5a..b68c479 100644 --- a/src/x11extras/doc/src/qtx11extras-module.qdoc +++ b/src/x11extras/doc/src/qtx11extras-module.qdoc @@ -36,16 +36,14 @@ following directive: \code - #include <qx11info_x11.h> + #include <QX11Info> \endcode To link against the module, add this line to your \l qmake \c .pro file: \code - QT+=qtx11extras + QT += x11extras \endcode - - */ diff --git a/sync.profile b/sync.profile index 5c26694..29a59d7 100644 --- a/sync.profile +++ b/sync.profile @@ -8,7 +8,8 @@ # 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" => "", ); |