e827cb144e
Generating *.pro.user files is not ideal; they're supposed to hold user-specific settings for a project, and thus also to persist manual changes made by the user after initial import of the project. Generate *.pro.shared files instead which are meant to be used to share project settings. [1] This just changes the file name of the generated file for now, but leaves the content the same. The result for the initial loading of the project from a '*.pro' file is basically still the same from a user perspective: A new kit 'Replacement for "Desktop"' is generated on the fly which contains the build and run settings specified in the corresponding '*.pro.shared' file. By using the '*.pro.shared' files, user-specific settings made after initial import will no longer be overwritten by running 'make qtcreator-ide-integration' again, since the '*.pro.user' files are left as they are. The '*.pro.shared' files generated here still contain information specific to the local setup (like file paths). For some more background on LO's Qt Creator IDE integration, s. dev mailing list thread "Added some information about Qt Creator IDE integration to the wiki" [2]. [1] https://doc.qt.io/qtcreator/creator-sharing-project-settings.html [2] https://lists.freedesktop.org/archives/libreoffice/2021-February/thread.html#86800 Change-Id: Ia187bcbffe5297a1cdf6bfeaaabf7867003195e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111474 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
177 lines
2.8 KiB
Text
177 lines
2.8 KiB
Text
#
|
|
# LibreOffice project .gitignore rules.
|
|
#
|
|
# Do not add you pet ignore rule here, use
|
|
# .git/info/exclude for per repo personal ignore or
|
|
# in the file specified by core.excludesfiles in your
|
|
# ~/.gitconfig
|
|
#
|
|
# As a rule of thumb:
|
|
# File that are generated by configure or the build
|
|
# but that are not deleted by make clean
|
|
# can be listed here... These must be deleted by make distclean
|
|
#
|
|
# Files that are generated by the build but deleted by make clean
|
|
# should all be under workdir or instdir
|
|
# if that is not the case, don't hide it here, but try to fix it
|
|
#
|
|
# The intent is that after a make distclean, .gitignore
|
|
# should not catch anything but possibly /external/tarballs
|
|
#
|
|
|
|
# where stuff is built
|
|
/buck-out
|
|
/instdir
|
|
/instdir_for_build
|
|
/workdir
|
|
/workdir_for_build
|
|
/test-install
|
|
|
|
# default location for external downloads
|
|
/external/tarballs
|
|
/external/android-ndk
|
|
/external/android-sdk-linux
|
|
|
|
# autoconf generated stuff
|
|
/aclocal.m4
|
|
/autom4te.cache
|
|
/autogen.input
|
|
/autogen.lastrun
|
|
/autogen.lastrun.bak
|
|
/ChangeLog
|
|
/config.Build.log
|
|
/config.guess
|
|
/config.log
|
|
/config.status
|
|
/config.parms
|
|
/config_host.mk
|
|
/config_host.mk.last
|
|
/config_host.mk.stamp
|
|
/config_host_lang.mk
|
|
/config_host_lang.mk.last
|
|
/config_host_lang.mk.stamp
|
|
/config_build
|
|
/config_build.mk
|
|
/config_build_lang.mk
|
|
/configure
|
|
/bin/bffvalidator.sh
|
|
/bin/odfvalidator.sh
|
|
/bin/officeotron.sh
|
|
/hardened_runtime.xcent
|
|
/Makefile
|
|
|
|
# make id
|
|
/ID
|
|
|
|
# make tags
|
|
|
|
**/tags
|
|
**/.tags*
|
|
|
|
# make etags
|
|
/TAGS
|
|
|
|
# backup and temporary editor files: the only convenience rules allowed here.
|
|
*~
|
|
.*sw?
|
|
\#*
|
|
.\#*
|
|
*.kdev4
|
|
.kdev_include_paths
|
|
.buckd
|
|
.directory
|
|
.cproject
|
|
.project
|
|
.settings
|
|
.eclipsesettingfile
|
|
eclipsesettingfile.xml
|
|
.clang_complete
|
|
.cxx_tags
|
|
.yavide_proj
|
|
.yavide_session
|
|
.vscode
|
|
*.code-workspace
|
|
|
|
# things below this point are targeted for elimination
|
|
|
|
#stuff that we should no generated where they are
|
|
/desktop/scripts/soffice.sh
|
|
/intltool-extract.in
|
|
/intltool-merge.in
|
|
/intltool-update.in
|
|
*.pyc
|
|
/install
|
|
/*/*.exe
|
|
/solenv/gdb/libreoffice/*.pyo
|
|
/solenv/gdb/libreoffice/util/*.pyo
|
|
/moz/zipped/*.zip
|
|
__pycache__
|
|
|
|
# OSX specific
|
|
.DS_Store
|
|
|
|
# Xcode specific
|
|
build/
|
|
*.pbxuser
|
|
!default.pbxuser
|
|
*.mode1v3
|
|
!default.mode1v3
|
|
*.mode2v3
|
|
!default.mode2v3
|
|
*.perspectivev3
|
|
!default.perspectivev3
|
|
xcuserdata
|
|
*.xcuserstate
|
|
*.xccheckout
|
|
*.moved-aside
|
|
DerivedData
|
|
*.xcworkspace
|
|
|
|
# MSVS specific
|
|
*/Debug
|
|
*.sdf
|
|
*.sln
|
|
*.v11*
|
|
*.v12*
|
|
*.opensdf
|
|
*.vcxproj*
|
|
/.vs
|
|
/.vscode
|
|
*.VC.db
|
|
LibreOffice.VC.VC.opendb
|
|
|
|
# QtCreator specific
|
|
*.pro
|
|
*.pro.shared
|
|
*.pro.user
|
|
*.pro.user.*
|
|
|
|
# doxygen output
|
|
/docs
|
|
|
|
# make dump-deps output
|
|
/lo.png
|
|
|
|
# gdb config
|
|
/.gdbinit
|
|
/.gdb_history
|
|
|
|
# Codelite IDE specific
|
|
*.project
|
|
/.codelite
|
|
*.workspace
|
|
*.workspace.session
|
|
*.tags
|
|
|
|
# JetBrains Clion Specific
|
|
.idea
|
|
|
|
# Cscope
|
|
*.out
|
|
|
|
# Sublime Specific
|
|
*.sublime-project
|
|
*.sublime-workspace
|
|
|
|
# vim-ide-integration
|
|
/compile_commands.json
|