Automated update from Qt3

pull/1/head
Timothy Pearson 11 years ago
parent 534275dec5
commit 5445c25f50

@ -81,12 +81,12 @@ emitted. Similarly when closeAssistant() is called,
<a href="#assistantClosed">assistantClosed</a>() is emitted. In either case, if an error occurs, <a href="#assistantClosed">assistantClosed</a>() is emitted. In either case, if an error occurs,
<a href="#error">error</a>() is emitted. <a href="#error">error</a>() is emitted.
<p> This class is not included in the TQt library itself. To use it you <p> This class is not included in the TQt library itself. To use it you
must link against <tt>libqassistantclient.a</tt> (Unix) or <tt>qassistantclient.lib</tt> (Windows), which is built into <tt>INSTALL/lib</tt> must link against <tt>libtqassistantclient.a</tt> (Unix) or <tt>qassistantclient.lib</tt> (Windows), which is built into <tt>INSTALL/lib</tt>
if you built the TQt tools (<tt>INSTALL</tt> is the directory where TQt is if you built the TQt tools (<tt>INSTALL</tt> is the directory where TQt is
installed). If you use qmake, then you can simply add the following installed). If you use qmake, then you can simply add the following
line to your pro file: line to your pro file:
<p> <pre> <p> <pre>
LIBS += -lqassistantclient LIBS += -ltqassistantclient
</pre> </pre>
<p> See also "Adding Documentation to TQt Assistant" in the <a href="assistant.html">TQt Assistant manual</a>. <p> See also "Adding Documentation to TQt Assistant" in the <a href="assistant.html">TQt Assistant manual</a>.

@ -69,11 +69,11 @@ One QAssistantClient instance interacts with one Qt Assistant instance, so every
.PP .PP
When you call openAssistant() the assistantOpened() signal is emitted. Similarly when closeAssistant() is called, assistantClosed() is emitted. In either case, if an error occurs, error() is emitted. When you call openAssistant() the assistantOpened() signal is emitted. Similarly when closeAssistant() is called, assistantClosed() is emitted. In either case, if an error occurs, error() is emitted.
.PP .PP
This class is not included in the Qt library itself. To use it you must link against \fClibqassistantclient.a\fR (Unix) or \fCqassistantclient.lib\fR (Windows), which is built into \fCINSTALL/lib\fR if you built the Qt tools (\fCINSTALL\fR is the directory where Qt is installed). If you use qmake, then you can simply add the following line to your pro file: This class is not included in the Qt library itself. To use it you must link against \fClibtqassistantclient.a\fR (Unix) or \fCqassistantclient.lib\fR (Windows), which is built into \fCINSTALL/lib\fR if you built the Qt tools (\fCINSTALL\fR is the directory where Qt is installed). If you use qmake, then you can simply add the following line to your pro file:
.PP .PP
.nf .nf
.br .br
LIBS += -lqassistantclient LIBS += -ltqassistantclient
.br .br
.fi .fi
.PP .PP

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on CONFIG += qt warn_on
LIBS += -lqassistantclient LIBS += -ltqassistantclient
unix { unix {
UI_DIR = .ui UI_DIR = .ui
MOC_DIR = .moc MOC_DIR = .moc

@ -1,6 +1,6 @@
TEMPLATE = app TEMPLATE = app
LIBS += -lqassistantclient LIBS += -ltqassistantclient
REQUIRES = full-config table REQUIRES = full-config table

@ -26,4 +26,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
return 1; return 1;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

@ -27,4 +27,3 @@ int WINAPI DllEntryPoint(HINSTANCE, unsigned long, void*)
return 1; return 1;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

@ -422,4 +422,4 @@ void TQEventLoop::appClosingDown()
void TQEventLoop::setSingleToolkitEventHandling(bool enabled) { void TQEventLoop::setSingleToolkitEventHandling(bool enabled) {
// Do nothing // Do nothing
} }

@ -1,5 +1,5 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = qassistantclient TARGET = tqassistantclient
VERSION = 1.0 VERSION = 1.0
CONFIG += qt warn_on release CONFIG += qt warn_on release

@ -84,14 +84,14 @@ static TQAssistantClientPrivate *data( const TQAssistantClient *client, bool cre
error() is emitted. error() is emitted.
This class is not included in the TQt library itself. To use it you This class is not included in the TQt library itself. To use it you
must link against \c libqassistantclient.a (Unix) or \c must link against \c libtqassistantclient.a (Unix) or \c
qassistantclient.lib (Windows), which is built into \c INSTALL/lib qassistantclient.lib (Windows), which is built into \c INSTALL/lib
if you built the TQt tools (\c INSTALL is the directory where TQt is if you built the TQt tools (\c INSTALL is the directory where TQt is
installed). If you use qmake, then you can simply add the following installed). If you use qmake, then you can simply add the following
line to your pro file: line to your pro file:
\code \code
LIBS += -lqassistantclient LIBS += -ltqassistantclient
\endcode \endcode
See also "Adding Documentation to TQt Assistant" in the \link See also "Adding Documentation to TQt Assistant" in the \link

@ -6,11 +6,11 @@ DESTDIR = $$QT_BUILD_TREE/bin
SOURCES += main.cpp SOURCES += main.cpp
INCLUDEPATH += ../designer INCLUDEPATH += ../designer
LIBS += -ldesignercore -ltqui -lqassistantclient -L$$QT_BUILD_TREE/lib LIBS += -ltqtdesignercore -ltqui -ltqassistantclient -L$$QT_BUILD_TREE/lib
win32 { win32 {
RC_FILE = designer.rc RC_FILE = designer.rc
win32-g++ { win32-g++ {
TARGETDEPS += $$QT_BUILD_TREE/lib/libdesignercore.a TARGETDEPS += $$QT_BUILD_TREE/lib/libtqtdesignercore.a
} else { } else {
TARGETDEPS += $$QT_BUILD_TREE/lib/designercore.lib TARGETDEPS += $$QT_BUILD_TREE/lib/designercore.lib
} }

@ -186,8 +186,8 @@ int main( int argc, char *argv[] )
signal( SIGTERM, exitHandler ); signal( SIGTERM, exitHandler );
} }
extern void qInitImages_designercore(); extern void qInitImages_tqtdesignercore();
qInitImages_designercore(); qInitImages_tqtdesignercore();
TQSettings config; TQSettings config;
TQString keybase = DesignerApplication::settingsKey(); TQString keybase = DesignerApplication::settingsKey();

@ -7,7 +7,7 @@ CONFIG -= dll
CONFIG += dll CONFIG += dll
} }
TARGET = designercore TARGET = tqtdesignercore
DEFINES += DESIGNER DEFINES += DESIGNER
DEFINES += QT_INTERNAL_XML DEFINES += QT_INTERNAL_XML
@ -420,11 +420,11 @@ INCLUDEPATH += ../shared ../uilib
LIBS += -L$$QT_BUILD_TREE/lib -ltqui LIBS += -L$$QT_BUILD_TREE/lib -ltqui
hpux-acc* { hpux-acc* {
LIBS += $$QT_BUILD_TREE/lib/libqassistantclient.a LIBS += $$QT_BUILD_TREE/lib/libtqassistantclient.a
} }
!hpux-acc* { !hpux-acc* {
LIBS += -lqassistantclient LIBS += -ltqassistantclient
} }
TRANSLATIONS = designer_de.ts designer_fr.ts TRANSLATIONS = designer_de.ts designer_fr.ts

@ -156,8 +156,8 @@ MainWindow::MainWindow( bool asClient, bool single, const TQString &plgDir )
fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), fileFilter( tr( "TQt User-Interface Files (*.ui)" ) ), client( asClient ),
previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ) previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 )
{ {
extern void qInitImages_designercore(); extern void qInitImages_tqtdesignercore();
qInitImages_designercore(); qInitImages_tqtdesignercore();
self = this; self = this;
setPluginDirectory( plgDir ); setPluginDirectory( plgDir );

@ -24,7 +24,7 @@ SOURCES = editor.cpp \
FORMS = preferences.ui FORMS = preferences.ui
TARGET = editor TARGET = tqteditor
DESTDIR = ../../../lib DESTDIR = ../../../lib
VERSION = 1.0.0 VERSION = 1.0.0

@ -134,4 +134,4 @@ void AddressBook::searchAddress( const TQString &expr )
} }
++it; ++it;
} }
} }

@ -21,4 +21,4 @@ void AddressDetails::okClicked()
editCountry->text(), editCountry->text(),
editZipCode->text() ); editZipCode->text() );
close(); close();
} }

@ -10,4 +10,4 @@ void SearchDialog::search()
{ {
emit searchAddress( editSearch->text() ); emit searchAddress( editSearch->text() );
close(); close();
} }

@ -12,9 +12,9 @@ VERSION = 1.0.0
INCLUDEPATH += ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor INCLUDEPATH += ../../interfaces ../../editor $$QT_BUILD_TREE/tools/designer/editor
hpux-* { hpux-* {
LIBS += $$QT_BUILD_TREE/lib/libeditor.a LIBS += $$QT_BUILD_TREE/lib/libtqteditor.a
} else { } else {
LIBS += -L$$QT_BUILD_TREE/lib -leditor LIBS += -L$$QT_BUILD_TREE/lib -ltqteditor
} }
target.path += $$plugins.path/designer target.path += $$plugins.path/designer

@ -35,7 +35,7 @@ DESTDIR = ../../../bin
TARGET = tqlinguist TARGET = tqlinguist
LIBS += -L$$QT_BUILD_TREE/lib -lqassistantclient LIBS += -L$$QT_BUILD_TREE/lib -ltqassistantclient
win32:RC_FILE = linguist.rc win32:RC_FILE = linguist.rc

Loading…
Cancel
Save