diff options
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/app/app.pro | 4 | ||||
| -rw-r--r-- | tools/designer/app/main.cpp | 4 | ||||
| -rw-r--r-- | tools/designer/designer/designer.pro | 6 | ||||
| -rw-r--r-- | tools/designer/designer/mainwindow.cpp | 4 | ||||
| -rw-r--r-- | tools/designer/editor/editor.pro | 2 | ||||
| -rw-r--r-- | tools/designer/examples/addressbook/addressbook.ui.h | 2 | ||||
| -rw-r--r-- | tools/designer/examples/addressbook/addressdetails.ui.h | 2 | ||||
| -rw-r--r-- | tools/designer/examples/addressbook/search.ui.h | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/cppeditor/cppeditor.pro | 4 |
9 files changed, 15 insertions, 15 deletions
diff --git a/tools/designer/app/app.pro b/tools/designer/app/app.pro index 5d2aa406b..9f6e54f7b 100644 --- a/tools/designer/app/app.pro +++ b/tools/designer/app/app.pro @@ -6,11 +6,11 @@ DESTDIR = $$QT_BUILD_TREE/bin SOURCES += main.cpp INCLUDEPATH += ../designer -LIBS += -ldesignercore -ltqui -lqassistantclient -L$$QT_BUILD_TREE/lib +LIBS += -ltqtdesignercore -ltqui -ltqassistantclient -L$$QT_BUILD_TREE/lib win32 { RC_FILE = designer.rc win32-g++ { - TARGETDEPS += $$QT_BUILD_TREE/lib/libdesignercore.a + TARGETDEPS += $$QT_BUILD_TREE/lib/libtqtdesignercore.a } else { TARGETDEPS += $$QT_BUILD_TREE/lib/designercore.lib } diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index b88eddbfb..99cd0caab 100644 --- a/tools/designer/app/main.cpp +++ b/tools/designer/app/main.cpp @@ -186,8 +186,8 @@ int main( int argc, char *argv[] ) signal( SIGTERM, exitHandler ); } - extern void qInitImages_designercore(); - qInitImages_designercore(); + extern void qInitImages_tqtdesignercore(); + qInitImages_tqtdesignercore(); TQSettings config; TQString keybase = DesignerApplication::settingsKey(); diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro index 4ae5ff844..6311ad794 100644 --- a/tools/designer/designer/designer.pro +++ b/tools/designer/designer/designer.pro @@ -7,7 +7,7 @@ CONFIG -= dll CONFIG += dll } -TARGET = designercore +TARGET = tqtdesignercore DEFINES += DESIGNER DEFINES += QT_INTERNAL_XML @@ -420,11 +420,11 @@ INCLUDEPATH += ../shared ../uilib LIBS += -L$$QT_BUILD_TREE/lib -ltqui hpux-acc* { - LIBS += $$QT_BUILD_TREE/lib/libqassistantclient.a + LIBS += $$QT_BUILD_TREE/lib/libtqassistantclient.a } !hpux-acc* { - LIBS += -lqassistantclient + LIBS += -ltqassistantclient } TRANSLATIONS = designer_de.ts designer_fr.ts diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 7603148f6..a112a0ba8 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -156,8 +156,8 @@ MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir ) fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ) { - extern void qInitImages_designercore(); - qInitImages_designercore(); + extern void qInitImages_tqtdesignercore(); + qInitImages_tqtdesignercore(); self = this; setPluginDirectory( plgDir ); diff --git a/tools/designer/editor/editor.pro b/tools/designer/editor/editor.pro index dc9235f5e..4a96f025d 100644 --- a/tools/designer/editor/editor.pro +++ b/tools/designer/editor/editor.pro @@ -24,7 +24,7 @@ SOURCES = editor.cpp \ FORMS = preferences.ui -TARGET = editor +TARGET = tqteditor DESTDIR = ../../../lib VERSION = 1.0.0 diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h index a86d28448..83d177573 100644 --- a/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tools/designer/examples/addressbook/addressbook.ui.h @@ -134,4 +134,4 @@ void AddressBook::searchAddress( const TQString &expr ) } ++it; } -}
\ No newline at end of file +} diff --git a/tools/designer/examples/addressbook/addressdetails.ui.h b/tools/designer/examples/addressbook/addressdetails.ui.h index 60fe4ea25..b4e739241 100644 --- a/tools/designer/examples/addressbook/addressdetails.ui.h +++ b/tools/designer/examples/addressbook/addressdetails.ui.h @@ -21,4 +21,4 @@ void AddressDetails::okClicked() editCountry->text(), editZipCode->text() ); close(); -}
\ No newline at end of file +} diff --git a/tools/designer/examples/addressbook/search.ui.h b/tools/designer/examples/addressbook/search.ui.h index b660726cc..67715379c 100644 --- a/tools/designer/examples/addressbook/search.ui.h +++ b/tools/designer/examples/addressbook/search.ui.h @@ -10,4 +10,4 @@ void SearchDialog::search() { emit searchAddress( editSearch->text() ); close(); -}
\ No newline at end of file +} diff --git a/tools/designer/plugins/cppeditor/cppeditor.pro b/tools/designer/plugins/cppeditor/cppeditor.pro index 391c1d73e..6cfdf8f15 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.pro +++ b/tools/designer/plugins/cppeditor/cppeditor.pro @@ -12,9 +12,9 @@ VERSION = 1.0.0 INCLUDEPATH += ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor hpux-* { - LIBS += $$QT_BUILD_TREE/lib/libeditor.a + LIBS += $$QT_BUILD_TREE/lib/libtqteditor.a } else { - LIBS += -L$$QT_BUILD_TREE/lib -leditor + LIBS += -L$$QT_BUILD_TREE/lib -ltqteditor } target.path += $$plugins.path/designer |