Skip to content

Commit

Permalink
chroe: update .gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
XMuli committed Oct 31, 2022
1 parent 494ac18 commit baf3cf9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 36 deletions.
39 changes: 4 additions & 35 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Created by https://www.toptal.com/developers/gitignore/api/qt,qtcreator,clion,visualstudio,visualstudiocode,c++,cmake,macos,windows,linux
# Edit at https://www.toptal.com/developers/gitignore?templates=qt,qtcreator,clion,visualstudio,visualstudiocode,c++,cmake,macos,windows,linux
# Created by https://www.toptal.com/developers/gitignore/api/qt,cmake,c++,visualstudio,visualstudiocode,clion,macos,windows,linux
# Edit at https://www.toptal.com/developers/gitignore?templates=qt,cmake,c++,visualstudio,visualstudiocode,clion,macos,windows,linux

### C++ ###
# Prerequisites
Expand Down Expand Up @@ -80,6 +80,7 @@

# CMake
cmake-build-*/
build*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml
Expand Down Expand Up @@ -259,38 +260,6 @@ CMakeLists.txt.user*

*_qmlcache.qrc

### QtCreator ###
# gitignore for Qt Creator like IDE for pure C/C++ project without Qt
#
# Reference: http://doc.qt.io/qtcreator/creator-project-generic.html



# Qt Creator autogenerated files


# A listing of all the files included in the project
*.files

# Include directories
*.includes

# Project configuration settings like predefined Macros
*.config

# Qt Creator settings
*.creator

# User project settings
*.creator.user*

# Qt Creator backups

# Flags for Clang Code Model
*.cxxflags
*.cflags


### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
Expand Down Expand Up @@ -723,4 +692,4 @@ FodyWeavers.xsd
### VisualStudio Patch ###
# Additional files built by Visual Studio

# End of https://www.toptal.com/developers/gitignore/api/qt,qtcreator,clion,visualstudio,visualstudiocode,c++,cmake,macos,windows,linux
# End of https://www.toptal.com/developers/gitignore/api/qt,cmake,c++,visualstudio,visualstudiocode,clion,macos,windows,linux
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ int main(int argc, char *argv[])
QString qmPath(qApp->applicationDirPath());

#if defined(Q_OS_MAC)
qmPath += "/../../../../src/translations/" + lanuage + ".qm";
qmPath += "/../../../../bin/translations/" + lanuage + ".qm";
#elif defined(Q_OS_WIN)
if (QString(_COMPILER_ID).compare("MSVC") == 0)
qmPath += "/../translations/" + lanuage + ".qm";
Expand Down

0 comments on commit baf3cf9

Please sign in to comment.