Commit c3a9436c authored by Kai Koehne's avatar Kai Koehne

Qt4Target: Compile fix

Remove conflict markers.

Change-Id: Ie54881eff9df4966d093782841db4db5b4c4268f
Reviewed-on: http://codereview.qt.nokia.com/110Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarKai Koehne <kai.koehne@nokia.com>
parent 81479739
......@@ -77,16 +77,10 @@ public:
// This is the same for almost all Qt4Targets
// so for now offer a convience function
<<<<<<< HEAD
Qt4BuildConfiguration *addQt4BuildConfiguration(QString displayName,
QtSupport::BaseQtVersion *qtversion,
QtSupport::BaseQtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
=======
Qt4BuildConfiguration *addQt4BuildConfiguration(QString defaultDisplayName,
QString displayName,
BaseQtVersion *qtversion,
BaseQtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
>>>>>>> BuildConfiguration: Adapt name if Qt version changes
QtSupport::BaseQtVersion *qtversion,
QtSupport::BaseQtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
QString additionalArguments,
QString directory);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment