Skip to content

Commit

Permalink
Adding -qpa configure switch
Browse files Browse the repository at this point in the history
also renaming the embedded_lite qmake switch to be qpa
  • Loading branch information
Jørgen Lind committed Jun 24, 2010
1 parent 4e27ff0 commit 9716e12
Show file tree
Hide file tree
Showing 21 changed files with 94 additions and 101 deletions.
118 changes: 59 additions & 59 deletions configure

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/3rdparty/webkit/WebCore/WebCore.pro
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEMPLATE = lib
TARGET = QtWebKit

contains(QT_CONFIG, embedded):CONFIG += embedded
contains(QT_CONFIG, embedded_lite):CONFIG += embedded
contains(QT_CONFIG, qpa):CONFIG += embedded

CONFIG(standalone_package) {
isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
Expand Down
2 changes: 1 addition & 1 deletion src/corelib/kernel/kernel.pri
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ wince*: {
kernel/qfunctions_wince.h
}

mac:!embedded:!embedded_lite {
mac:!embedded:!qpa{
SOURCES += \
kernel/qcoreapplication_mac.cpp
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/accessible/accessible.pri
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contains(QT_CONFIG, accessibility) {
accessible/qaccessiblewidget.cpp \
accessible/qaccessibleplugin.cpp

mac:!embedded:!embedded_lite {
mac:!embedded:!qpa {
HEADERS += accessible/qaccessible_mac_p.h
OBJECTIVE_SOURCES += accessible/qaccessible_mac.mm \
accessible/qaccessible_mac_cocoa.mm
Expand Down
4 changes: 2 additions & 2 deletions src/gui/dialogs/dialogs.pri
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ HEADERS += \
dialogs/qwizard.h \
dialogs/qprintpreviewdialog.h

!embedded:!embedded_lite:mac {
!embedded:!qpa:mac {
OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \
dialogs/qfontdialog_mac.mm \
dialogs/qnspanelproxy_mac.mm \
Expand Down Expand Up @@ -61,7 +61,7 @@ win32 {
!win32-borland:!wince*: LIBS += -lshell32 # the filedialog needs this library
}

!mac:!embedded:!symbian:unix|embedded_lite {
!mac:!embedded:!symbian:unix|qpa {
HEADERS += dialogs/qpagesetupdialog_unix_p.h
SOURCES += dialogs/qprintdialog_unix.cpp \
dialogs/qpagesetupdialog_unix.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/gui/egl/egl.pri
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ contains(QT_CONFIG, egl): {
embedded {
SOURCES += egl/qegl_qws.cpp
} else {
embedded_lite {
qpa {
SOURCES += egl/qegl_qpa.cpp
} else {
symbian {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/gui.pro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused

!win32:!embedded:!embedded_lite:!mac:!symbian:CONFIG += x11
!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11

unix:QMAKE_PKGCONFIG_REQUIRES = QtCore

Expand Down
4 changes: 2 additions & 2 deletions src/gui/image/image.pri
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ win32 {
embedded {
SOURCES += image/qpixmap_qws.cpp
}
embedded_lite {
qpa {
SOURCES += image/qpixmap_qpa.cpp
}
x11 {
HEADERS += image/qpixmap_x11_p.h
SOURCES += image/qpixmap_x11.cpp
}
!embedded:!embedded_lite:mac {
!embedded:!qpa:mac {
HEADERS += image/qpixmap_mac_p.h
SOURCES += image/qpixmap_mac.cpp
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/inputmethod/inputmethod.pri
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ embedded {
HEADERS += inputmethod/qwsinputcontext_p.h
SOURCES += inputmethod/qwsinputcontext_qws.cpp
}
mac:!embedded:!embedded_lite {
mac:!embedded:!qpa {
HEADERS += inputmethod/qmacinputcontext_p.h
SOURCES += inputmethod/qmacinputcontext_mac.cpp
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/kernel/kernel.pri
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ embedded {
}
}

embedded_lite {
qpa {
HEADERS += \
kernel/qgenericpluginfactory_qpa.h \
kernel/qgenericplugin_qpa.h \
Expand Down Expand Up @@ -240,7 +240,7 @@ embedded_lite {
}
}

!embedded:!embedded_lite:!x11:mac {
!embedded:!qpa:!x11:mac {
SOURCES += \
kernel/qclipboard_mac.cpp \
kernel/qmime_mac.cpp \
Expand Down
14 changes: 7 additions & 7 deletions src/gui/painting/painting.pri
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ embedded {
SOURCES += \
painting/qgraphicssystem_qws.cpp \

} else: if(!embedded_lite) {
} else: if(!qpa) {
HEADERS += \
painting/qgraphicssystem_raster_p.h \
painting/qgraphicssystem_runtime_p.h \
Expand Down Expand Up @@ -147,7 +147,7 @@ unix:x11 {
painting/qpaintengine_x11.cpp
}

!embedded:!embedded_lite:!x11:mac {
!embedded:!qpa:!x11:mac {
HEADERS += \
painting/qpaintengine_mac_p.h \
painting/qgraphicssystem_mac_p.h \
Expand All @@ -163,14 +163,14 @@ unix:x11 {
painting/qprintengine_mac.mm \
}

unix:!mac:!symbian|embedded_lite {
unix:!mac:!symbian|qpa {
HEADERS += \
painting/qprinterinfo_unix_p.h
SOURCES += \
painting/qprinterinfo_unix.cpp
}

win32|x11|mac|embedded|embedded_lite|symbian {
win32|x11|mac|embedded|qpa|symbian {
SOURCES += painting/qbackingstore.cpp
HEADERS += painting/qbackingstore_p.h
}
Expand All @@ -187,7 +187,7 @@ embedded {
painting/qpaintdevice_qws.cpp
}

embedded_lite {
qpa {
SOURCES += \
painting/qcolormap_qpa.cpp \
painting/qpaintdevice_qpa.cpp \
Expand All @@ -206,7 +206,7 @@ symbian {
painting/qpaintengine_s60_p.h
}

x11|embedded|embedded_lite {
x11|embedded|qpa {
contains(QT_CONFIG,qtopia) {
DEFINES += QT_NO_CUPS QT_NO_LPR
} else {
Expand Down Expand Up @@ -372,7 +372,7 @@ x11 {
SOURCES += painting/qwindowsurface_x11.cpp
}

!embedded:!embedded_lite:mac {
!embedded:!qpa:mac {
HEADERS += painting/qwindowsurface_mac_p.h
SOURCES += painting/qwindowsurface_mac.cpp
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/styles/styles.pri
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ contains( styles, all ) {
styles = mac windows windowsxp windowsvista
}

x11|embedded|embedded_lite|!macx-*:styles -= mac
x11|embedded|qpa|!macx-*:styles -= mac

x11{
QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
Expand Down
4 changes: 2 additions & 2 deletions src/gui/text/text.pri
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ unix:x11 {
text/qfontengine_ft.cpp
}

!embedded:!embedded_lite:!x11:mac {
!embedded:!qpa:!x11:mac {
SOURCES += \
text/qfont_mac.cpp
OBJECTIVE_SOURCES += text/qfontengine_mac.mm
Expand All @@ -110,7 +110,7 @@ embedded {
DEFINES += QT_NO_FONTCONFIG
}

embedded_lite {
qpa {
SOURCES += \
text/qfont_qws.cpp \
text/qfontengine_ft.cpp \
Expand Down
4 changes: 2 additions & 2 deletions src/gui/util/util.pri
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ unix:x11 {
util/qsystemtrayicon_x11.cpp
}

embedded|embedded_lite {
embedded|qpa {
SOURCES += \
util/qsystemtrayicon_qws.cpp
}

!embedded:!embedded_lite:!x11:mac {
!embedded:!qpa:!x11:mac {
OBJECTIVE_SOURCES += util/qsystemtrayicon_mac.mm
}

Expand Down
2 changes: 1 addition & 1 deletion src/gui/widgets/widgets.pri
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ SOURCES += \
widgets/qplaintextedit.cpp \
widgets/qprintpreviewwidget.cpp

!embedded:!embedded_lite:mac {
!embedded:!qpa:mac {
HEADERS += widgets/qmacnativewidget_mac.h \
widgets/qmaccocoaviewcontainer_mac.h
OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \
Expand Down
4 changes: 2 additions & 2 deletions src/opengl/opengl.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui

include(../qbase.pri)

!win32:!embedded:!mac:!embedded_lite:CONFIG += x11
!win32:!embedded:!mac:!qpa:CONFIG += x11
contains(QT_CONFIG, opengl):CONFIG += opengl
contains(QT_CONFIG, opengles1):CONFIG += opengles1
contains(QT_CONFIG, opengles2):CONFIG += opengles2
Expand Down Expand Up @@ -77,7 +77,7 @@ SOURCES += qgl.cpp \

}

embedded_lite {
qpa {
DEFINES += QT_NO_EGL

SOURCES += qgl_qpa.cpp \
Expand Down
6 changes: 1 addition & 5 deletions src/plugins/graphicssystems/graphicssystems.pro
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ TEMPLATE = subdirs
SUBDIRS += trace
!wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl
contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) {
embedded_lite {
SUBDIRS += openvglite
} else {
SUBDIRS += openvg
}
SUBDIRS += openvg
}

contains(QT_CONFIG, shivavg) {
Expand Down
9 changes: 3 additions & 6 deletions src/plugins/platforms/platforms.pro
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
TEMPLATE = subdirs
contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) {
embedded_lite {
SUBDIRS += openvglite
}
SUBDIRS += openvglite
}

embedded_lite {
SUBDIRS += minimal
}

embedded_lite:x11 {
#this don't work. but leave it for now
qpa:x11 {
SUBDIRS += testlite
}
4 changes: 2 additions & 2 deletions src/plugins/plugins.pro
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ unix:!symbian {
SUBDIRS *= codecs
}
!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
!embedded:!embedded_lite:SUBDIRS *= graphicssystems
!embedded:!qpa:SUBDIRS *= graphicssystems
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
symbian:SUBDIRS += s60
contains(QT_CONFIG, phonon): SUBDIRS *= phonon
contains(QT_CONFIG, multimedia): SUBDIRS *= audio

qpa:SUBDIRS += platforms

2 changes: 1 addition & 1 deletion src/qt_install.pri
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ qt_install_headers {
}
}

embedded|embedded_lite: equals(TARGET, QtGui) {
embedded|qpa: equals(TARGET, QtGui) {
# install fonts for embedded
INSTALLS += fonts
fonts.path = $$[QT_INSTALL_LIBS]/fonts
Expand Down
2 changes: 1 addition & 1 deletion tools/tools.pro
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ TEMPLATE = subdirs
SUBDIRS += designer
}
}
unix:!mac:!embedded:!embedded_lite:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
win32:!wince*:SUBDIRS += activeqt
}
contains(QT_CONFIG, declarative):SUBDIRS += qml
Expand Down

0 comments on commit 9716e12

Please sign in to comment.