|
|
|
@@ -17,16 +17,17 @@ ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
17 | echo CONFIG -= qt3 >> $@ |
17 | echo CONFIG -= qt3 >> $@ |
18 | else |
18 | else |
19 | echo CONFIG += qt3 >> $@ |
19 | echo CONFIG += qt3 >> $@ |
20 | endif |
20 | endif |
21 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
21 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
22 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
22 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
23 | echo CONFIG -= quick-app >> $@ |
23 | echo CONFIG -= quick-app >> $@ |
24 | echo CONFIG += quick-app-lib >> $@ |
24 | echo CONFIG += quick-app-lib >> $@ |
| |
25 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ |
25 | echo \} >> $@ |
26 | echo \} >> $@ |
26 | else |
27 | else |
27 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
28 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
28 | echo CONFIG -= quick-app >> $@ |
29 | echo CONFIG -= quick-app >> $@ |
29 | echo CONFIG += quick-app-bin >> $@ |
30 | echo CONFIG += quick-app-bin >> $@ |
30 | echo \} >> $@ |
31 | echo \} >> $@ |
31 | endif |
32 | endif |
32 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
33 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
|
|
diff --git a/config.in b/config.in index 166332a..e93eac8 100644 --- a/ config.in+++ b/ config.in |
|
@@ -43,16 +43,20 @@ config RELEASE |
43 | bool |
43 | bool |
44 | default y |
44 | default y |
45 | depends !DEBUG |
45 | depends !DEBUG |
46 | |
46 | |
47 | config QUICK_LAUNCH |
47 | config QUICK_LAUNCH |
48 | boolean "Enable Quick Launch" |
48 | boolean "Enable Quick Launch" |
49 | default n |
49 | default n |
50 | |
50 | |
| |
51 | config QUICKLAUNCH_PATH |
| |
52 | string "Path to quicklauncher" |
| |
53 | default "./quicklauncher" if TARGET_X86 |
| |
54 | default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86 |
51 | |
55 | |
52 | config SPECFILE |
56 | config SPECFILE |
53 | string |
57 | string |
54 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
58 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
55 | default "linux-g++" if TARGET_X86 && X11 |
59 | default "linux-g++" if TARGET_X86 && X11 |
56 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
60 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
57 | default "linux-g++" if TARGET_SHARP && X11 |
61 | default "linux-g++" if TARGET_SHARP && X11 |
58 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
62 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
|