diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-16 16:42:56 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-16 16:46:03 +0100 |
| commit | 65c169c80ee14d98a220c5d665f8e86b2630ec71 (patch) | |
| tree | e8b5f3754d978044d4986541a695d54458af91c2 /src/plugins/bineditor | |
| parent | 72e3605a01394fe2f67ea159f757a4d5a1c3ab90 (diff) | |
| parent | 6ec9dd10a5d8e232687c850b83d89c1746dc34e5 (diff) | |
| download | qt-creator-65c169c80ee14d98a220c5d665f8e86b2630ec71.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/android/androidrunner.cpp
src/plugins/projectexplorer/kitmanager.cpp
Change-Id: I653ddaef6e341818fc74aacfe30e89c07f40a8c6
Diffstat (limited to 'src/plugins/bineditor')
| -rw-r--r-- | src/plugins/bineditor/bineditorplugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 0eaebaa276..692a7d4b83 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -218,7 +218,7 @@ public: bool open(QString *errorString, const QString &fileName, quint64 offset = 0) { QFile file(fileName); quint64 size = static_cast<quint64>(file.size()); - if (size == 0) { + if (size == 0 && !fileName.isEmpty()) { QString msg = tr("The Binary Editor cannot open empty files."); if (errorString) *errorString = msg; |