author | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
commit | dc57cb439c6c9256f76f78a487942a4d1b2a2e27 (patch) (unidiff) | |
tree | f2b1dc69283c3de30930a650c87be834e04998c9 /core/apps | |
parent | 3236db49b0718764bcfe211442354202725a6ff6 (diff) | |
download | opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.zip opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.gz opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.bz2 |
qmake 1.08a has more rigid syntax checking and chokes on our .pro files
-rw-r--r-- | core/apps/calibrate/calibrate.pro | 25 | ||||
-rwxr-xr-x | core/apps/embeddedkonsole/embeddedkonsole.pro | 29 | ||||
-rw-r--r-- | core/apps/helpbrowser/helpbrowser.pro | 27 | ||||
-rw-r--r-- | core/apps/oapp/oapp.pro | 18 | ||||
-rw-r--r-- | core/apps/qcop/qcop.pro | 20 | ||||
-rw-r--r-- | core/apps/taboapp/taboapp.pro | 21 | ||||
-rw-r--r-- | core/apps/textedit/textedit.pro | 23 |
7 files changed, 156 insertions, 7 deletions
diff --git a/core/apps/calibrate/calibrate.pro b/core/apps/calibrate/calibrate.pro index 5e2f58a..fcc0ba3 100644 --- a/core/apps/calibrate/calibrate.pro +++ b/core/apps/calibrate/calibrate.pro | |||
@@ -1,11 +1,34 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = calibrate.h | 4 | HEADERS = calibrate.h |
5 | SOURCES = calibrate.cpp main.cpp | 5 | SOURCES = calibrate.cpp main.cpp |
6 | INCLUDEPATH+= $(QTDIR)/include $(OPIEDIR)/include | 6 | INCLUDEPATH+= $(QTDIR)/include $(OPIEDIR)/include |
7 | DEPENDPATH+= $(QTDIR)/include $(OPIEDIR)/include | 7 | DEPENDPATH+= $(QTDIR)/include $(OPIEDIR)/include |
8 | TARGET = calibrate | 8 | TARGET = calibrate |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | 10 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include( |
12 | |||
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/embeddedkonsole/embeddedkonsole.pro b/core/apps/embeddedkonsole/embeddedkonsole.pro index 1bff59d..018576f 100755 --- a/core/apps/embeddedkonsole/embeddedkonsole.pro +++ b/core/apps/embeddedkonsole/embeddedkonsole.pro | |||
@@ -1,39 +1,66 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = TEWidget.h \ | 2 | HEADERS = TEWidget.h \ |
3 | TEScreen.h \ | 3 | TEScreen.h \ |
4 | TECommon.h \ | 4 | TECommon.h \ |
5 | TEHistory.h \ | 5 | TEHistory.h \ |
6 | TEmulation.h \ | 6 | TEmulation.h \ |
7 | TEmuVt102.h \ | 7 | TEmuVt102.h \ |
8 | session.h \ | 8 | session.h \ |
9 | keytrans.h \ | 9 | keytrans.h \ |
10 | konsole.h \ | 10 | konsole.h \ |
11 | commandeditdialog.h \ | 11 | commandeditdialog.h \ |
12 | commandeditwidget.h \ | 12 | commandeditwidget.h \ |
13 | playlistselection.h \ | 13 | playlistselection.h \ |
14 | MyPty.h | 14 | MyPty.h |
15 | SOURCES = TEScreen.cpp \ | 15 | SOURCES = TEScreen.cpp \ |
16 | TEWidget.cpp \ | 16 | TEWidget.cpp \ |
17 | TEHistory.cpp \ | 17 | TEHistory.cpp \ |
18 | TEmulation.cpp \ | 18 | TEmulation.cpp \ |
19 | TEmuVt102.cpp \ | 19 | TEmuVt102.cpp \ |
20 | session.cpp \ | 20 | session.cpp \ |
21 | keytrans.cpp \ | 21 | keytrans.cpp \ |
22 | konsole.cpp \ | 22 | konsole.cpp \ |
23 | commandeditdialog.cpp \ | 23 | commandeditdialog.cpp \ |
24 | commandeditwidget.cpp \ | 24 | commandeditwidget.cpp \ |
25 | playlistselection.cpp \ | 25 | playlistselection.cpp \ |
26 | MyPty.cpp \ | 26 | MyPty.cpp \ |
27 | main.cpp | 27 | main.cpp |
28 | INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui | 28 | INTERFACES = commandeditdialogbase.ui smallcommandeditdialogbase.ui |
29 | TARGET = embeddedkonsole | 29 | TARGET = embeddedkonsole |
30 | INCLUDEPATH += $(OPIEDIR)/include | 30 | INCLUDEPATH += $(OPIEDIR)/include |
31 | DEPENDPATH += $(OPIEDIR)/include | 31 | DEPENDPATH += $(OPIEDIR)/include |
32 | 32 | ||
33 | DEFINES += QT_QWS_OPIE HAVE_OPENPTY | 33 | DEFINES += QT_QWS_OPIE HAVE_OPENPTY |
34 | LIBS += -lqpe -lopiecore2 -lqtaux2 -lutil | 34 | LIBS += -lqpe -lopiecore2 -lqtaux2 -lutil |
35 | 35 | ||
36 | #DEFINES += HAVE_OPENPTY | 36 | #DEFINES += HAVE_OPENPTY |
37 | #LIBS += -lqpe -lutil | 37 | #LIBS += -lqpe -lutil |
38 | 38 | ||
39 | include ( $(OPIEDIR)/include.pro ) | 39 | include( |
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 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/helpbrowser/helpbrowser.pro b/core/apps/helpbrowser/helpbrowser.pro index 02cc013..9627819 100644 --- a/core/apps/helpbrowser/helpbrowser.pro +++ b/core/apps/helpbrowser/helpbrowser.pro | |||
@@ -1,11 +1,36 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = helpbrowser.h magictextbrowser.h | 2 | HEADERS = helpbrowser.h magictextbrowser.h |
3 | SOURCES = helpbrowser.cpp magictextbrowser.cpp \ | 3 | SOURCES = helpbrowser.cpp magictextbrowser.cpp \ |
4 | main.cpp | 4 | main.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopiecore2 | 7 | LIBS += -lqpe -lopiecore2 |
8 | INTERFACES= | 8 | INTERFACES= |
9 | TARGET = helpbrowser | 9 | TARGET = helpbrowser |
10 | 10 | ||
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include( |
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 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/oapp/oapp.pro b/core/apps/oapp/oapp.pro index b715c0e..db52c13 100644 --- a/core/apps/oapp/oapp.pro +++ b/core/apps/oapp/oapp.pro | |||
@@ -1,18 +1,34 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | 3 | ||
4 | TARGET = oapp | 4 | TARGET = oapp |
5 | VERSION = 1.0.0 | 5 | VERSION = 1.0.0 |
6 | 6 | ||
7 | LIBS += -lqpe | 7 | LIBS += -lqpe |
8 | HEADERS = \ | 8 | HEADERS = \ |
9 | oappplugin.h \ | 9 | oappplugin.h \ |
10 | oappinterface.h | 10 | oappinterface.h |
11 | SOURCES = \ | 11 | SOURCES = \ |
12 | oappplugin.cpp | 12 | oappplugin.cpp |
13 | 13 | ||
14 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 14 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
15 | INCLUDEPATH+= $(OPIEDIR)/include | 15 | INCLUDEPATH+= $(OPIEDIR)/include |
16 | DEPENDPATH+= $(OPIEDIR)/include . | 16 | DEPENDPATH+= $(OPIEDIR)/include . |
17 | 17 | ||
18 | include ( $(OPIEDIR)/include.pro ) | 18 | include( |
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/qcop/qcop.pro b/core/apps/qcop/qcop.pro index a4b39d9..5e9c735 100644 --- a/core/apps/qcop/qcop.pro +++ b/core/apps/qcop/qcop.pro | |||
@@ -1,12 +1,30 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = | 4 | HEADERS = |
5 | SOURCES = main.cpp | 5 | SOURCES = main.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | DEPENDPATH+= $(OPIEDIR)/include | 7 | DEPENDPATH+= $(OPIEDIR)/include |
8 | LIBS += -lqpe | 8 | LIBS += -lqpe |
9 | INTERFACES= | 9 | INTERFACES= |
10 | TARGET = qcop | 10 | TARGET = qcop |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include( |
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/taboapp/taboapp.pro b/core/apps/taboapp/taboapp.pro index 2f95187..645cc04 100644 --- a/core/apps/taboapp/taboapp.pro +++ b/core/apps/taboapp/taboapp.pro | |||
@@ -1,17 +1,36 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DESTDIR = $(OPIEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | 4 | ||
5 | SOURCES = main.cpp | 5 | SOURCES = main.cpp |
6 | 6 | ||
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include . | 8 | DEPENDPATH+= $(OPIEDIR)/include . |
9 | TARGET = taboapp | 9 | TARGET = taboapp |
10 | LIBS += -lqpe -lopiecore2 -lopieui2 -loapp | 10 | LIBS += -lqpe -lopiecore2 -lopieui2 -loapp |
11 | INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp | 11 | INCLUDEPATH+= $(OPIEDIR)/core/apps/oapp |
12 | DEPENDPATH+= $(OPIEDIR)/core/apps/oapp | 12 | DEPENDPATH+= $(OPIEDIR)/core/apps/oapp |
13 | MOC_DIR = .build | 13 | MOC_DIR = .build |
14 | OBJECTS_DIR= .build | 14 | OBJECTS_DIR= .build |
15 | UI_DIR = .build | 15 | UI_DIR = .build |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include( |
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/apps/textedit/textedit.pro b/core/apps/textedit/textedit.pro index 560e772..7ec124f 100644 --- a/core/apps/textedit/textedit.pro +++ b/core/apps/textedit/textedit.pro | |||
@@ -1,9 +1,30 @@ | |||
1 | CONFIG += qt warn_on quick-app | 1 | CONFIG += qt warn_on quick-app |
2 | HEADERS = textedit.h filePermissions.h | 2 | HEADERS = textedit.h filePermissions.h |
3 | SOURCES = main.cpp textedit.cpp filePermissions.cpp | 3 | SOURCES = main.cpp textedit.cpp filePermissions.cpp |
4 | INCLUDEPATH += $(OPIEDIR)/include | 4 | INCLUDEPATH += $(OPIEDIR)/include |
5 | DEPENDPATH += $(OPIEDIR)/include | 5 | DEPENDPATH += $(OPIEDIR)/include |
6 | LIBS += -lqpe -lopiecore2 -lopieui2 | 6 | LIBS += -lqpe -lopiecore2 -lopieui2 |
7 | TARGET = textedit | 7 | TARGET = textedit |
8 | 8 | ||
9 | include ( $(OPIEDIR)/include.pro ) | 9 | include( |
10 | |||
11 | |||
12 | |||
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | $(OPIEDIR)/include.pro ) | ||