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

Merge pull request #14930 from NissimHadar/fixCMake

Browse source 
Case 21241: Fix CMake problem for ubuntu build of nitpick
This commit is contained in:
Sam Gateau 2019-02-15 11:23:58 -08:00 committed by GitHub
commit 5e9eeccb95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/CMakeLists.txt
View file

@ -20,7 +20,7 @@ endfunction()
if (BUILD_TOOLS) if (BUILD_TOOLS)
# Allow different tools for stable builds # Allow different tools for stable builds
if (STABLE_BUILD) if (RELEASE_TYPE STREQUAL "PRODUCTION")
set(ALL_TOOLS set(ALL_TOOLS
udt-test udt-test
vhacd-util vhacd-util

8
tools/nitpick/src/Nitpick.cpp
View file

@ -40,7 +40,11 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
_ui.plainTextEdit->setReadOnly(true); _ui.plainTextEdit->setReadOnly(true);
setWindowTitle("Nitpick - v2.1.2"); setWindowTitle("Nitpick - v3.0.0");
clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
_ui.clientProfileComboBox->insertItems(0, clientProfiles);
} }
Nitpick::~Nitpick() { Nitpick::~Nitpick() {
@ -157,7 +161,7 @@ void Nitpick::on_createAllRecursiveScriptsPushbutton_clicked() {
} }
void Nitpick::on_createTestsPushbutton_clicked() { void Nitpick::on_createTestsPushbutton_clicked() {
_test->createTests(); _test->createTests(_ui.clientProfileComboBox->currentText());
} }
void Nitpick::on_createMDFilePushbutton_clicked() { void Nitpick::on_createMDFilePushbutton_clicked() {

2
tools/nitpick/src/Nitpick.h
View file

@ -126,6 +126,8 @@ private:
bool _isRunningFromCommandline{ false }; bool _isRunningFromCommandline{ false };
void* _caller; void* _caller;
QStringList clientProfiles;
}; };
#endif // hifi_Nitpick_h #endif // hifi_Nitpick_h

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

@ -391,7 +391,7 @@ void Test::includeTest(QTextStream& textStream, const QString& testPathname) {
textStream << "Script.include(testsRootPath + \"" << partialPathWithoutTests + "\");" << endl; textStream << "Script.include(testsRootPath + \"" << partialPathWithoutTests + "\");" << endl;
} }
void Test::createTests() { void Test::createTests(const QString& clientProfile) {
// Rename files sequentially, as ExpectedResult_00000.png, ExpectedResult_00001.png and so on // Rename files sequentially, as ExpectedResult_00000.png, ExpectedResult_00001.png and so on
// Any existing expected result images will be deleted // Any existing expected result images will be deleted
QString previousSelection = _snapshotDirectory; QString previousSelection = _snapshotDirectory;

2
tools/nitpick/src/Test.h
View file

@ -52,7 +52,7 @@ public:
void finishTestsEvaluation(); void finishTestsEvaluation();
void createTests(); void createTests(const QString& clientProfile);
void createTestsOutline(); void createTestsOutline();

14
tools/nitpick/ui/Nitpick.ui
View file

@ -52,8 +52,8 @@
<widget class="QPushButton" name="createTestsPushbutton"> <widget class="QPushButton" name="createTestsPushbutton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>210</x> <x>70</x>
<y>60</y> <y>40</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -153,6 +153,16 @@
<string>Create all testAuto scripts</string> <string>Create all testAuto scripts</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" name="clientProfileComboBox">
<property name="geometry">
<rect>
<x>320</x>
<y>40</y>
<width>120</width>
<height>40</height>
</rect>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_4"> <widget class="QWidget" name="tab_4">
<attribute name="title"> <attribute name="title">