MrBesen/QxtGlobalShortcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Qt4 build issues

Browse Source
This commit is contained in:
Uwe Kindler 2013-02-25 09:18:41 +01:00
parent 1128111df9
commit e2bfab6599
4 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
features/qxt.prf
View File

@ -15,7 +15,7 @@ contains(QXT, berkeley) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtBerkeley
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtBerkeley.framework/HEADERS/
qtAddModule(QxtBerkeley)
qtAddLibrary(QxtBerkeley)
QXT += core
}
@ -27,7 +27,7 @@ contains(QXT, web) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtWeb
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtWeb.framework/HEADERS/
qtAddModule(QxtWeb)
qtAddLibrary(QxtWeb)
QXT += core network
QT += network
}
@ -40,7 +40,7 @@ contains(QXT, widgets) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtWidgets
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtWidgets.framework/HEADERS/
qtAddModule(QxtWidgets)
qtAddLibrary(QxtWidgets)
QXT += core
QT += gui widgets
}
@ -53,7 +53,7 @@ contains(QXT, zeroconf) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtZeroconf
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtZeroconf.framework/HEADERS/
qtAddModule(QxtZeroconf)
qtAddLibrary(QxtZeroconf)
QXT += core network
QT += network
}
@ -66,7 +66,7 @@ contains(QXT, network) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtNetwork
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtNetwork.framework/HEADERS/
qtAddModule(QxtNetwork)
qtAddLibrary(QxtNetwork)
QXT += core
QT += network
}
@ -79,7 +79,7 @@ contains(QXT, sql) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtSql
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtSql.framework/HEADERS/
qtAddModule(QxtSql)
qtAddLibrary(QxtSql)
QXT += core
QT += sql
}
@ -92,5 +92,5 @@ contains(QXT, core) {
INCLUDEPATH += $${QXT_INSTALL_HEADERS}/QxtCore
macx:INCLUDEPATH += $${QXT_INSTALL_LIBS}/QxtCore.framework/HEADERS/
qtAddModule(QxtCore)
qtAddLibrary(QxtCore)
}

42
src/qxtlibs.pri
View File

@ -4,13 +4,25 @@ QMAKE_RPATHDIR += $${QXT_BUILD_TREE}/lib
macx:LIBS += -F$${QXT_BUILD_TREE}/lib
LIBS += -L$${QXT_BUILD_TREE}/lib
defineTest(qxtAddLibrary) {
INCLUDEPATH += $${QXT_SOURCE_TREE}/src/$$1
INCLUDEPATH += $${QXT_SOURCE_TREE}/include/$$2
DEPENDPATH += $${QXT_SOURCE_TREE}/src/$$1
DEPENDPATH += $${QXT_SOURCE_TREE}/include/$$2
qtAddModule($$2)
isEqual(QT_MAJOR_VERSION, 5) {
defineTest(qxtAddLibrary) {
INCLUDEPATH += $${QXT_SOURCE_TREE}/src/$$1
INCLUDEPATH += $${QXT_SOURCE_TREE}/include/$$2
DEPENDPATH += $${QXT_SOURCE_TREE}/src/$$1
DEPENDPATH += $${QXT_SOURCE_TREE}/include/$$2
qtAddModule($$2)
}
}
else {
defineTest(qxtAddLibrary) {
INCLUDEPATH += $${QXT_SOURCE_TREE}/src/$$1
INCLUDEPATH += $${QXT_SOURCE_TREE}/include/$$2
DEPENDPATH += $${QXT_SOURCE_TREE}/src/$$1
DEPENDPATH += $${QXT_SOURCE_TREE}/include/$$2
qtAddLibrary($$2)
}
}
contains(QXT, berkeley) {
qxtAddLibrary(berkeley, QxtBerkeley)
@ -23,11 +35,21 @@ contains(QXT, web) {
QT += network
}
contains(QXT, widgets) {
qxtAddLibrary(widgets, QxtWidgets)
QXT += core
QT += gui widgets
isEqual(QT_MAJOR_VERSION, 5) {
contains(QXT, widgets) {
qxtAddLibrary(widgets, QxtWidgets)
QXT += core
QT += gui widgets
}
}
else {
contains(QXT, widgets) {
qxtAddLibrary(widgets, QxtWidgets)
QXT += core
QT += gui
}
}
contains(QXT, network) {
qxtAddLibrary(network, QxtNetwork)

2
src/web/qxtwebcgiservice.cpp
View File

@ -53,8 +53,6 @@ QxtCgiRequestInfo::QxtCgiRequestInfo() : sessionID(0), requestID(0), eventSent(f
QxtCgiRequestInfo::QxtCgiRequestInfo(QxtWebRequestEvent* req) : sessionID(req->sessionID), requestID(req->requestID), eventSent(false), terminateSent(false) {}
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
event->url.query(QUrl::FullyEncoded);
#define qxtEncodedQuery encodedQuery()
#else
#define qxtEncodedQuery query(QUrl::FullyEncoded)

7
src/widgets/widgets.pro
View File

@ -1,6 +1,11 @@
CLEAN_TARGET = QxtWidgets
DEFINES += BUILD_QXT_GUI
QT = core gui widgets
QT = core gui
isEqual(QT_MAJOR_VERSION, 5) {
QT += widgets
}
QXT = core
CONVENIENCE += $$CLEAN_TARGET