From 1403770d04555d78d8afd186bad19c4306d4b1fa Mon Sep 17 00:00:00 2001 From: Qiaoyong Zhong Date: Sun, 13 Sep 2015 22:22:21 +0800 Subject: [PATCH] restructured the project --- 2048-qt.pro | 15 ++++++++------- 2048-qt.desktop => res/2048-qt.desktop | 0 {fonts => res/fonts}/DroidSansFallback.ttf | Bin {icons => res/icons}/16x16/apps/2048-qt.png | Bin {icons => res/icons}/2048-qt.ico | Bin {icons => res/icons}/256x256/apps/2048-qt.png | Bin {icons => res/icons}/32x32/apps/2048-qt.png | Bin {icons => res/icons}/48x48/apps/2048-qt.png | Bin {icons => res/icons}/scalable/apps/2048-qt.svg | 0 {man => res/man}/2048-qt.6 | 0 resources.qrc | 2 +- .../deploy_on_windows.bat | 0 {icons => scripts}/svg2png.sh | 0 main.cpp => src/main.cpp | 0 myclass.cpp => src/myclass.cpp | 0 myclass.h => src/myclass.h | 0 settings.cpp => src/settings.cpp | 0 settings.h => src/settings.h | 0 18 files changed, 9 insertions(+), 8 deletions(-) rename 2048-qt.desktop => res/2048-qt.desktop (100%) rename {fonts => res/fonts}/DroidSansFallback.ttf (100%) rename {icons => res/icons}/16x16/apps/2048-qt.png (100%) rename {icons => res/icons}/2048-qt.ico (100%) rename {icons => res/icons}/256x256/apps/2048-qt.png (100%) rename {icons => res/icons}/32x32/apps/2048-qt.png (100%) rename {icons => res/icons}/48x48/apps/2048-qt.png (100%) rename {icons => res/icons}/scalable/apps/2048-qt.svg (100%) rename {man => res/man}/2048-qt.6 (100%) rename deploy_on_windows.bat => scripts/deploy_on_windows.bat (100%) rename {icons => scripts}/svg2png.sh (100%) rename main.cpp => src/main.cpp (100%) rename myclass.cpp => src/myclass.cpp (100%) rename myclass.h => src/myclass.h (100%) rename settings.cpp => src/settings.cpp (100%) rename settings.h => src/settings.h (100%) diff --git a/2048-qt.pro b/2048-qt.pro index bc2fc67..8ef0d1a 100644 --- a/2048-qt.pro +++ b/2048-qt.pro @@ -2,9 +2,10 @@ TEMPLATE = app QT += qml quick widgets -SOURCES += main.cpp \ - myclass.cpp \ - settings.cpp +SOURCES += \ + src/main.cpp \ + src/myclass.cpp \ + src/settings.cpp lupdate_only { SOURCES += qml/main.qml \ @@ -22,12 +23,12 @@ QML_IMPORT_PATH = include(deployment.pri) # Setting the application icon -win32: RC_ICONS = icons/2048-qt.ico # On Windows -macx: ICON = icons/2048-qt.ico # On Mac OSX +win32: RC_ICONS = res/icons/2048-qt.ico # On Windows +macx: ICON = res/icons/2048-qt.ico # On Mac OSX HEADERS += \ - myclass.h \ - settings.h + src/settings.h \ + src/myclass.h TRANSLATIONS = ts/2048-qt_zh_CN.ts ts/2048-qt_ru_RU.ts diff --git a/2048-qt.desktop b/res/2048-qt.desktop similarity index 100% rename from 2048-qt.desktop rename to res/2048-qt.desktop diff --git a/fonts/DroidSansFallback.ttf b/res/fonts/DroidSansFallback.ttf similarity index 100% rename from fonts/DroidSansFallback.ttf rename to res/fonts/DroidSansFallback.ttf diff --git a/icons/16x16/apps/2048-qt.png b/res/icons/16x16/apps/2048-qt.png similarity index 100% rename from icons/16x16/apps/2048-qt.png rename to res/icons/16x16/apps/2048-qt.png diff --git a/icons/2048-qt.ico b/res/icons/2048-qt.ico similarity index 100% rename from icons/2048-qt.ico rename to res/icons/2048-qt.ico diff --git a/icons/256x256/apps/2048-qt.png b/res/icons/256x256/apps/2048-qt.png similarity index 100% rename from icons/256x256/apps/2048-qt.png rename to res/icons/256x256/apps/2048-qt.png diff --git a/icons/32x32/apps/2048-qt.png b/res/icons/32x32/apps/2048-qt.png similarity index 100% rename from icons/32x32/apps/2048-qt.png rename to res/icons/32x32/apps/2048-qt.png diff --git a/icons/48x48/apps/2048-qt.png b/res/icons/48x48/apps/2048-qt.png similarity index 100% rename from icons/48x48/apps/2048-qt.png rename to res/icons/48x48/apps/2048-qt.png diff --git a/icons/scalable/apps/2048-qt.svg b/res/icons/scalable/apps/2048-qt.svg similarity index 100% rename from icons/scalable/apps/2048-qt.svg rename to res/icons/scalable/apps/2048-qt.svg diff --git a/man/2048-qt.6 b/res/man/2048-qt.6 similarity index 100% rename from man/2048-qt.6 rename to res/man/2048-qt.6 diff --git a/resources.qrc b/resources.qrc index 8e26ef5..6914e54 100644 --- a/resources.qrc +++ b/resources.qrc @@ -5,6 +5,6 @@ qml/main.qml qml/2048.js qml/Tile.qml - fonts/DroidSansFallback.ttf + res/fonts/DroidSansFallback.ttf diff --git a/deploy_on_windows.bat b/scripts/deploy_on_windows.bat similarity index 100% rename from deploy_on_windows.bat rename to scripts/deploy_on_windows.bat diff --git a/icons/svg2png.sh b/scripts/svg2png.sh similarity index 100% rename from icons/svg2png.sh rename to scripts/svg2png.sh diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/myclass.cpp b/src/myclass.cpp similarity index 100% rename from myclass.cpp rename to src/myclass.cpp diff --git a/myclass.h b/src/myclass.h similarity index 100% rename from myclass.h rename to src/myclass.h diff --git a/settings.cpp b/src/settings.cpp similarity index 100% rename from settings.cpp rename to src/settings.cpp diff --git a/settings.h b/src/settings.h similarity index 100% rename from settings.h rename to src/settings.h