diff options
-rw-r--r-- | Changelog | 23 | ||||
-rw-r--r-- | INSTALL | 31 | ||||
-rw-r--r-- | doc/doc.pri | 6 | ||||
-rw-r--r-- | doc/installerfw-getting-started.qdoc | 25 | ||||
-rw-r--r-- | doc/scripting-api/component.qdoc | 12 | ||||
-rw-r--r-- | src/libs/7zip/7zip.pro | 3 | ||||
-rw-r--r-- | src/libs/installer/adminauthorization_x11.cpp | 6 | ||||
-rw-r--r-- | src/libs/installer/elevatedexecuteoperation.cpp | 11 | ||||
-rw-r--r-- | src/libs/installer/installer.pro | 3 | ||||
-rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 48 | ||||
-rw-r--r-- | src/libs/kdtools/sysinfo_x11.cpp | 9 | ||||
-rw-r--r-- | src/sdk/installerbase.cpp | 4 | ||||
-rw-r--r-- | src/sdk/sdk.pro | 3 | ||||
-rw-r--r-- | src/sdk/translations/ja.ts | 8 | ||||
-rw-r--r-- | tests/auto/installer/scriptengine/tst_scriptengine.cpp | 1 | ||||
-rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 17 | ||||
-rw-r--r-- | tools/archivegen/archivegen.pro | 3 | ||||
-rw-r--r-- | tools/binarycreator/binarycreator.pro | 5 | ||||
-rw-r--r-- | tools/devtool/devtool.pro | 3 | ||||
-rw-r--r-- | tools/repogen/repogen.pro | 3 |
20 files changed, 124 insertions, 100 deletions
@@ -1,6 +1,29 @@ 2.1.0 +2.0.3 +- Update Japanese translation. +- Make IFW compile with FreeBSD. (QTIFW-841) +- Fix MSVC2015 build. +- Revert "Use QQmlV4Function to correctly get empty parameters from script." +- Fix crash when updating admin installation with user/temp repository (QTIFW-740) +- Compile with Qt 5.5, 5.6. Minimum version is now 5.5. +- Fix compile with namespace'ed Qt. + 2.0.2 +- Doc: Remove dubious sentence from installer.calculateComponentsToUninstall(). +- Update documentation for --runoperation. +- Update the git-archive export options. +- Add alternative option where to read the installer-framework sha1. +- Add sync.profile. +- Add .qt-license-check.exclude and .qt-license-check.optional rules. +- Update license headers. +- Fix target directory check for reserved words on Windows. +- Use QQmlV4Function to correctly get empty parameters from script. (QTIFW-724) +- Fix errors when running updates in a directory requiring elevation. (QTIFW-746) +- Doc: Fix the function name in Controller Scripting page. +- Fix usage of system proxy with credentials. (QTBUG-46547) +- Unify handling of translations. QTIFW-390 +- Init all components with proper install action. (QTIFW-727) - Fix .dat file that gets deleted after multiple component changes on Windows. - Fix maintenance tool upgrade on OS X. - Fix handling of system proxy with credentials. (QTBUG-46547) @@ -15,7 +15,7 @@ http://code.qt.io/cgit/installer-framework/installer-framework.git/ Build a static Qt --------------------- -Building the Qt Installer Framework from sources requires Qt (version 5.4.0 +Building the Qt Installer Framework from sources requires Qt (version 5.5 or newer). Supported compilers are MSVC 2013 or newer, GCC 4.7 or newer, and Clang 3.1 or newer. @@ -26,44 +26,21 @@ See the Qt documentation for the prerequisites and steps to build Qt from source ### Windows -For Qt 5.4, you need to adjust the respective qmake.conf to have a real stand alone -working installer. Replace -MD, -MDd with -MT, -MTD in the CFLAGS lines. - -'git diff' should show you something like: - ---- a/mkspecs/win32-msvc2013/qmake.conf -+++ b/mkspecs/win32-msvc2013/qmake.conf - QMAKE_CFLAGS = -nologo -Zm200 -Zc:wchar_t -FS - QMAKE_CFLAGS_WARN_ON = -W3 - QMAKE_CFLAGS_WARN_OFF = -W0 --QMAKE_CFLAGS_RELEASE = -O2 -MD -Zc:strictStrings --QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MD -Zi -Zc:strictStrings --QMAKE_CFLAGS_DEBUG = -Zi -MDd -+QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings -+QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings -+QMAKE_CFLAGS_DEBUG = -Zi -MTd - QMAKE_CFLAGS_YACC = - QMAKE_CFLAGS_LTCG = -GL - QMAKE_CFLAGS_MP = -MP - -From Qt 5.5 onwards, you can achieve the same by passing -static-runtime to -configure. - Recommended configuration options for Microsoft Windows: -configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns +configure -prefix %CD%\qtbase -release -static -static-runtime -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d ### Linux Recommended configuration options for Linux: -configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns +configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d ### OS X Recommended configuration options for OS X: -configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns +configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d Build the Framework diff --git a/doc/doc.pri b/doc/doc.pri index f23df0e26..a11a39b53 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -34,12 +34,6 @@ qch_docs.commands = $$HELPGENERATOR -o $$QCH_FILE $$QHP_FILE qch_docs.depends += html_docs qch_docs.files = $$QCH_FILE -unix:!macx { - qch_docs.path = $$PREFIX/doc - qch_docs.CONFIG += no_check_exist - INSTALLS += qch_docs -} - docs_online.depends = html_docs_online QMAKE_EXTRA_TARGETS += html_docs_online docs_online diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index c18ccec47..08c5b5682 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -40,7 +40,7 @@ \section1 Supported Platforms You can use the Qt Installer Framework to create installers for all - platforms supported by \l{Desktop Platforms}{desktop Qt}. + platforms supported by \l[QtDoc]{Supported Platforms}{desktop Qt}. The installers have been tested on the following platforms: @@ -67,30 +67,15 @@ you do not have to deliver Qt libraries, which enables you to distribute installers as one file. - The minimum required Qt version is 5.4.0. + The minimum required Qt version is 5.5. \section3 Configuring Qt for Windows - Usually, you want to tweak Qt to statically link in the C - runtime library. This can be done by changing the default mkspec of - your compiler (Qt 5.4) or by passing \c{-static-runtime} to configure (Qt 5.5 - and newer). - - For Qt 5.4, you need to edit - \c{mkspecs\win32-msvc2013\qmake.conf} and replace in the CFLAGS sections - '-MD' with '-MT': - - \code - QMAKE_CFLAGS_RELEASE = -O2 -MT -Zc:strictStrings - QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -MT -Zi -Zc:strictStrings - QMAKE_CFLAGS_DEBUG = -Zi -MTd - \endcode - We recommend that you use the following options when you configure Qt for Windows: \code - configure -prefix %CD%\qtbase -release -static -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix %CD%\qtbase -release -static -static-runtime -target xp -accessibility -no-opengl -no-icu -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode @@ -99,7 +84,7 @@ We recommend that you use the following configuration options for Linux: \code - configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -qt-xcb -qt-pcre -qt-freetype -no-glib -no-cups -no-sql-sqlite -no-qml-debug -no-opengl -no-egl -no-xinput -no-xinput2 -no-sm -no-icu -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode \section3 Configuring Qt for OS X @@ -107,7 +92,7 @@ We recommend that you use the following configuration options for OS X: \code - configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns + configure -prefix $PWD/qtbase -release -static -accessibility -qt-zlib -qt-libpng -qt-libjpeg -no-cups -no-sql-sqlite -no-qml-debug -nomake examples -nomake tests -skip qtactiveqt -skip qtenginio -skip qtlocation -skip qtmultimedia -skip qtserialport -skip qtquick1 -skip qtquickcontrols -skip qtscript -skip qtsensors -skip qtwebkit -skip qtwebsockets -skip qtxmlpatterns -skip qt3d \endcode \section2 Setting up Qt Installer Framework diff --git a/doc/scripting-api/component.qdoc b/doc/scripting-api/component.qdoc index 0dcd28681..1765a1217 100644 --- a/doc/scripting-api/component.qdoc +++ b/doc/scripting-api/component.qdoc @@ -325,6 +325,18 @@ */ /*! + \qmlmethod boolean component::addOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! + \qmlmethod boolean component::addElevatedOperation(string operation, string parameter1 = "", string parameter2 = "", ..., string parameter10 = "") + + Convenience method for calling addElevatedOperation(string, stringlist) with up to 10 arguments. +*/ + +/*! \qmlmethod boolean component::addElevatedOperation(string operation, stringlist parameters) Creates and adds an installation operation for \a operation. Add any number of parameters. diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro index 70a51c068..17e64df8f 100644 --- a/src/libs/7zip/7zip.pro +++ b/src/libs/7zip/7zip.pro @@ -9,3 +9,6 @@ DESTDIR = $$IFW_LIB_PATH include(7zip.pri) win32:include($$7ZIP_BASE/win.pri) #7zip unix:include($$7ZIP_BASE/unix.pri) #p7zip + +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp index 7c546c0f2..673c96a4b 100644 --- a/src/libs/installer/adminauthorization_x11.cpp +++ b/src/libs/installer/adminauthorization_x11.cpp @@ -49,9 +49,13 @@ #include <linux/limits.h> #include <pty.h> #else +#ifdef Q_OS_FREEBSD +#include <libutil.h> +#include <signal.h> +#else #include <util.h> #endif - +#endif #include <sys/ioctl.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index 3f3cdbb2a..901bf7f9e 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -170,16 +170,7 @@ bool ElevatedExecuteOperation::Private::run(const QStringList &arguments) } //readProcessOutput should only called from this current Thread -> Qt::DirectConnection QObject::connect(process, SIGNAL(readyRead()), q, SLOT(readProcessOutput()), Qt::DirectConnection); -#ifdef Q_OS_WIN - if (args.count() == 1) { - process->setNativeArguments(args.front()); - qDebug() << "ElevatedExecuteOperation setNativeArguments to start:" << args.front(); - process->start(QString(), QStringList()); - } else -#endif - { - process->start(args.front(), args.mid(1)); - } + process->start(args.front(), args.mid(1)); qDebug() << args.front() << "started, arguments:" << QStringList(args.mid(1)).join(QLatin1String(" ")); bool success = false; diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 9447108ee..d641ff1fc 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -227,3 +227,6 @@ win32 { win32-g++*:LIBS += -lmpr -luuid win32-g++*:QMAKE_CXXFLAGS += -Wno-missing-field-initializers } + +target.path = $$[QT_INSTALL_LIBS] +INSTALLS += target diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 492920efc..731171f61 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1426,34 +1426,28 @@ void PackageManagerCore::appendRootComponent(Component *component) } /*! - \class PackageManagerCore::ComponentType - \inmodule QtInstallerFramework - \brief The ComponentType class describes a component list. - - This class is used with the components() function to describe what type of \c Component - list it should return. - - \list - \li \c Root returns a list of root components. - - \li \c Descendants returns a list of all descendant components. - - \note In updater mode the list is empty, because component updates cannot have children. - - \li \c Dependencies returns a list of all available dependencies when run as updater. - - \note When running as installer, package manager, or uninstaller, this will always - result in an empty list. - - \li \c Replacements returns a list of all available replacement components relevant to the - run mode. - - \li \c AllNoReplacements returns a list of available components, including root, descendant, + \enum PackageManagerCore::ComponentType + \brief This enum holds the type of the component list to be returned: + + \value Root + Returns a list of root components. + \value Descendants + Returns a list of all descendant components. In updater mode the + list is empty, because component updates cannot have children. + \value Dependencies + Returns a list of all available dependencies when run as updater. + When running as installer, package manager, or uninstaller, this + will always result in an empty list. + \value Replacements + Returns a list of all available replacement components relevant to + the run mode. + \value AllNoReplacements + Returns a list of available components, including root, descendant, and dependency components relevant to the run mode. - - \li \c All returns a list of all available components, including root, descendant, - dependency, and replacement components relevant to the run mode. - \endlist + \value All + Returns a list of all available components, including root, + descendant, dependency, and replacement components relevant to the + run mode. */ /*! diff --git a/src/libs/kdtools/sysinfo_x11.cpp b/src/libs/kdtools/sysinfo_x11.cpp index 6fddf895f..9a7909f24 100644 --- a/src/libs/kdtools/sysinfo_x11.cpp +++ b/src/libs/kdtools/sysinfo_x11.cpp @@ -36,6 +36,11 @@ #include <sys/utsname.h> #include <sys/statvfs.h> +#ifdef Q_OS_FREEBSD +#include <sys/types.h> +#include <sys/sysctl.h> +#endif + #include <QtCore/QFile> #include <QtCore/QTextStream> #include <QtCore/QDir> @@ -62,7 +67,11 @@ quint64 installedMemory() #else quint64 physmem; size_t len = sizeof physmem; +#ifdef Q_OS_FREEBSD + static int mib[2] = { CTL_HW, HW_PHYSMEM }; +#else static int mib[2] = { CTL_HW, HW_MEMSIZE }; +#endif sysctl(mib, 2, &physmem, &len, 0, 0); return quint64(physmem); #endif diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 80fc7b8b3..8a009769d 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -88,8 +88,8 @@ int InstallerBase::run() // and check the running processes. if (runCheck.isRunning(RunOnceChecker::ConditionFlag::ProcessList)) { QInstaller::MessageBoxHandler::information(0, QLatin1String("AlreadyRunning"), - QString::fromLatin1("Waiting for %1").arg(qAppName()), - QString::fromLatin1("Another %1 instance is already running. Wait " + tr("Waiting for %1").arg(qAppName()), + tr("Another %1 instance is already running. Wait " "until it finishes, close it, or restart your system.").arg(qAppName())); return EXIT_FAILURE; } diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 76bd4c5e2..fd69b4529 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -142,3 +142,6 @@ win32 { } macx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target diff --git a/src/sdk/translations/ja.ts b/src/sdk/translations/ja.ts index facd4c0a7..d994bcd72 100644 --- a/src/sdk/translations/ja.ts +++ b/src/sdk/translations/ja.ts @@ -2099,6 +2099,10 @@ Do you want to continue?</source> <source>Password</source> <translation>パスワード</translation> </message> + <message> + <source>Proxy Credentials</source> + <translation>プロキシ認証</translation> + </message> </context> <context> <name>QInstaller::ServerAuthenticationDialog</name> @@ -2402,6 +2406,10 @@ Do you want to continue?</source> <source>Cannot create output file for writing: %1</source> <translation>書き込み用に出力ファイルを作成できませんでした: %1</translation> </message> + <message> + <source>Could not convert path: %1.</source> + <translation>パスを変換できませんでした: %1</translation> + </message> </context> <context> <name>ExtractCallbackImpl</name> diff --git a/tests/auto/installer/scriptengine/tst_scriptengine.cpp b/tests/auto/installer/scriptengine/tst_scriptengine.cpp index e6dd5db45..0377b8c3a 100644 --- a/tests/auto/installer/scriptengine/tst_scriptengine.cpp +++ b/tests/auto/installer/scriptengine/tst_scriptengine.cpp @@ -198,7 +198,6 @@ private slots: m_component->setValue("Default", "Script"); m_component->setValue(scName, "component.test.name"); - Component *component = new Component(&m_core); component->setValue(scName, "component.test.addOperation"); m_core.appendRootComponent(component); diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 0b1987b3d..8ff5329a1 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -110,12 +110,21 @@ void tst_Settings::loadEmptyConfig() void tst_Settings::loadNotExistingConfig() { + QString configFile = QLatin1String(":/data/inexisting_config.xml"); + QFile file(configFile); + QString errorString; + + if (!file.open(QIODevice::ReadOnly)) { + errorString = file.errorString(); + } + QTest::ignoreMessage(QtDebugMsg, QString::fromLatin1("create Error-Exception: \"Could not open" + " settings file %1 for reading: %2\"") + .arg(configFile).arg(errorString).toLatin1()); try { - Settings::fromFileAndPrefix(":/data/inexisting_config.xml", ":/data"); + Settings::fromFileAndPrefix(configFile, ":/data"); } catch (const Error &error) { - QCOMPARE(error.message(), QLatin1String("Cannot open settings file " - ":/data/inexisting_config.xml for reading: " - "Unknown error")); + QCOMPARE(error.message(), QString::fromLatin1("Could not open settings file " + "%1 for reading: %2").arg(configFile).arg(errorString)); return; } QFAIL("No exception thrown"); diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 719b35a7f..2cb8b6bdc 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -16,3 +16,6 @@ SOURCES += archive.cpp \ HEADERS += ../common/repositorygen.h macx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 248c2439b..ddde5e984 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -7,8 +7,6 @@ include(../../installerfw.pri) QT -= gui QT += qml xml -!minQtVersion(5,4,0): QTPLUGIN += qtaccessiblewidgets - CONFIG += console DESTDIR = $$IFW_APP_PATH SOURCES = binarycreator.cpp \ @@ -19,3 +17,6 @@ HEADERS = rcc/rcc.h RESOURCES += binarycreator.qrc macx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target diff --git a/tools/devtool/devtool.pro b/tools/devtool/devtool.pro index 1ff6e6e85..0b52d7ca1 100644 --- a/tools/devtool/devtool.pro +++ b/tools/devtool/devtool.pro @@ -19,3 +19,6 @@ SOURCES += main.cpp \ binarydump.cpp osx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index e6ee4476a..f415a5988 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -15,3 +15,6 @@ SOURCES += repogen.cpp \ HEADERS += ../common/repositorygen.h macx:include(../../no_app_bundle.pri) + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target |