diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-20 21:10:44 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-05-22 18:46:37 +0200 |
| commit | 2d08cb93fc4422b4670d3c44f7575b3ee5278a1d (patch) | |
| tree | 9b292443f3b7c5474e851a4c6f5f6777bcd20f53 /src/plugins/remotelinux | |
| parent | ca8cd6b806b2c651fa6c941776cd5e587b531f08 (diff) | |
| download | qt-creator-2d08cb93fc4422b4670d3c44f7575b3ee5278a1d.tar.gz | |
Fix non-void function that returned without a return value
QTC_ASSERT(false, action) would print "false" and then take that action
(the return). The other branch of the QTC_ASSERT was a constant false,
so it would never be taken. However, ICC didn't seem happy with it, so I
moved the return to after the checking.
Change-Id: Ia50e75c91fb345e6b21cd5f91df3070544b42d22
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/remotelinux')
| -rw-r--r-- | src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp index a028c1a714..bf740bf56f 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp @@ -92,7 +92,8 @@ LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::dev if (target()->supportsDevice(device) && ++currentRow == idx) return device.staticCast<const LinuxDeviceConfiguration>(); } - QTC_ASSERT(false, return LinuxDeviceConfiguration::ConstPtr()); + QTC_CHECK(false); + return LinuxDeviceConfiguration::ConstPtr(); } LinuxDeviceConfiguration::ConstPtr TypeSpecificDeviceConfigurationListModel::defaultDeviceConfig() const |