Browse Source

Add test for qmake option

master
Martin Höher 7 years ago
parent
commit
8c13c97c77
  1. 18
      tests/tests.sh
  2. 12
      tools/linuxdeployqt/shared.cpp

18
tests/tests.sh

@ -79,6 +79,24 @@ killall QtWidgetsApplication && echo "SUCCESS"
cd ../../../
###############################################################################
# Test bundling the sample Qt Widgets Application passing in the qmake exe
###############################################################################
cd tests/QtWidgetsApplication/build/
mkdir -p explicitqmake
cp QtWidgetsApplication explicitqmake/
../../../linuxdeployqt-*-x86_64.AppImage explicitqmake/QtWidgetsApplication \
-qmake=$(which qmake)
ldd explicitqmake/QtWidgetsApplication
find explicitqmake/
LD_DEBUG=libs explicitqmake/QtWidgetsApplication &
sleep 5
killall QtWidgetsApplication && echo "SUCCESS"
cd ../../../
###############################################################################
# Test bundling the sample Qt Quick Controls 2 Application that comes with Qt Creator
###############################################################################

12
tools/linuxdeployqt/shared.cpp

@ -50,13 +50,13 @@ bool runStripEnabled = true;
bool bundleAllButCoreLibs = false;
bool fhsLikeMode = false;
QString fhsPrefix;
static bool alwaysOwerwriteEnabled = false;
static QStringList librarySearchPath;
static bool appstoreCompliant = false;
bool alwaysOwerwriteEnabled = false;
QStringList librarySearchPath;
bool appstoreCompliant = false;
int logLevel = 1;
static int qtDetected = 0;
static bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway
static bool deployLibrary = false;
int qtDetected = 0;
bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway
bool deployLibrary = false;
using std::cout;
using std::endl;

Loading…
Cancel
Save