1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
|
diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000
@@ -9,7 +9,7 @@
#include "axes.h"
#include "axesmainwindow.h"
-#include "../../../include/qwt3d_function.h"
+#include <qwt3d_function.h>
using namespace std;
using namespace Qwt3D;
diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000
@@ -1,13 +1,13 @@
TEMPLATE = app
-CONFIG += qt warn_on thread debug
+CONFIG += qt warn_on thread
UI_DIR = tmp
MOC_DIR = tmp
OBJECTS_DIR = tmp
-INCLUDEPATH += ../../include
+INCLUDEPATH += /usr/include/qwtplot3d
DEPENDPATH = $$INCLUDEPATH
DESTDIR = ../bin
-unix:LIBS += -lqwtplot3d -L../../lib
+unix:LIBS += -lqwtplot3d
linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
win32{
@@ -25,7 +25,7 @@
ISQT4 = $$find(MYVERSION, ^[2-9])
!isEmpty( ISQT4 ) {
-RESOURCES = ../images.qrc
+#RESOURCES = ../images.qrc
QT += opengl
}
diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000
@@ -6,7 +6,7 @@
#include "enrichmentmainwindow.h"
#include "enrichments.h"
-#include "../../../include/qwt3d_function.h"
+#include <qwt3d_function.h>
using namespace Qwt3D;
diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000
@@ -5,7 +5,7 @@
#include <qframe.h>
#include <qpixmap.h>
-#include "../../../include/qwt3d_types.h"
+#include <qwt3d_types.h>
#if QT_VERSION < 0x040000
diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000
@@ -2,8 +2,8 @@
#define __EXAMPLE_H__
#include <math.h>
-#include "../../../include/qwt3d_parametricsurface.h"
-#include "../../../include/qwt3d_function.h"
+#include <qwt3d_parametricsurface.h>
+#include <qwt3d_function.h>
using namespace Qwt3D;
diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000
@@ -3,10 +3,10 @@
#include <math.h>
#include <qapplication.h>
-#include "../../../include/qwt3d_parametricsurface.h"
-#include "../../../include/qwt3d_surfaceplot.h"
-#include "../../../include/qwt3d_enrichment.h"
-#include "../../../include/qwt3d_color.h"
+#include <qwt3d_parametricsurface.h>
+#include <qwt3d_surfaceplot.h>
+#include <qwt3d_enrichment.h>
+#include <qwt3d_color.h>
#if QT_VERSION < 0x040000
#include "lightingdlgbase.h"
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000
@@ -33,9 +33,9 @@
#include "colormapreader.h"
#include "lightingdlg.h"
#include "femreader.h"
-#include "../../../include/qwt3d_io.h"
-#include "../../../include/qwt3d_io_gl2ps.h"
-#include "../../../include/qwt3d_io_reader.h"
+#include <qwt3d_io.h>
+#include <qwt3d_io_gl2ps.h>
+#include <qwt3d_io_reader.h>
using namespace Qwt3D;
using namespace std;
diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000
+++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000
@@ -1,7 +1,7 @@
#ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
#define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
-#include "../../../include/qwt3d_surfaceplot.h"
+#include <qwt3d_surfaceplot.h>
#if QT_VERSION < 0x040000
|
