diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-29 17:25:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 16:59:50 +0100 |
| commit | 3ad90ea8f629552e6fa35d94600352d9cf924c8b (patch) | |
| tree | 47d7920e55668e36341978bca411604defa780b3 /src/tools/bootstrap/bootstrap.pro | |
| parent | f1841d864db13585b53815c126dee12370c11c8a (diff) | |
Generate a proper static QtBootstrap module
Making a properly installed libQtBootstrap simplifies
our tools build process a little and in addition allows
other comand line tools to use the bootstrap lib and
link against it.
Initial-version-by: Lars Knoll
Change-Id: Iddf4568a5505bc24898ec1abf7e7022e19f0a454
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 07c4a10573..924d1406b1 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -1,18 +1,12 @@ option(host_build) -TEMPLATE = lib -TARGET = bootstrap -CONFIG += static -CONFIG += console qtinc -CONFIG -= qt -CONFIG += exceptions_off -!build_pass:contains(QT_CONFIG, build_all):CONFIG += release -mac:CONFIG -= app_bundle incremental +TARGET = QtBootstrap +QT = +CONFIG += no_module_headers internal_module -DEFINES += \ +MODULE_DEFINES = \ QT_BOOTSTRAPPED \ QT_LITE_UNICODE \ - QT_NO_CAST_FROM_ASCII \ QT_NO_CAST_TO_ASCII \ QT_NO_CODECS \ QT_NO_DATASTREAM \ @@ -25,11 +19,22 @@ DEFINES += \ QT_NO_DEPRECATED \ QT_QMAKE_LOCATION=\\\"$$QMAKE_QMAKE\\\" -INCLUDEPATH += $$QT_BUILD_TREE/include \ - $$QT_BUILD_TREE/include/QtCore \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION \ - $$QT_BUILD_TREE/include/QtCore/$$QT_VERSION/QtCore \ - $$QT_BUILD_TREE/src/corelib/global +DEFINES += \ + $$MODULE_DEFINES \ + QT_NO_CAST_FROM_ASCII + +MODULE_CONFIG = console -app_bundle release +MODULE_PRIVATE_INCLUDES = \ + \$\$QT_MODULE_INCLUDE_BASE \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION \ + \$\$QT_MODULE_INCLUDE_BASE/QtCore/$$QT_VERSION/QtCore + +qtProcessModuleFlags(CONFIG, MODULE_CONFIG) + +load(qt_module) + +INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global DEPENDPATH += $$INCLUDEPATH \ ../../corelib/global \ @@ -119,6 +124,8 @@ macx: { if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) else:include(../../3rdparty/zlib_dependency.pri) +win32:LIBS += -luser32 -lole32 -ladvapi32 + lib.CONFIG = dummy_install INSTALLS += lib |