← Back to branch summary

~iahmad/kubuntu-packaging/qtcreator

« back to all changes in this revision

Viewing changes to src/shared/qbs/src/lib/buildgraph/automoc.cpp

  • Committer: Timo Jyrinki
  • Date: 2014-01-15 07:44:24 UTC
  • mfrom: (1.1.30)
  • Revision ID: timo.jyrinki@canonical.com-20140115074424-3pnj3a1x6s25im9v
Import upstream version 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shared/qbs/src/lib/buildgraph/automoc.cpp
97
97
        bool alreadyMocced = isVictimOfMoc(artifact, fileType, mocFileTag);
98
98
        bool hasQObjectMacro;
99
99
        scan(artifact, fileType, hasQObjectMacro, includedMocCppFiles);
100
 
        if (hasQObjectMacro && !alreadyMocced) {
 
100
        if (hasQObjectMacro && !alreadyMocced)
101
101
            artifactsToMoc += qMakePair(artifact, fileType);
102
 
        } else if (!hasQObjectMacro && alreadyMocced) {
 
102
        else if (!hasQObjectMacro && alreadyMocced)
103
103
            unmoc(artifact, mocFileTag);
104
 
        }
105
104
    }
106
105
 
107
106
    Artifact *pluginHeaderFile = 0;