Merge lp:~mc-return/compiz/compiz.merge-added-qtcreator-config-file-for-contributors into lp:compiz/0.9.10

[Sam Spilsbury]

Added contribute directory.
Added QtCreatorConfig.xml, a configuration file for Qt Creator, which
adjusts Qt Creator's C++ indentation style to be the same that is used
in the Compiz project (X11, mixed spaces and tabs).

Added contribute directory.
Added QtCreatorConfig.xml, a configuration file for Qt Creator, which
adjusts Qt Creator's C++ indentation style to be the same that is used
in the Compiz project (X11, mixed spaces and tabs).
Should be very helpful for contributors. :)

TODO: Add html or text coding style files.

[Sam Spilsbury (smspillaz)]

Should QtCreatorConfig.xml be in the for_contributors directory? (perhaps that could be renamed to tools/ too)

review: Needs Information

[MC Return (mc-return)]

> Should QtCreatorConfig.xml be in the for_contributors directory? (perhaps that
> could be renamed to tools/ too)

Well, this directory should contain helpful files and documentation (Compiz coding style information, compilation/test HOWTOs & so on) for contributors in the future, so I do not think that "tools" would be a appropriate name for it...

[MC Return (mc-return)]

If you do not like the underscore in "for_contributors", another suggestion would be simply "contribute"...

review: Needs Information

[MC Return (mc-return)]

Maybe camelCase ? -> forContributors ?

[Sam Spilsbury (smspillaz)]

contribute/ would work fine, yes.

[MC Return (mc-return)]

> contribute/ would work fine, yes.

Done in r3733.

review: Needs Resubmitting

[MC Return (mc-return)]

More than 2 weeks to get 1 small file landing...
Sad :(

[Sam Spilsbury (smspillaz)]

Didn't I say this should have been in contribute/ ?

[MC Return (mc-return)]

> Didn't I say this should have been in contribute/ ?

http://bazaar.launchpad.net/~mc-return/compiz/compiz.merge-added-qtcreator-config-file-for-contributors/revision/3733 ?

[MC Return (mc-return)]

> > contribute/ would work fine, yes.
>
> Done in r3733.

> > Didn't I say this should have been in contribute/ ?
>
> Yes you did, and this is where it now resides.

[Sam Spilsbury (smspillaz)]

smspillaz@INTERPOL ~/Source/compiz> ls
AUTHORS compiz.pc.in debian libdecoration README
build config.h.core.in Doxyfile metadata RELEASING
ChangeLog contribute gtk NEWS scripts
cmake COPYING images plugins src
CMakeLists.txt COPYING.GPL include po tests
CMakeLists.txt.user COPYING.LGPL INSTALL postinst VERSION
compizconfig COPYING.MIT kde QtCreatorConfig.xml xslt

Um, QtCreatorConfig.xml is still in the root dir.

review: Needs Fixing

[MC Return (mc-return)]

Urgh - sorry -> my fault.
Do not know how that happened ?! but should be fixed now.

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

Coolio.

We'll put this in after the freeze.

review: Approve

[MC Return (mc-return)]

Ping ?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3734
http://jenkins.qa.ubuntu.com/job/compiz-ci/212/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/253/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/212/rebuild

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

ps-jenkins, try harder -> this MP has no potential to crash you at all ;)

[MC Return (mc-return)]

review: Needs Resubmitting

[MC Return (mc-return)]

Well, approve from me. :)
(Do not know what exactly happened here, but LGTM.)

review: Approve

[MC Return (mc-return)]

It is approved by you and me, let's get it off the table and make it land...

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3734
http://jenkins.qa.ubuntu.com/job/compiz-ci/220/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/261/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/220/rebuild

review: Needs Fixing (continuous-integration)

=== added directory 'contribute'
=== added file 'contribute/QtCreatorConfig.xml'
--- contribute/QtCreatorConfig.xml	1970-01-01 00:00:00 +0000
+++ contribute/QtCreatorConfig.xml	2013-06-28 01:47:34 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 2.7.1, 2013-06-01T14:35:39. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">true</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">true</value>
+   <value type="bool" key="BindStarToLeftSpecifier">false</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">false</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">false</value>
+   <value type="bool" key="IndentAccessSpecifiers">true</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">false</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">true</value>
+   <value type="int" key="PaddingMode">2</value>
+   <value type="bool" key="SpacesForTabs">false</value>
+   <value type="int" key="TabSize">8</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">X11</value>
+ </data>
+</qtcreator>