Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MAC' of github.com:NissimHadar/hifi into MAC

Browse source
This commit is contained in:
NissimHadar 2018-11-12 12:20:32 -08:00
commit 050a13433b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/nitpick/src/TestRunner.cpp
View file

@ -490,7 +490,7 @@ void TestRunner::runInterfaceWithTestScript() {
" --testScript " + testScript + " quitWhenFinished" +
" --testResultsLocation " + _snapshotFolder;
interfaceWorker->setCommandLine(commandLine);
_interfaceWorker->setCommandLine(commandLine);
emit startInterface();
#elif defined Q_OS_MAC
// On The Mac, we need to resize Interface. The Interface window opens a few seconds after the process

2
tools/nitpick/src/ui/Nitpick.cpp
View file

@ -100,7 +100,7 @@ void Nitpick::on_tabWidget_currentChanged(int index) {
// Enable the GitHub edit boxes as required
#ifdef Q_OS_WIN
if (index == 0 || index == 2 || index == 3) {
#elif defined Q_OS_MAC
#else
if (index == 0 || index == 1 || index == 2) {
#endif
_ui.userLineEdit->setDisabled(false);