kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix build with Qt 4.2. 

BUG:  Fix new editors stealing focus while typing search text.
ENH:  Look for translation in data dir, not bin dir.
This commit is contained in:
Clinton Stimpson 2008-02-08 10:42:14 -05:00
parent a71d56096c
commit 45cf2ade08
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/QtDialog/CMakeSetup.cxx
View File

@ -19,6 +19,7 @@
#include <QFileInfo>
#include <QDir>
#include <QTranslator>
#include <QLocale>
#include "CMakeSetupDialog.h"
#include "cmDocumentation.h"
@ -66,21 +67,28 @@ int main(int argc, char** argv)
{
QApplication app(argc, argv);
// tell the cmake library where cmake is
QDir cmExecDir(QApplication::applicationDirPath());
#if defined(Q_OS_MAC)
cmExecDir.cd("../../../");
#endif
cmSystemTools::FindExecutableDirectory(cmExecDir.filePath("cmake").toAscii().data());
// pick up translation files if they exists in the data directory
QDir translationsDir = cmExecDir;
translationsDir.cd(".." CMAKE_DATA_DIR);
translationsDir.cd("i18n");
QTranslator translator;
QString transfile = QString("cmake_%1").arg(QLocale::system().name());
translator.load(transfile, app.applicationDirPath());
translator.load(transfile, translationsDir.path());
app.installTranslator(&translator);
// app setup
app.setApplicationName("CMakeSetup");
app.setOrganizationName("Kitware");
app.setWindowIcon(QIcon(":/Icons/CMakeSetup.png"));
// do docs, if args were given
cmDocumentation doc;
if(app.arguments().size() > 1 &&
doc.CheckOptions(app.argc(), app.argv()))

1
Source/QtDialog/QCMakeCacheView.cxx
View File

@ -146,6 +146,7 @@ bool QCMakeCacheView::showAdvanced() const
void QCMakeCacheView::setSearchFilter(const QString& s)
{
this->selectionModel()->clear();
this->SearchFilter->setFilterFixedString(s);
}