forked from qt-creator/qt-creator
Include qbs files in qmake project tree
Change-Id: I864b1b500d385c91e3cac6725202ad7f48f11b17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
f88636e613
commit
fb89728901
@@ -184,3 +184,5 @@ qt:greaterThan(QT_MAJOR_VERSION, 4) {
|
||||
contains(QT, gui): QT += widgets
|
||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040900
|
||||
}
|
||||
|
||||
OTHER_FILES += $$replace(_PRO_FILE_, \\.pro$, .qbs)
|
||||
|
||||
+3
-1
@@ -15,7 +15,9 @@ SUBDIRS = src share lib/qtcreator/qtcomponents
|
||||
unix:!macx:!isEmpty(copydata):SUBDIRS += bin
|
||||
|
||||
OTHER_FILES += dist/copyright_template.txt \
|
||||
$$files(dist/changes-*)
|
||||
$$files(dist/changes-*) \
|
||||
qtcreator.qbp \
|
||||
qbs/pluginspec/pluginspec.qbs
|
||||
|
||||
macx: PLATFORM = "mac"
|
||||
else:win32: PLATFORM = "windows"
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = qtcreator/static.pro \
|
||||
qtcreator/translations
|
||||
OTHER_FILES += share.qbs \
|
||||
../src/share/share.qbs
|
||||
|
||||
Reference in New Issue
Block a user