summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-06-19 19:15:41 -0500
committerDarrell Anderson <[email protected]>2012-06-19 19:15:41 -0500
commite07167f4f6448ad4f5565609e5cd56a918d256f8 (patch)
tree2b727f0d725e575301e7562fa165e6b9573f4a63 /tools/designer
parentd1096751ddb25cdef23919c17389fc268c31edaf (diff)
parent1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (diff)
downloadtqt3-e07167f4f6448ad4f5565609e5cd56a918d256f8.tar.gz
tqt3-e07167f4f6448ad4f5565609e5cd56a918d256f8.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/app/app.pro2
-rw-r--r--tools/designer/uic/uic.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/app/app.pro b/tools/designer/app/app.pro
index 3c493e252..5d2aa406b 100644
--- a/tools/designer/app/app.pro
+++ b/tools/designer/app/app.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
-TARGET = designer
+TARGET = tqdesigner
CONFIG -= moc
DESTDIR = $$QT_BUILD_TREE/bin
diff --git a/tools/designer/uic/uic.pro b/tools/designer/uic/uic.pro
index ef5bde012..722dedfb0 100644
--- a/tools/designer/uic/uic.pro
+++ b/tools/designer/uic/uic.pro
@@ -21,7 +21,7 @@ SOURCES = main.cpp uic.cpp form.cpp object.cpp \
DEFINES += QT_INTERNAL_XML
include( ../../../src/qt_professional.pri )
-TARGET = uic
+TARGET = tquic
INCLUDEPATH += ../shared
DEFINES += UIC
DESTDIR = ../../../bin