Merged in hotfix (pull request #108)
Merge hotfix branch. --HG-- branch : develop
This commit is contained in:
commit
c85b83fcdb
2 changed files with 3 additions and 1 deletions
|
@ -237,6 +237,7 @@ SET(CPACK_PACKAGE_VERSION_MINOR "${NL_VERSION_MINOR}")
|
|||
SET(CPACK_PACKAGE_VERSION_PATCH "${NL_VERSION_PATCH}")
|
||||
SET(CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};NeL;ALL;/")
|
||||
SET(CPACK_PACKAGE_EXECUTABLES "ryzomcore${NL_VERSION}" "ryzomcore")
|
||||
SET(CPACK_SET_DESTDIR TRUE)
|
||||
|
||||
# NSIS Specific Packing Setup
|
||||
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "RyzomCore")
|
||||
|
|
|
@ -170,7 +170,8 @@ void SettingsDialog::onPrimitivesBClicked()
|
|||
|
||||
void SettingsDialog::onLigoBClicked()
|
||||
{
|
||||
QString p = QFileDialog::getExistingDirectory( this, tr( "LIGO directory" ), "" );
|
||||
QString p;
|
||||
p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" );
|
||||
ligoLE->setText( p );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue