From 28caec76f3650fe3a9804b2a58a78051e5f7f265 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sat, 6 Jun 2015 12:09:50 +0200
Subject: [PATCH] move qtcreator project file to src/mkvtoolnix-gui directory

---
 .gitignore                                    |  2 +-
 Rakefile                                      |  4 +-
 src/mkvtoolnix-gui/mkvtoolnix-gui.pro         | 41 +++++++++++++++++++
 .../qtcreator/mkvtoolnix-gui.pro              | 41 -------------------
 4 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 src/mkvtoolnix-gui/mkvtoolnix-gui.pro
 delete mode 100644 src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro

diff --git a/.gitignore b/.gitignore
index ec834a688..c1ff1902f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,8 @@
 /src/mkvpropedit
 /src/mkvtoolnix-gui/forms/**/*.h
 /src/mkvtoolnix-gui/mkvtoolnix-gui
+/src/mkvtoolnix-gui/mkvtoolnix-gui.pro.user*
 /src/mkvtoolnix-gui/qt_resources.cpp
-/src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro.user*
 /src/mmg/mmg
 /src/mmg/mmg-gui
 /src/tools/ac3parser
diff --git a/Rakefile b/Rakefile
index 8a6e9a021..b15aaf7ba 100755
--- a/Rakefile
+++ b/Rakefile
@@ -537,7 +537,7 @@ namespace :dev do
 
     desc "Update Qt project file"
     task "update-qt-project" do
-      project_file = "src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro"
+      project_file = "src/mkvtoolnix-gui/mkvtoolnix-gui.pro"
       content      = []
       skipping     = false
       IO.readlines(project_file).collect { |line| line.chomp }.each do |line|
@@ -545,7 +545,7 @@ namespace :dev do
 
         if /^FORMS\b/.match line
           skipping  = true
-          content  += $gui_ui_files.collect { |ui| ui.gsub!(/.*forms\//, '../forms/'); "    #{ui} \\" }.sort
+          content  << $gui_ui_files.collect { |ui| ui.gsub!(/.*forms\//, 'forms/'); "    #{ui}" }.sort.join(" \\\n")
 
         elsif skipping && /^\s*$/.match(line)
           skipping  = false
diff --git a/src/mkvtoolnix-gui/mkvtoolnix-gui.pro b/src/mkvtoolnix-gui/mkvtoolnix-gui.pro
new file mode 100644
index 000000000..2170790c1
--- /dev/null
+++ b/src/mkvtoolnix-gui/mkvtoolnix-gui.pro
@@ -0,0 +1,41 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2012-04-11T09:06:08
+#
+#-------------------------------------------------
+
+QT       += core gui
+
+TARGET = gui
+TEMPLATE = app
+
+
+SOURCES +=
+HEADERS +=
+
+FORMS += \
+    forms/chapter_editor/mass_modification_dialog.ui \
+    forms/chapter_editor/tab.ui \
+    forms/chapter_editor/tool.ui \
+    forms/header_editor/tab.ui \
+    forms/header_editor/tool.ui \
+    forms/header_editor/track_type_page.ui \
+    forms/header_editor/value_page.ui \
+    forms/jobs/tool.ui \
+    forms/main_window/available_update_info_dialog.ui \
+    forms/main_window/main_window.ui \
+    forms/main_window/preferences_dialog.ui \
+    forms/main_window/status_bar_progress_widget.ui \
+    forms/merge/adding_appending_files_dialog.ui \
+    forms/merge/additional_command_line_options_dialog.ui \
+    forms/merge/ask_scan_for_playlists_dialog.ui \
+    forms/merge/command_line_dialog.ui \
+    forms/merge/select_playlist_dialog.ui \
+    forms/merge/tab.ui \
+    forms/merge/tool.ui \
+    forms/util/side_by_side_multi_select.ui \
+    forms/watch_jobs/tab.ui \
+    forms/watch_jobs/tool.ui
+
+RESOURCES += \
+    qt_resources.qrc
diff --git a/src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro b/src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro
deleted file mode 100644
index 285ba2740..000000000
--- a/src/mkvtoolnix-gui/qtcreator/mkvtoolnix-gui.pro
+++ /dev/null
@@ -1,41 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-04-11T09:06:08
-#
-#-------------------------------------------------
-
-QT       += core gui
-
-TARGET = gui
-TEMPLATE = app
-
-
-SOURCES +=
-HEADERS +=
-
-FORMS += \
-    ../forms/chapter_editor/mass_modification_dialog.ui \
-    ../forms/chapter_editor/tab.ui \
-    ../forms/chapter_editor/tool.ui \
-    ../forms/header_editor/tab.ui \
-    ../forms/header_editor/tool.ui \
-    ../forms/header_editor/track_type_page.ui \
-    ../forms/header_editor/value_page.ui \
-    ../forms/jobs/tool.ui \
-    ../forms/main_window/available_update_info_dialog.ui \
-    ../forms/main_window/main_window.ui \
-    ../forms/main_window/preferences_dialog.ui \
-    ../forms/main_window/status_bar_progress_widget.ui \
-    ../forms/merge/adding_appending_files_dialog.ui \
-    ../forms/merge/additional_command_line_options_dialog.ui \
-    ../forms/merge/ask_scan_for_playlists_dialog.ui \
-    ../forms/merge/command_line_dialog.ui \
-    ../forms/merge/select_playlist_dialog.ui \
-    ../forms/merge/tab.ui \
-    ../forms/merge/tool.ui \
-    ../forms/util/side_by_side_multi_select.ui \
-    ../forms/watch_jobs/tab.ui \
-    ../forms/watch_jobs/tool.ui
-
-RESOURCES += \
-    ../qt_resources.qrc