← Back to branch summary

~pasnox/monkeystudio/trunk

« back to all changes in this revision

Viewing changes to plugins/xup/QMake/src/QtVersionManager.h

  • Committer: pasnox
  • Date: 2012-04-17 17:44:30 UTC
  • Revision ID: svn-v4:eb2ae826-2224-0410-8894-813e3fd817a8:v2/trunk:4418
Merge from branches/dev 4397 into trunk, ready to realease version 1.9.0.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/xup/QMake/src/QtVersionManager.h
21
21
 
22
22
#include <pSettings.h>
23
23
 
 
24
#include <QStringList>
24
25
#include <QFile>
25
26
#include <QDomDocument>
26
27
 
34
35
 
35
36
    quint32 hash() const
36
37
    {
37
 
            return Path.isEmpty()
38
 
                ? qHash( QString( "%1/%2" ).arg( Version ).arg( QMakeSpec ) )
39
 
                : qHash( QString( "%1/%2" ).arg( Path ).arg( QMakeSpec )/*.arg( QMakeParameters ).arg( HasQt4Suffix )*/ )
40
 
            ;
 
38
        return qHash( ( QStringList( Version ) << Path << QMakeSpec ).join( ":" ) );
41
39
    }
42
40
 
43
41
    bool isValid() const