Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:44:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixing bad merge

Browse source
This commit is contained in:
Brad Davis 2015-04-27 12:16:04 -07:00
parent d8b814082e
commit c799ecbf83
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/ui/src/main.cpp
View file

@ -239,11 +239,7 @@ public:
} }
}; };
<<<<<<< HEAD const QString& getResourcesDir() {
const QString & getResourcesDir() {
=======
const QString& getQmlDir() {
>>>>>>> vr_menus
static QString dir; static QString dir;
if (dir.isEmpty()) { if (dir.isEmpty()) {
QDir path(__FILE__); QDir path(__FILE__);
@ -254,7 +250,7 @@ const QString& getQmlDir() {
return dir; return dir;
} }
const QString & getQmlDir() { const QString& getQmlDir() {
static QString dir; static QString dir;
if (dir.isEmpty()) { if (dir.isEmpty()) {
dir = getResourcesDir() + "qml/"; dir = getResourcesDir() + "qml/";