Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-04-27 10:29:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give proper error message if Qt version is too old

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-05-16 10:38:47 +02:00
parent 57cff61873
commit 181d99e882
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libresapi/src/libresapi.pro
View File

@ -106,20 +106,13 @@ libresapihttpserver {
DEFINES *= WINDOWS_SYS DEFINES *= WINDOWS_SYS
INCLUDEPATH += . $$INC_DIR INCLUDEPATH += . $$INC_DIR
greaterThan(QT_MAJOR_VERSION, 4) { PRO_PATH=$$shell_path($$_PRO_FILE_PWD_)
# Qt 5 MAKE_SRC=$$shell_path($$PRO_PATH/webui-src/make-src)
PRO_PATH=$$shell_path($$_PRO_FILE_PWD_)
MAKE_SRC=$$shell_path($$PRO_PATH/webui-src/make-src)
} else {
# Qt 4
PRO_PATH=$$replace(_PRO_FILE_PWD_, /, \\)
MAKE_SRC=$$PRO_PATH\\webui-src\\make-src
}
#create_webfiles.commands = $$MAKE_SRC\\build.bat $$PRO_PATH #create_webfiles.commands = $$MAKE_SRC\\build.bat $$PRO_PATH
#QMAKE_EXTRA_TARGETS += create_webfiles #QMAKE_EXTRA_TARGETS += create_webfiles
#PRE_TARGETDEPS += create_webfiles #PRE_TARGETDEPS += create_webfiles
QMAKE_POST_LINK=$$MAKE_SRC\\build.bat $$PRO_PATH QMAKE_POST_LINK=$$MAKE_SRC\\build.bat $$PRO_PATH
# create dummy files # create dummy files
system($$MAKE_SRC\\init.bat .) system($$MAKE_SRC\\init.bat .)

8
retroshare.pri
View File

@ -160,6 +160,12 @@ rs_v07_changes {
## RetroShare qmake functions goes here as all the rest may use them ########### ## RetroShare qmake functions goes here as all the rest may use them ###########
################################################################################ ################################################################################
## Qt versions older the 5 are not supported anymore, check if the user is
## attempting use them and fail accordingly with a proper error message
lessThan(QT_MAJOR_VERSION, 5) {
error(Qt 5.0.0 or newer is needed to build RetroShare)
}
## This function is useful to look for the location of a file in a list of paths ## This function is useful to look for the location of a file in a list of paths
## like the which command on linux, first paramether is the file name, ## like the which command on linux, first paramether is the file name,
## second parameter is the name of a variable containing the list of folders ## second parameter is the name of a variable containing the list of folders
@ -226,7 +232,7 @@ defineReplace(linkDynamicLibs) {
################################################################################ ################################################################################
## Statements and variables that depends on build options (CONFIG)goes here #### ## Statements and variables that depends on build options (CONFIG) goes here ###
################################################################################ ################################################################################
## ##
## Defining the following variables may be needed depending on platform and ## Defining the following variables may be needed depending on platform and