Permalink
Browse files

Wrangle QJson so the include dir doesn't conflict

Curse Windows and its case insensitivity... I had an include/qjson with the
C headers, and an include QJson with the C++.  This broke on Windows.  Now
there is only the include/QJson directory, and it is shuffled around so the
build can use it pre-install as well still.
  • Loading branch information...
Beirdo committed Jun 13, 2012
1 parent a63936f commit bffeb5e8625a9e86320fae009b1dfef92ab44f5f
@@ -1 +0,0 @@
-#include "../qjson/parser.h"
@@ -1 +0,0 @@
-#include "../qjson/qobjecthelper.h"
@@ -1 +0,0 @@
-#include "../qjson/serializer.h"
@@ -0,0 +1 @@
+#include "parser.h"
@@ -0,0 +1 @@
+#include "qobjecthelper.h"
@@ -0,0 +1 @@
+#include "serializer.h"
@@ -80,14 +80,14 @@ symbian: {
}
inc.files += $${PUBLIC_HEADERS}
-inc.path = $${PREFIX}/include/qjson/
+inc.path = $${PREFIX}/include/QJson/
INSTALLS += inc
PUBLIC_CPPHEADERS += \
- $$QJSON_BASE/include/QJson/QObjectHelper \
- $$QJSON_BASE/include/QJson/Serializer \
- $$QJSON_BASE/include/QJson/Parser
+ QObjectHelper \
+ Serializer \
+ Parser
cppinc.files += $${PUBLIC_CPPHEADERS}
cppinc.path += $${PREFIX}/include/QJson/

0 comments on commit bffeb5e

Please sign in to comment.