diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae074c5..7e9216d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ set(CMAKE_AUTORCC ON)
qt_add_executable(appSolitare
main.cpp
- images.qrc
- qml.qrc
+ qml/images.qrc
+ qml/qml.qrc
)
file(GLOB_RECURSE SOURCES
diff --git a/generate_qrc.sh b/generate_qrc.sh
index 5ee591d..5efa043 100755
--- a/generate_qrc.sh
+++ b/generate_qrc.sh
@@ -33,7 +33,7 @@ EOF
echo "-->" >>"$qrc_file"
}
-pushd "$CUR_DIR" >/dev/null
-generate_qrc "img" "images.qrc" "*.svg"
-generate_qrc "qml" "qml.qrc" "*.qml"
+pushd "$CUR_DIR/qml" >/dev/null
+generate_qrc "../img" "images.qrc" "*.svg"
+generate_qrc "../qml" "qml.qrc" "*.qml"
popd >/dev/null
diff --git a/images.qrc b/images.qrc
deleted file mode 100644
index c3d1781..0000000
--- a/images.qrc
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- img/playing_cards/backs/abstract.svg
- img/playing_cards/backs/abstract_clouds.svg
- img/playing_cards/backs/abstract_scene.svg
- img/playing_cards/backs/astronaut.svg
- img/playing_cards/backs/blue.svg
- img/playing_cards/backs/blue2.svg
- img/playing_cards/backs/cars.svg
- img/playing_cards/backs/castle.svg
- img/playing_cards/backs/fish.svg
- img/playing_cards/backs/frog.svg
- img/playing_cards/backs/red.svg
- img/playing_cards/backs/red2.svg
- img/playing_cards/fronts/clubs_10.svg
- img/playing_cards/fronts/clubs_2.svg
- img/playing_cards/fronts/clubs_3.svg
- img/playing_cards/fronts/clubs_4.svg
- img/playing_cards/fronts/clubs_5.svg
- img/playing_cards/fronts/clubs_6.svg
- img/playing_cards/fronts/clubs_7.svg
- img/playing_cards/fronts/clubs_8.svg
- img/playing_cards/fronts/clubs_9.svg
- img/playing_cards/fronts/clubs_ace.svg
- img/playing_cards/fronts/clubs_jack.svg
- img/playing_cards/fronts/clubs_king.svg
- img/playing_cards/fronts/clubs_queen.svg
- img/playing_cards/fronts/diamonds_10.svg
- img/playing_cards/fronts/diamonds_2.svg
- img/playing_cards/fronts/diamonds_3.svg
- img/playing_cards/fronts/diamonds_4.svg
- img/playing_cards/fronts/diamonds_5.svg
- img/playing_cards/fronts/diamonds_6.svg
- img/playing_cards/fronts/diamonds_7.svg
- img/playing_cards/fronts/diamonds_8.svg
- img/playing_cards/fronts/diamonds_9.svg
- img/playing_cards/fronts/diamonds_ace.svg
- img/playing_cards/fronts/diamonds_jack.svg
- img/playing_cards/fronts/diamonds_king.svg
- img/playing_cards/fronts/diamonds_queen.svg
- img/playing_cards/fronts/hearts_10.svg
- img/playing_cards/fronts/hearts_2.svg
- img/playing_cards/fronts/hearts_3.svg
- img/playing_cards/fronts/hearts_4.svg
- img/playing_cards/fronts/hearts_5.svg
- img/playing_cards/fronts/hearts_6.svg
- img/playing_cards/fronts/hearts_7.svg
- img/playing_cards/fronts/hearts_8.svg
- img/playing_cards/fronts/hearts_9.svg
- img/playing_cards/fronts/hearts_ace.svg
- img/playing_cards/fronts/hearts_jack.svg
- img/playing_cards/fronts/hearts_king.svg
- img/playing_cards/fronts/hearts_queen.svg
- img/playing_cards/fronts/joker_black.svg
- img/playing_cards/fronts/joker_red.svg
- img/playing_cards/fronts/spades_10.svg
- img/playing_cards/fronts/spades_2.svg
- img/playing_cards/fronts/spades_3.svg
- img/playing_cards/fronts/spades_4.svg
- img/playing_cards/fronts/spades_5.svg
- img/playing_cards/fronts/spades_6.svg
- img/playing_cards/fronts/spades_7.svg
- img/playing_cards/fronts/spades_8.svg
- img/playing_cards/fronts/spades_9.svg
- img/playing_cards/fronts/spades_ace.svg
- img/playing_cards/fronts/spades_jack.svg
- img/playing_cards/fronts/spades_king.svg
- img/playing_cards/fronts/spades_queen.svg
-
-
-
diff --git a/qml.qrc b/qml.qrc
deleted file mode 100644
index 7a72752..0000000
--- a/qml.qrc
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- qml/Main.qml
- qml/ScoreBar.qml
- qml/Tableau.qml
- qml/ThrowawayPile.qml
- qml/FoundationPiles.qml
- qml/CardModel.qml
- qml/DrawPile.qml
-
-
-
diff --git a/qml/images.qrc b/qml/images.qrc
new file mode 100644
index 0000000..60bba4d
--- /dev/null
+++ b/qml/images.qrc
@@ -0,0 +1,73 @@
+
+
+
+ ../img/playing_cards/backs/abstract.svg
+ ../img/playing_cards/backs/abstract_clouds.svg
+ ../img/playing_cards/backs/abstract_scene.svg
+ ../img/playing_cards/backs/astronaut.svg
+ ../img/playing_cards/backs/blue.svg
+ ../img/playing_cards/backs/blue2.svg
+ ../img/playing_cards/backs/cars.svg
+ ../img/playing_cards/backs/castle.svg
+ ../img/playing_cards/backs/fish.svg
+ ../img/playing_cards/backs/frog.svg
+ ../img/playing_cards/backs/red.svg
+ ../img/playing_cards/backs/red2.svg
+ ../img/playing_cards/fronts/clubs_10.svg
+ ../img/playing_cards/fronts/clubs_2.svg
+ ../img/playing_cards/fronts/clubs_3.svg
+ ../img/playing_cards/fronts/clubs_4.svg
+ ../img/playing_cards/fronts/clubs_5.svg
+ ../img/playing_cards/fronts/clubs_6.svg
+ ../img/playing_cards/fronts/clubs_7.svg
+ ../img/playing_cards/fronts/clubs_8.svg
+ ../img/playing_cards/fronts/clubs_9.svg
+ ../img/playing_cards/fronts/clubs_ace.svg
+ ../img/playing_cards/fronts/clubs_jack.svg
+ ../img/playing_cards/fronts/clubs_king.svg
+ ../img/playing_cards/fronts/clubs_queen.svg
+ ../img/playing_cards/fronts/diamonds_10.svg
+ ../img/playing_cards/fronts/diamonds_2.svg
+ ../img/playing_cards/fronts/diamonds_3.svg
+ ../img/playing_cards/fronts/diamonds_4.svg
+ ../img/playing_cards/fronts/diamonds_5.svg
+ ../img/playing_cards/fronts/diamonds_6.svg
+ ../img/playing_cards/fronts/diamonds_7.svg
+ ../img/playing_cards/fronts/diamonds_8.svg
+ ../img/playing_cards/fronts/diamonds_9.svg
+ ../img/playing_cards/fronts/diamonds_ace.svg
+ ../img/playing_cards/fronts/diamonds_jack.svg
+ ../img/playing_cards/fronts/diamonds_king.svg
+ ../img/playing_cards/fronts/diamonds_queen.svg
+ ../img/playing_cards/fronts/hearts_10.svg
+ ../img/playing_cards/fronts/hearts_2.svg
+ ../img/playing_cards/fronts/hearts_3.svg
+ ../img/playing_cards/fronts/hearts_4.svg
+ ../img/playing_cards/fronts/hearts_5.svg
+ ../img/playing_cards/fronts/hearts_6.svg
+ ../img/playing_cards/fronts/hearts_7.svg
+ ../img/playing_cards/fronts/hearts_8.svg
+ ../img/playing_cards/fronts/hearts_9.svg
+ ../img/playing_cards/fronts/hearts_ace.svg
+ ../img/playing_cards/fronts/hearts_jack.svg
+ ../img/playing_cards/fronts/hearts_king.svg
+ ../img/playing_cards/fronts/hearts_queen.svg
+ ../img/playing_cards/fronts/joker_black.svg
+ ../img/playing_cards/fronts/joker_red.svg
+ ../img/playing_cards/fronts/spades_10.svg
+ ../img/playing_cards/fronts/spades_2.svg
+ ../img/playing_cards/fronts/spades_3.svg
+ ../img/playing_cards/fronts/spades_4.svg
+ ../img/playing_cards/fronts/spades_5.svg
+ ../img/playing_cards/fronts/spades_6.svg
+ ../img/playing_cards/fronts/spades_7.svg
+ ../img/playing_cards/fronts/spades_8.svg
+ ../img/playing_cards/fronts/spades_9.svg
+ ../img/playing_cards/fronts/spades_ace.svg
+ ../img/playing_cards/fronts/spades_jack.svg
+ ../img/playing_cards/fronts/spades_king.svg
+ ../img/playing_cards/fronts/spades_queen.svg
+
+
+
diff --git a/qml/qml.qrc b/qml/qml.qrc
new file mode 100644
index 0000000..ec813c9
--- /dev/null
+++ b/qml/qml.qrc
@@ -0,0 +1,14 @@
+
+
+
+ ../qml/Main.qml
+ ../qml/ScoreBar.qml
+ ../qml/Tableau.qml
+ ../qml/ThrowawayPile.qml
+ ../qml/FoundationPiles.qml
+ ../qml/CardModel.qml
+ ../qml/DrawPile.qml
+
+
+