sync.profile: Point dependencies to 'refs/heads/dev'

We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.

This is good enough for the time being.

Change-Id: I70b0244db87bd4a7023004bf50629bb790d6dfc2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	sync.profile

Change-Id: I5479b6eacc5366304d3d65c5287d9170b21a3c6c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I3b5356983f0b86a4c5e339ebb1eae2c20e825b70
Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: I7fed9ff47fd84f6cf2b418658a1ee3e7130539ac
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ib100dac4eccddf7a72382b7d1ead7d504a572347
Fix compile error caused by min/max defines.

qtbase d0804ff2dd3d289a0f0c58aa30c4334e66ea9be0 introduces a check
for min/max which causes a compile error.

Change-Id: I6a79e75423baa3f577eb26697e2766e58040b7d9
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Idae7dca76362ba04d0d85dec27f9d9bbd7560a9a
Fix a typo in QScript example.

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>
Use qmake for package dependency resolution in cmake tests.

This allows us to remove hardcoded depends information.

Change-Id: I778e3ca6a5f3f316948c652f4f30f00ebbf900cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia4787958ecb8c924cca00b149e908587e9a2b2f1
Remove deprecation of  QScriptContextInfo::columnNumber().

The module is done, there is no need to deprecate functions.
Fix deprecation warning occurring in build.

Change-Id: I01fb9d91ccc3cb4d6fb4e2134960436f18376e3e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Fix CLANG-warnings.

- Unused member variable.
- Unused static functions.
- Return false for pointer.

Change-Id: Ie78332d3754e7f53ed75d6006c11d60c29719c7b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ic66e2b3a22797132c61a155f8574695416e1203b
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I30d4ed2bdc73988b29788ade5f2ccfd3c1cc0eba
Test the cmake scripttools module only if widgets is available.

Change-Id: Ia124db1328e9d6b87c9b1b6858103f81e1678355
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Ie8a79e8c58e45eab13391377dd33750ff2d98c08
Bump MODULE_VERSION to 5.1.0

Change-Id: I6ee4b5ee37256493ffdff08974ae0c08d7278385
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Fix compile on Android

Change-Id: Ide8d4a50169de13e9743f3b2304af2b23c3ce694
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>