From 566b312cd213a31f63f8a7cb0b5da5fe63d7d7cd Mon Sep 17 00:00:00 2001
From: Olli Werwolff <qtc-commiter@nokia.com>
Date: Thu, 29 Jan 2009 11:52:13 +0100
Subject: [PATCH] Fixes: "Add anyway" button must not be shown, when a
resource file shall be added and it is not located in the (sub-)directory of
the qrc-file
Task: -
RevBy: thorbjorn
AutoTest: -
Details: -
---
src/shared/qrceditor/qrceditor.cpp | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp
index bd25a42d742..b1430a08abc 100644
--- a/src/shared/qrceditor/qrceditor.cpp
+++ b/src/shared/qrceditor/qrceditor.cpp
@@ -225,7 +225,6 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
QMessageBox message(this);
message.setWindowTitle(tr("Invalid file"));
message.setIcon(QMessageBox::Warning);
- QPushButton * const continueButton = message.addButton(tr("Add anyway"), QMessageBox::AcceptRole);
QPushButton * const copyButton = message.addButton(tr("Copy"), QMessageBox::ActionRole);
QPushButton * const skipButton = message.addButton(tr("Don't add"), QMessageBox::DestructiveRole);
QPushButton * const abortButton = message.addButton(tr("Abort"), QMessageBox::RejectRole);
@@ -234,9 +233,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
message.setText(tr("The file %1 is not in a subdirectory of the resource file. Continuing will result in an invalid resource file.")
.arg(QDir::toNativeSeparators(file)));
message.exec();
- if (message.clickedButton() == continueButton) {
- continue;
- } else if (message.clickedButton() == skipButton) {
+ if (message.clickedButton() == skipButton) {
files.removeAt(i);
count--;
i--; // Compensate i++
--
GitLab