Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1373 the Mission Compiler plugin build for Linux and pre-4.7 Qt.

Browse source
This commit is contained in:
sfb 2011-10-13 10:19:15 -05:00
parent 785fa25683
commit 187964cefd
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
View file

@ -379,7 +379,7 @@ bool MissionCompilerMainWindow::parsePrimForMissions(NLLIGO::IPrimitive const *p
{ {
std::string value; std::string value;
// if the node is a mission parse it // if the node is a mission parse it
if (prim->getPropertyByName("class",value) && !stricmp(value.c_str(),"mission") ) if (prim->getPropertyByName("class",value) && !NLMISC::stricmp(value.c_str(),"mission") )
{ {
std::string name; std::string name;
prim->getPropertyByName("name",name); prim->getPropertyByName("name",name);

3
code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.ui
View file

@ -234,9 +234,10 @@
</item> </item>
<item> <item>
<widget class="QLineEdit" name="filterEdit"> <widget class="QLineEdit" name="filterEdit">
<!-- Removed due to incompatibility with Qt 4.6 and uic still adding it to the source.
<property name="placeholderText"> <property name="placeholderText">
<string>type filter here</string> <string>type filter here</string>
</property> </property> -->
</widget> </widget>
</item> </item>
<item> <item>