From 2ee760b8aaae3fcce2eb0342479d780522ddce8d Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Thu, 23 May 2013 23:04:10 +0800 Subject: Doc: Fix module inclusion details - Show the correct "QT +=" option - Use a camel-case header (for the module's sole class) instead of an actual filename Change-Id: I9e030effe7ab34df1a877e1de327fb1e789c645a Reviewed-by: David Faure (KDE) --- src/x11extras/doc/src/qtx11extras-index.qdoc | 4 ++-- src/x11extras/doc/src/qtx11extras-module.qdoc | 6 ++---- 2 files changed, 4 insertions(+), 6 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 + #include \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 + #include \endcode To link against the module, add this line to your \l qmake \c .pro file: \code - QT+=qtx11extras + QT += x11extras \endcode - - */ -- cgit v1.2.1 From 1a095bd1f406b453cfea16312bbb0f258d370b59 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 24 May 2013 22:41:44 +0200 Subject: sync.profile: Point dependencies to an empty string This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I81ec5d9ef660ebd3f69bee74a95b8af0164cdeba Reviewed-by: Iikka Eklund --- sync.profile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sync.profile b/sync.profile index 1dd5fb2..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/stable", + "qtbase" => "", ); -- cgit v1.2.1 From 30fd950a6540cc1a357ebd85919d84fa2651576c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 28 May 2013 20:31:43 +0200 Subject: Bump MODULE_VERSION to 5.1.1 Change-Id: I228c33151b38d46bf27d131a715ea00fce795c56 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f5a422c..661ac1a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.1.0 +MODULE_VERSION = 5.1.1 -- cgit v1.2.1